wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10224 from nextcloud/fix-formatting-of-email-and-circle-shares

Browse source 
Fix formatting of email and circle shares
This commit is contained in:
Morris Jobke 2018-07-13 14:57:47 +02:00 committed by GitHub
commit f2b92c44a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_sharing/lib/Controller/ShareAPIController.php
View file

@ -198,7 +198,7 @@ class ShareAPIController extends OCSController {
$result['token'] = $share->getToken();
$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
} else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() || Share::SHARE_TYPE_REMOTE_GROUP) {
} else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
$result['share_with'] = $share->getSharedWith();
$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
$result['token'] = $share->getToken();

68
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
View file

@ -2088,6 +2088,47 @@ class ShareAPIControllerTest extends TestCase {
[], $share, [], true
];
$share = \OC::$server->getShareManager()->newShare();
$share->setShareType(\OCP\Share::SHARE_TYPE_EMAIL)
->setSharedBy('initiator')
->setSharedWith('user@server.com')
->setShareOwner('owner')
->setPermissions(\OCP\Constants::PERMISSION_READ)
->setNode($folder)
->setShareTime(new \DateTime('2000-01-01T00:01:02'))
->setTarget('myTarget')
->setId(42)
->setPassword('password');
$result[] = [
[
'id' => 42,
'share_type' => \OCP\Share::SHARE_TYPE_EMAIL,
'uid_owner' => 'initiator',
'displayname_owner' => 'initiator',
'permissions' => 1,
'stime' => 946684862,
'parent' => null,
'expiration' => null,
'token' => null,
'uid_file_owner' => 'owner',
'displayname_file_owner' => 'owner',
'path' => 'folder',
'item_type' => 'folder',
'storage_id' => 'storageId',
'storage' => 100,
'item_source' => 2,
'file_source' => 2,
'file_parent' => 1,
'file_target' => 'myTarget',
'share_with' => 'user@server.com',
'share_with_displayname' => 'mail display name',
'mail_send' => 0,
'mimetype' => 'myFolderMimeType',
'password' => 'password'
], $share, [], false
];
return $result;
}
@ -2131,15 +2172,28 @@ class ShareAPIControllerTest extends TestCase {
$this->overwriteService(\OCP\Contacts\IManager::class, $cm);
$cm->method('search')
->with('user@server.com', ['CLOUD'])
->willReturn([
[
'CLOUD' => [
'user@server.com',
->will($this->returnValueMap([
['user@server.com', ['CLOUD'], [],
[
[
'CLOUD' => [
'user@server.com',
],
'FN' => 'foobar',
],
],
'FN' => 'foobar',
],
]);
['user@server.com', ['EMAIL'], [],
[
[
'EMAIL' => [
'user@server.com',
],
'FN' => 'mail display name',
],
],
],
]));
try {
$result = $this->invokePrivate($this->ocs, 'formatShare', [$share]);