Make ContactsStore a public API

Signed-off-by: Tobia De Koninck <[email protected]>
nextcloud · Sep 25, 2017 · 5628e76 · 5628e76
1 parent 199c4b2
commit 5628e76
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 1 deletion.
diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php
@@ -52,5 +52,7 @@ function(GenericEvent $event) use ($app) {
 	$user = \OC::$server->getUserSession()->getUser();
 	if (!is_null($user)) {
 		$app->setupContactsProvider($cm, $user->getUID());
+	} else {
+		$app->setupSystemContactsProvider($cm);
 	}
 });
diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php
@@ -72,6 +72,16 @@ public function setupContactsProvider(IManager $contactsManager, $userID) {
 		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
 	}
 
+	/**
+	 * @param IManager $contactsManager
+	 */
+	public function setupSystemContactsProvider(IManager $contactsManager) {
+		/** @var ContactsManager $cm */
+		$cm = $this->getContainer()->query(ContactsManager::class);
+		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+	}
+
 	public function registerHooks() {
 		/** @var HookManager $hm */
 		$hm = $this->getContainer()->query(HookManager::class);

diff --git a/apps/dav/lib/CardDAV/ContactsManager.php b/apps/dav/lib/CardDAV/ContactsManager.php
@@ -54,6 +54,14 @@ public function __construct(CardDavBackend $backend, IL10N $l10n) {
 	public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
 		$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
 		$this->register($cm, $addressBooks, $urlGenerator);
+		$this->setupSystemContactsProvider($cm, $urlGenerator);
+	}
+
+	/**
+	 * @param IManager $cm
+	 * @param IURLGenerator $urlGenerator
+	 */
+	public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
 		$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
 		$this->register($cm, $addressBooks, $urlGenerator);
 	}

diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php
@@ -33,8 +33,9 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\Contacts\ContactsMenu\IContactsStore;
 
-class ContactsStore {
+class ContactsStore implements IContactsStore {
 
 	/** @var IManager */
 	private $contactsManager;

diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -54,6 +54,7 @@
 use OC\Authentication\LoginCredentials\Store;
 use OC\Command\CronBus;
 use OC\Contacts\ContactsMenu\ActionFactory;
+use OC\Contacts\ContactsMenu\ContactsStore;
 use OC\Diagnostics\EventLogger;
 use OC\Diagnostics\QueryLogger;
 use OC\Federation\CloudIdManager;
@@ -1066,6 +1067,17 @@ public function __construct($webRoot, \OC\Config $config) {
 				$c->query(\OCP\Share\IManager::class)
 			);
 		});
+
+		$this->registerService(\OCP\Contacts\ContactsMenu\IContactsStore::class, function(Server $c) {
+			return new ContactsStore(
+				$this->getContactsManager(),
+				$this->getConfig(),
+				$this->getUserManager(),
+				$this->getGroupManager()
+			);
+		});
+
+
 	}
 
 	/**

diff --git a/lib/public/Contacts/ContactsMenu/IContactsStore.php b/lib/public/Contacts/ContactsMenu/IContactsStore.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace OCP\Contacts\ContactsMenu;
+
+use OCP\IUser;
+
+interface IContactsStore {
+
+
+	/**
+	 * @param IUser $user
+	 * @param $filter
+	 * @return IEntry[]
+	 */
+	public function getContacts(IUser $user, $filter);
+
+	/**
+	 * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith)
+	 * @param IUser $user
+	 * @param integer $shareType
+	 * @param string $shareWith
+	 * @return IEntry|null
+	 */
+	public function findOne(IUser $user, $shareType, $shareWith);
+
+}