mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22098 from nextcloud/feature/noid/iaddressbook_isShared_isSystemAddressbook 

IAddressBook: add isShared and isSystemAddressBook
This commit is contained in:
Morris Jobke 2020-08-05 11:04:17 +02:00 committed by GitHub
parent 1cf9f42817 b0c5457c42
commit f16efe8eca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/dav/lib/CardDAV/AddressBookImpl.php
View File

@ -281,12 +281,7 @@ class AddressBookImpl implements IAddressBook {
}
}
if (
$this->addressBookInfo['principaluri'] === 'principals/system/system' && (
$this->addressBookInfo['uri'] === 'system' ||
$this->addressBookInfo['{DAV:}displayname'] === $this->urlGenerator->getBaseUrl()
)
) {
if ($this->isSystemAddressBook()) {
$result['isLocalSystemBook'] = true;
}
return $result;
@ -309,4 +304,26 @@ class AddressBookImpl implements IAddressBook {
return null;
}
/**
* @inheritDoc
*/
public function isShared(): bool {
if (!isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
return false;
}
return $this->addressBookInfo['principaluri']
!== $this->addressBookInfo['{http://owncloud.org/ns}owner-principal'];
}
/**
* @inheritDoc
*/
public function isSystemAddressBook(): bool {
return $this->addressBookInfo['principaluri'] === 'principals/system/system' && (
$this->addressBookInfo['uri'] === 'system' ||
$this->addressBookInfo['{DAV:}displayname'] === $this->urlGenerator->getBaseUrl()
);
}
}

59
apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
View File

@ -447,4 +447,63 @@ class AddressBookImplTest extends TestCase {
'isLocalSystemBook' => true,
], $array);
}
public function testIsSystemAddressBook(): void {
$addressBookInfo = [
'{http://owncloud.org/ns}owner-principal' => 'principals/system/system',
'principaluri' => 'principals/system/system',
'{DAV:}displayname' => 'display name',
'id' => 666,
'uri' => 'system',
];
$addressBookImpl = new AddressBookImpl(
$this->addressBook,
$addressBookInfo,
$this->backend,
$this->urlGenerator
);
$this->assertTrue($addressBookImpl->isSystemAddressBook());
}
public function testIsShared(): void {
$addressBookInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1',
'{DAV:}displayname' => 'Test address book',
'principaluri' => 'user2',
'id' => 666,
'uri' => 'default',
];
$addressBookImpl = new AddressBookImpl(
$this->addressBook,
$addressBookInfo,
$this->backend,
$this->urlGenerator
);
$this->assertFalse($addressBookImpl->isSystemAddressBook());
$this->assertTrue($addressBookImpl->isShared());
}
public function testIsNotShared(): void {
$addressBookInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1',
'{DAV:}displayname' => 'Test address book',
'principaluri' => 'user1',
'id' => 666,
'uri' => 'default',
];
$addressBookImpl = new AddressBookImpl(
$this->addressBook,
$addressBookInfo,
$this->backend,
$this->urlGenerator
);
$this->assertFalse($addressBookImpl->isSystemAddressBook());
$this->assertFalse($addressBookImpl->isShared());
}
}

15
lib/public/IAddressBook.php
View File

@ -107,5 +107,20 @@ namespace OCP {
* @since 5.0.0
*/
public function delete($id);
/**
* Returns true if this address-book is not owned by the current user,
* but shared with them.
*
* @return bool
* @since 20.0.0
*/
public function isShared(): bool;
/**
* @return bool
* @since 20.0.0
*/
public function isSystemAddressBook(): bool;
}
}