Merge pull request #12324 from nextcloud/add-password-response-parame…

…ter-for-returning-the-password-of-link-shares Add "password" parameter to the response data of link shares
nextcloud · Nov 7, 2018 · 7940a79 · 7940a79
2 parents ab35433 + b2cc2d6
commit 7940a79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -208,9 +208,13 @@ protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = n
 			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
 		} else if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
 
+			// "share_with" and "share_with_displayname" for passwords of link
+			// shares was deprecated in Nextcloud 15, use "password" instead.
 			$result['share_with'] = $share->getPassword();
 			$result['share_with_displayname'] = $share->getPassword();
 
+			$result['password'] = $share->getPassword();
+
 			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
 
 			$result['token'] = $share->getToken();

diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -428,6 +428,7 @@ public function dataGetShare() {
 		$expected = [
 			'id' => 101,
 			'share_type' => \OCP\Share::SHARE_TYPE_LINK,
+			'password' => 'password',
 			'share_with' => 'password',
 			'share_with_displayname' => 'password',
 			'send_password_by_talk' => false,
@@ -2687,6 +2688,7 @@ public function dataFormatShare() {
 				'file_source' => 3,
 				'file_parent' => 1,
 				'file_target' => 'myTarget',
+				'password' => 'mypassword',
 				'share_with' => 'mypassword',
 				'share_with_displayname' => 'mypassword',
 				'send_password_by_talk' => false,
@@ -2736,6 +2738,7 @@ public function dataFormatShare() {
 				'file_source' => 3,
 				'file_parent' => 1,
 				'file_target' => 'myTarget',
+				'password' => 'mypassword',
 				'share_with' => 'mypassword',
 				'share_with_displayname' => 'mypassword',
 				'send_password_by_talk' => true,