From d1639a724b3c73333053544f3443fbb45fce1327 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 Oct 2021 08:49:41 +0200 Subject: [PATCH] Add an OCS endpoint for the hovercard contact actions Signed-off-by: Joas Schilling --- core/Controller/HoverCardController.php | 84 +++++++++++++++++++ core/routes.php | 2 + .../Contacts/ContactsMenu/ContactsStore.php | 2 + 3 files changed, 88 insertions(+) create mode 100644 core/Controller/HoverCardController.php diff --git a/core/Controller/HoverCardController.php b/core/Controller/HoverCardController.php new file mode 100644 index 0000000000000..cb85da112a443 --- /dev/null +++ b/core/Controller/HoverCardController.php @@ -0,0 +1,84 @@ + + * + * @author Joas Schilling + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ +namespace OC\Core\Controller; + +use OC\Contacts\ContactsMenu\Manager; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\Contacts\ContactsMenu\IEntry; +use OCP\IRequest; +use OCP\IUserSession; +use OCP\Share\IShare; + +class HoverCardController extends \OCP\AppFramework\OCSController { + + /** @var Manager */ + private $manager; + + /** @var IUserSession */ + private $userSession; + + /** + * @param IRequest $request + * @param IUserSession $userSession + * @param Manager $manager + */ + public function __construct(IRequest $request, IUserSession $userSession, Manager $manager) { + parent::__construct('core', $request); + $this->userSession = $userSession; + $this->manager = $manager; + } + + /** + * @NoAdminRequired + * + * @param string $userId + * @return DataResponse + */ + public function getUser(string $userId): DataResponse { + $contact = $this->manager->findOne($this->userSession->getUser(), IShare::TYPE_USER, $userId); + + if (!$contact) { + return new DataResponse([], Http::STATUS_NOT_FOUND); + } + + $data = $this->entryToArray($contact); + + $actions = $data['actions']; + if ($data['topAction']) { + array_unshift($actions, $data['topAction']); + } + + return new DataResponse([ + 'userId' => $userId, + 'displayName' => $contact->getFullName(), + 'actions' => $actions, + ]); + } + + protected function entryToArray(IEntry $entry): array { + return json_decode(json_encode($entry), true); + } +} diff --git a/core/routes.php b/core/routes.php index 0625690b2d29a..0164929c5f5a9 100644 --- a/core/routes.php +++ b/core/routes.php @@ -108,6 +108,8 @@ ['root' => '/core', 'name' => 'AppPassword#rotateAppPassword', 'url' => '/apppassword/rotate', 'verb' => 'POST'], ['root' => '/core', 'name' => 'AppPassword#deleteAppPassword', 'url' => '/apppassword', 'verb' => 'DELETE'], + ['root' => '/hovercard', 'name' => 'HoverCard#getUser', 'url' => '/v1/{userId}', 'verb' => 'GET'], + ['root' => '/collaboration', 'name' => 'CollaborationResources#searchCollections', 'url' => '/resources/collections/search/{filter}', 'verb' => 'GET'], ['root' => '/collaboration', 'name' => 'CollaborationResources#listCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'GET'], ['root' => '/collaboration', 'name' => 'CollaborationResources#renameCollection', 'url' => '/resources/collections/{collectionId}', 'verb' => 'PUT'], diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index 31e13bbe8f229..5209764d56c9f 100644 --- a/lib/private/Contacts/ContactsMenu/ContactsStore.php +++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php @@ -285,6 +285,8 @@ private function contactArrayToEntry(array $contact) { if (isset($contact['id'])) { $entry->setId($contact['id']); + } elseif (isset($contact['UID'])) { + $entry->setId($contact['UID']); } if (isset($contact['FN'])) {