[Sharing 2.0] Use the rootfolder to get the path of a share

We need to use the rootfolder here since we also other people than the
shareOwner can request a share.

2 files changed, 7 insertions, 6 deletions

diff --git a/apps/files_sharing/api/ocssharewrapper.php b/apps/files_sharing/api/ocssharewrapper.php
index 2a2c16da1f3..ca04c656c28 100644
--- a/apps/files_sharing/api/ocssharewrapper.php
+++ b/apps/files_sharing/api/ocssharewrapper.php
@@ -40,7 +40,7 @@ class OCSShareWrapper {
 			\OC::$server->getGroupManager(),
 			\OC::$server->getUserManager(),
 			\OC::$server->getRequest(),
-			\OC::$server->getUserFolder(),
+			\OC::$server->getRootFolder(),
 			\OC::$server->getURLGenerator(),
 			\OC::$server->getUserSession()->getUser());
 	}
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php
index 1f27168c705..6c25b4a4426 100644
--- a/apps/files_sharing/api/share20ocs.php
+++ b/apps/files_sharing/api/share20ocs.php
@@ -28,6 +28,7 @@ use OCP\IRequest;
 use OCP\Files\Folder;
 use OCP\IURLGenerator;
 use OCP\IUser;
+use OCP\Files\IRootFolder;
 
 class Share20OCS {
 
@@ -43,8 +44,8 @@ class Share20OCS {
 	/** @var IRequest */
 	private $request;
 
-	/** @var Folder */
-	private $userFolder;
+	/** @var IRootFolder */
+	private $rootFolder;
 
 	/** @var IUrlGenerator */
 	private $urlGenerator;
@@ -57,7 +58,7 @@ class Share20OCS {
 			IGroupManager $groupManager,
 			IUserManager $userManager,
 			IRequest $request,
-			Folder $userFolder,
+			IRootFolder $rootFolder,
 			IURLGenerator $urlGenerator,
 			IUser $currentUser
 	) {
@@ -65,7 +66,7 @@ class Share20OCS {
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 		$this->request = $request;
-		$this->userFolder = $userFolder;
+		$this->rootFolder = $rootFolder;
 		$this->urlGenerator = $urlGenerator;
 		$this->currentUser = $currentUser;
 	}
@@ -90,7 +91,7 @@ class Share20OCS {
 		];
 
 		$path = $share->getPath();
-		$result['path'] = $this->userFolder->getRelativePath($path->getPath());
+		$result['path'] = $this->rootFolder->getUserFolder($share->getShareOwner()->getUID())->getRelativePath($path->getPath());
 		if ($path instanceOf \OCP\Files\Folder) {
 			$result['item_type'] = 'folder';
 		} else {