Fixing local event delivery for calendar events based on the email address

3 files changed, 26 insertions, 0 deletions

diff --git a/apps/dav/lib/connector/sabre/principal.php b/apps/dav/lib/connector/sabre/principal.php
index 18f28a916f1..787bcdf469b 100644
--- a/apps/dav/lib/connector/sabre/principal.php
+++ b/apps/dav/lib/connector/sabre/principal.php
@@ -196,6 +196,14 @@ class Principal implements BackendInterface {
 	 * @return string
 	 */
 	function findByUri($uri, $principalPrefix) {
+		if (substr($uri, 0, 7) === 'mailto:') {
+			$email = substr($uri, 7);
+			$users = $this->userManager->getByEmail($email);
+			if (count($users) === 1) {
+				return $this->principalPrefix . '/' . $users[0]->getUID();
+			}
+		}
+
 		return '';
 	}
 
diff --git a/apps/dav/lib/server.php b/apps/dav/lib/server.php
index 73e24c9a292..edaa7ac8552 100644
--- a/apps/dav/lib/server.php
+++ b/apps/dav/lib/server.php
@@ -84,6 +84,9 @@ class Server {
 
 		// acl
 		$acl = new DavAclPlugin();
+		$acl->principalCollectionSet = [
+			'principals/users', 'principals/groups'
+		];
 		$acl->defaultUsernamePath = 'principals/users';
 		$this->server->addPlugin($acl);
 
diff --git a/apps/dav/tests/unit/connector/sabre/principal.php b/apps/dav/tests/unit/connector/sabre/principal.php
index 1747885240a..75076e9618b 100644
--- a/apps/dav/tests/unit/connector/sabre/principal.php
+++ b/apps/dav/tests/unit/connector/sabre/principal.php
@@ -255,4 +255,19 @@ class Principal extends TestCase {
 	public function testSearchPrincipals() {
 		$this->assertSame([], $this->connector->searchPrincipals('principals/users', []));
 	}
+
+	public function testFindByUri() {
+		$fooUser = $this->getMockBuilder('\OC\User\User')
+			->disableOriginalConstructor()->getMock();
+		$fooUser
+			->expects($this->exactly(1))
+			->method('getUID')
+			->will($this->returnValue('foo'));
+
+		$this->userManager->expects($this->once())->method('getByEmail')->willReturn([
+			$fooUser
+		]);
+		$ret = $this->connector->findByUri('mailto:foo@bar.net', 'principals/users');
+		$this->assertSame('principals/users/foo', $ret);
+	}
 }