From 68ae4394f712d884dc4814897cf97986f3cf71b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 20 Mar 2018 19:06:08 +0100 Subject: [PATCH 1/8] Api, return users details by groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/provisioning_api/appinfo/routes.php | 2 + .../lib/Controller/GroupsController.php | 66 +++++++++++++++++-- .../lib/Controller/UsersController.php | 6 +- .../tests/Controller/UsersControllerTest.php | 4 +- 4 files changed, 69 insertions(+), 9 deletions(-) diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php index c2bbd8025e..5d1d2a6d50 100644 --- a/apps/provisioning_api/appinfo/routes.php +++ b/apps/provisioning_api/appinfo/routes.php @@ -36,6 +36,8 @@ return [ ['root' => '/cloud', 'name' => 'Groups#getGroups', 'url' => '/groups', 'verb' => 'GET'], ['root' => '/cloud', 'name' => 'Groups#getGroupsDetails', 'url' => '/groups/details', 'verb' => 'GET'], ['root' => '/cloud', 'name' => 'Groups#getGroup', 'url' => '/groups/{groupId}', 'verb' => 'GET'], + ['root' => '/cloud', 'name' => 'Groups#getGroupUsers', 'url' => '/groups/{groupId}/users', 'verb' => 'GET'], + ['root' => '/cloud', 'name' => 'Groups#getGroupUsersDetails', 'url' => '/groups/{groupId}/users/details', 'verb' => 'GET'], ['root' => '/cloud', 'name' => 'Groups#addGroup', 'url' => '/groups', 'verb' => 'POST'], ['root' => '/cloud', 'name' => 'Groups#deleteGroup', 'url' => '/groups/{groupId}', 'verb' => 'DELETE'], ['root' => '/cloud', 'name' => 'Groups#getSubAdminsOfGroup', 'url' => '/groups/{groupId}/subadmins', 'verb' => 'GET'], diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index d6f2d9f339..dc018fd94a 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -36,6 +36,7 @@ use OCP\ILogger; use OCP\IRequest; use OCP\IUserSession; use OCP\IUser; +use OCA\Provisioning_API\Controller\UsersController; class GroupsController extends OCSController { @@ -49,24 +50,30 @@ class GroupsController extends OCSController { /** @var ILogger */ private $logger; + /** @var UsersController */ + private $userController; + /** * @param string $appName * @param IRequest $request * @param IGroupManager $groupManager * @param IUserSession $userSession * @param ILogger $logger + * @param UsersController $userController */ public function __construct( string $appName, IRequest $request, IGroupManager $groupManager, IUserSession $userSession, - ILogger $logger) { + ILogger $logger, + UsersController $userController) { parent::__construct($appName, $request); $this->groupManager = $groupManager; $this->userSession = $userSession; $this->logger = $logger; + $this->userController = $userController; } /** @@ -124,7 +131,20 @@ class GroupsController extends OCSController { } /** - * returns an array of users in the group specified + * @NoAdminRequired + * + * @param string $groupId + * @return DataResponse + * @throws OCSException + * + * @deprecated 14 Use getGroupUsers + */ + public function getGroup(string $groupId): DataResponse { + return $this->getGroup($groupId); + } + + /** + * returns an array of users in the specified group * * @NoAdminRequired * @@ -132,7 +152,7 @@ class GroupsController extends OCSController { * @return DataResponse * @throws OCSException */ - public function getGroup(string $groupId): DataResponse { + public function getGroupUsers(string $groupId): DataResponse { $user = $this->userSession->getUser(); // Check the group exists @@ -143,7 +163,7 @@ class GroupsController extends OCSController { $isSubadminOfGroup = false; $group = $this->groupManager->get($groupId); if ($group !== null) { - $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminofGroup($user, $group); + $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group); } // Check subadmin has access to this group @@ -161,6 +181,44 @@ class GroupsController extends OCSController { throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED); } + /** + * returns an array of users details in the specified group + * + * @NoAdminRequired + * + * @param string $groupId + * @return DataResponse + * @throws OCSException + */ + public function getGroupUsersDetails(string $groupId): DataResponse { + $user = $this->userSession->getUser(); + + // Check the group exists + if(!$this->groupManager->groupExists($groupId)) { + throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND); + } + + $isSubadminOfGroup = false; + $group = $this->groupManager->get($groupId); + if ($group !== null) { + $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group); + } + + // Check subadmin has access to this group + if($this->groupManager->isAdmin($user->getUID()) + || $isSubadminOfGroup) { + $users = $this->groupManager->get($groupId)->getUsers(); + $users = array_map(function($user) { + /** @var IUser $user */ + return $this->userController->getUserData($user->getUID()); + }, $users); + $users = array_values($users); + return new DataResponse(['users' => $users]); + } + + throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED); + } + /** * creates a new group * diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index c8c00fa859..4b45212429 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -225,7 +225,7 @@ class UsersController extends OCSController { if(!$this->groupManager->groupExists($group)) { throw new OCSException('group '.$group.' does not exist', 104); } - if(!$isAdmin && !$subAdminManager->isSubAdminofGroup($user, $this->groupManager->get($group))) { + if(!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) { throw new OCSException('insufficient privileges for group '. $group, 105); } } @@ -341,7 +341,7 @@ class UsersController extends OCSController { * @return array * @throws OCSException */ - protected function getUserData(string $userId): array { + public function getUserData(string $userId): array { $currentLoggedInUser = $this->userSession->getUser(); $data = []; @@ -808,7 +808,7 @@ class UsersController extends OCSController { $subAdminManager = $this->groupManager->getSubAdmin(); // We cannot be subadmin twice - if ($subAdminManager->isSubAdminofGroup($user, $group)) { + if ($subAdminManager->isSubAdminOfGroup($user, $group)) { return new DataResponse(); } // Go diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index 3f2cf3b110..0f53a7e639 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -2394,7 +2394,7 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) - ->method('isSubAdminofGroup') + ->method('isSubAdminOfGroup') ->with($loggedInUser, $targetGroup) ->will($this->returnValue(true)); $this->groupManager @@ -2445,7 +2445,7 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) - ->method('isSubAdminofGroup') + ->method('isSubAdminOfGroup') ->with($loggedInUser, $targetGroup) ->will($this->returnValue(true)); $this->groupManager From f4e84e172752fb25898cbceddb7cbad4abde21d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 23 Mar 2018 18:08:54 +0100 Subject: [PATCH 2/8] Limit and offset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/provisioning_api/lib/Controller/GroupsController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index dc018fd94a..c16c826663 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -187,10 +187,12 @@ class GroupsController extends OCSController { * @NoAdminRequired * * @param string $groupId + * @param int $limit + * @param int $offset * @return DataResponse * @throws OCSException */ - public function getGroupUsersDetails(string $groupId): DataResponse { + public function getGroupUsersDetails(string $groupId, $limit = null, $offset = 0): DataResponse { $user = $this->userSession->getUser(); // Check the group exists @@ -208,6 +210,8 @@ class GroupsController extends OCSController { if($this->groupManager->isAdmin($user->getUID()) || $isSubadminOfGroup) { $users = $this->groupManager->get($groupId)->getUsers(); + // Extract required number + $users = array_slice($users, $offset, $limit); $users = array_map(function($user) { /** @var IUser $user */ return $this->userController->getUserData($user->getUID()); From 4011ea97b1a8553ecced4110f1d6d46268a52979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 23 Mar 2018 18:12:23 +0100 Subject: [PATCH 3/8] Cast types directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../lib/Controller/GroupsController.php | 36 +++++-------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index c16c826663..423313418a 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -86,14 +86,7 @@ class GroupsController extends OCSController { * @param int $offset * @return DataResponse */ - public function getGroups(string $search = '', $limit = null, $offset = null): DataResponse { - if ($limit !== null) { - $limit = (int)$limit; - } - if ($offset !== null) { - $offset = (int)$offset; - } - + public function getGroups(string $search = '', int $limit = null, int $offset = 0): DataResponse { $groups = $this->groupManager->search($search, $limit, $offset); $groups = array_map(function($group) { /** @var IGroup $group */ @@ -113,14 +106,7 @@ class GroupsController extends OCSController { * @param int $offset * @return DataResponse */ - public function getGroupsDetails(string $search = '', $limit = null, $offset = null): DataResponse { - if ($limit !== null) { - $limit = (int)$limit; - } - if ($offset !== null) { - $offset = (int)$offset; - } - + public function getGroupsDetails(string $search = '', int $limit = null, int $offset = null): DataResponse { $groups = $this->groupManager->search($search, $limit, $offset); $groups = array_map(function($group) { /** @var IGroup $group */ @@ -154,16 +140,14 @@ class GroupsController extends OCSController { */ public function getGroupUsers(string $groupId): DataResponse { $user = $this->userSession->getUser(); + $isSubadminOfGroup = false; // Check the group exists - if(!$this->groupManager->groupExists($groupId)) { - throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND); - } - - $isSubadminOfGroup = false; $group = $this->groupManager->get($groupId); if ($group !== null) { $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group); + } else { + throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND); } // Check subadmin has access to this group @@ -192,18 +176,16 @@ class GroupsController extends OCSController { * @return DataResponse * @throws OCSException */ - public function getGroupUsersDetails(string $groupId, $limit = null, $offset = 0): DataResponse { + public function getGroupUsersDetails(string $groupId, int $limit = null, int $offset = 0): DataResponse { $user = $this->userSession->getUser(); + $isSubadminOfGroup = false; // Check the group exists - if(!$this->groupManager->groupExists($groupId)) { - throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND); - } - - $isSubadminOfGroup = false; $group = $this->groupManager->get($groupId); if ($group !== null) { $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group); + } else { + throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND); } // Check subadmin has access to this group From b023bfe38fa7802de7efb42bb9ee11b81d73b7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 23 Mar 2018 18:24:03 +0100 Subject: [PATCH 4/8] Fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../lib/Controller/GroupsController.php | 10 +++++---- .../tests/Controller/GroupsControllerTest.php | 21 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 423313418a..15818ea423 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -29,6 +29,8 @@ namespace OCA\Provisioning_API\Controller; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; +use OCP\AppFramework\OCS\OCSNotFoundException; +use OCP\AppFramework\OCS\OCSForbiddenException; use OCP\AppFramework\OCSController; use OCP\IGroup; use OCP\IGroupManager; @@ -106,7 +108,7 @@ class GroupsController extends OCSController { * @param int $offset * @return DataResponse */ - public function getGroupsDetails(string $search = '', int $limit = null, int $offset = null): DataResponse { + public function getGroupsDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse { $groups = $this->groupManager->search($search, $limit, $offset); $groups = array_map(function($group) { /** @var IGroup $group */ @@ -126,7 +128,7 @@ class GroupsController extends OCSController { * @deprecated 14 Use getGroupUsers */ public function getGroup(string $groupId): DataResponse { - return $this->getGroup($groupId); + return $this->getGroupUsers($groupId); } /** @@ -147,7 +149,7 @@ class GroupsController extends OCSController { if ($group !== null) { $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group); } else { - throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND); + throw new OCSNotFoundException('The requested group could not be found'); } // Check subadmin has access to this group @@ -162,7 +164,7 @@ class GroupsController extends OCSController { return new DataResponse(['users' => $users]); } - throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED); + throw new OCSForbiddenException(); } /** diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php index 352264c7af..9108e2e331 100644 --- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php +++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php @@ -40,6 +40,8 @@ class GroupsControllerTest extends \Test\TestCase { protected $userSession; /** @var \OC\SubAdmin|\PHPUnit_Framework_MockObject_MockObject */ protected $subAdminManager; + /** @var OCA\Provisioning_API\Controller\UsersController|\PHPUnit_Framework_MockObject_MockObject */ + protected $userController; /** @var GroupsController */ protected $api; @@ -67,12 +69,17 @@ class GroupsControllerTest extends \Test\TestCase { $logger = $this->createMock(ILogger::class); + $this->userController = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController') + ->disableOriginalConstructor() + ->getMock(); + $this->api = new GroupsController( 'provisioning_api', $request, $this->groupManager, $this->userSession, - $logger + $logger, + $this->userController ); } @@ -141,10 +148,10 @@ class GroupsControllerTest extends \Test\TestCase { public function dataGetGroups() { return [ - [null, null, null], - ['foo', null, null], - [null, 1, null], - [null, null, 2], + [null, 0, 0], + ['foo', 0, 0], + [null, 1, 0], + [null, 0, 2], ['foo', 1, 2], ]; } @@ -224,7 +231,7 @@ class GroupsControllerTest extends \Test\TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 + * @expectedExceptionCode 403 */ public function testGetGroupAsIrrelevantSubadmin() { $group = $this->createGroup('group'); @@ -269,7 +276,7 @@ class GroupsControllerTest extends \Test\TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 998 + * @expectedExceptionCode 404 * @expectedExceptionMessage The requested group could not be found */ public function testGetGroupNonExisting() { From c103aaaf255158a5f3a87967998fa7424405bcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 26 Mar 2018 19:30:40 +0200 Subject: [PATCH 5/8] Trait bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../composer/composer/autoload_classmap.php | 1 + .../composer/composer/autoload_static.php | 1 + .../lib/Controller/GroupsController.php | 49 +++++-- .../lib/Controller/UserDataTrait.php | 137 ++++++++++++++++++ .../lib/Controller/UsersController.php | 115 +-------------- 5 files changed, 177 insertions(+), 126 deletions(-) create mode 100644 apps/provisioning_api/lib/Controller/UserDataTrait.php diff --git a/apps/provisioning_api/composer/composer/autoload_classmap.php b/apps/provisioning_api/composer/composer/autoload_classmap.php index 028f6e5c1d..360fd40921 100644 --- a/apps/provisioning_api/composer/composer/autoload_classmap.php +++ b/apps/provisioning_api/composer/composer/autoload_classmap.php @@ -10,6 +10,7 @@ return array( 'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir . '/../lib/Controller/AppConfigController.php', 'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir . '/../lib/Controller/AppsController.php', 'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir . '/../lib/Controller/GroupsController.php', + 'OCA\\Provisioning_API\\Controller\\UserDataTrait' => $baseDir . '/../lib/Controller/UserDataTrait.php', 'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir . '/../lib/Controller/UsersController.php', 'OCA\\Provisioning_API\\FederatedFileSharingFactory' => $baseDir . '/../lib/FederatedFileSharingFactory.php', 'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir . '/../lib/Middleware/Exceptions/NotSubAdminException.php', diff --git a/apps/provisioning_api/composer/composer/autoload_static.php b/apps/provisioning_api/composer/composer/autoload_static.php index b4e6c8e83b..22fea99fa9 100644 --- a/apps/provisioning_api/composer/composer/autoload_static.php +++ b/apps/provisioning_api/composer/composer/autoload_static.php @@ -25,6 +25,7 @@ class ComposerStaticInitProvisioning_API 'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__ . '/..' . '/../lib/Controller/AppConfigController.php', 'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__ . '/..' . '/../lib/Controller/AppsController.php', 'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__ . '/..' . '/../lib/Controller/GroupsController.php', + 'OCA\\Provisioning_API\\Controller\\UserDataTrait' => __DIR__ . '/..' . '/../lib/Controller/UserDataTrait.php', 'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__ . '/..' . '/../lib/Controller/UsersController.php', 'OCA\\Provisioning_API\\FederatedFileSharingFactory' => __DIR__ . '/..' . '/../lib/FederatedFileSharingFactory.php', 'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__ . '/..' . '/../lib/Middleware/Exceptions/NotSubAdminException.php', diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 15818ea423..880f498730 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -8,6 +8,7 @@ declare(strict_types=1); * @author Morris Jobke * @author Roeland Jago Douma * @author Tom Needham + * @author John Molakvoæ * * @license AGPL-3.0 * @@ -27,55 +28,71 @@ declare(strict_types=1); namespace OCA\Provisioning_API\Controller; +use OC\Accounts\AccountManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCS\OCSForbiddenException; use OCP\AppFramework\OCSController; +use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; use OCP\ILogger; use OCP\IRequest; +use OCP\IUserManager; use OCP\IUserSession; use OCP\IUser; -use OCA\Provisioning_API\Controller\UsersController; - class GroupsController extends OCSController { + use UserDataTrait; + + /** @var IUserManager */ + private $userManager; + /** @var IGroupManager */ private $groupManager; /** @var IUserSession */ private $userSession; + /** @var IConfig */ + private $config; + + /** @var AccountManager */ + private $accountManager; + /** @var ILogger */ private $logger; - /** @var UsersController */ - private $userController; - /** * @param string $appName * @param IRequest $request + * @param IUserManager $userManager + * @param IConfig $config * @param IGroupManager $groupManager * @param IUserSession $userSession + * @param AccountManager $accountManager * @param ILogger $logger * @param UsersController $userController */ public function __construct( string $appName, IRequest $request, + IUserManager $userManager, + IConfig $config, IGroupManager $groupManager, IUserSession $userSession, - ILogger $logger, - UsersController $userController) { + AccountManager $accountManager, + ILogger $logger) { parent::__construct($appName, $request); $this->groupManager = $groupManager; + $this->userManager = $userManager; + $this->config = $config; $this->userSession = $userSession; + $this->accountManager = $accountManager; $this->logger = $logger; - $this->userController = $userController; } /** @@ -196,12 +213,16 @@ class GroupsController extends OCSController { $users = $this->groupManager->get($groupId)->getUsers(); // Extract required number $users = array_slice($users, $offset, $limit); - $users = array_map(function($user) { - /** @var IUser $user */ - return $this->userController->getUserData($user->getUID()); - }, $users); - $users = array_values($users); - return new DataResponse(['users' => $users]); + $users = array_keys($users); + $usersDetails = []; + foreach ($users as $userId) { + $userData = $this->getUserData($userId); + // Do not insert empty entry + if(!empty($userData)) { + $usersDetails[$userId] = $userData; + } + } + return new DataResponse(['users' => $usersDetails]); } throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED); diff --git a/apps/provisioning_api/lib/Controller/UserDataTrait.php b/apps/provisioning_api/lib/Controller/UserDataTrait.php new file mode 100644 index 0000000000..ea481cb65f --- /dev/null +++ b/apps/provisioning_api/lib/Controller/UserDataTrait.php @@ -0,0 +1,137 @@ + + * + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * 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, version 3, + * along with this program. If not, see + * + */ + +namespace OCA\Provisioning_API\Controller; + +use OC\Accounts\AccountManager; +use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCS\OCSException; +use OCP\AppFramework\OCS\OCSNotFoundException; +use OCP\AppFramework\OCS\OCSForbiddenException; +use OCP\Files\NotFoundException; +use OC_Helper; + +trait UserDataTrait { + + /** + * creates a array with all user data + * + * @param $userId + * @return array + * @throws OCSException + */ + public function getUserData(string $userId): array { + $currentLoggedInUser = $this->userSession->getUser(); + + $data = []; + + // Check if the target user exists + $targetUserObject = $this->userManager->get($userId); + if($targetUserObject === null) { + throw new OCSNotFoundException('User does not exist'); + } + + // Should be at least Admin Or SubAdmin! + if( $this->groupManager->isAdmin($currentLoggedInUser->getUID()) + || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) { + $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true'); + } else { + // Check they are looking up themselves + if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) { + return $data; + } + } + + // Get groups data + $userAccount = $this->accountManager->getUser($targetUserObject); + $groups = $this->groupManager->getUserGroups($targetUserObject); + $gids = []; + foreach ($groups as $group) { + $gids[] = $group->getDisplayName(); + } + + // Find the data + $data['id'] = $targetUserObject->getUID(); + $data['storageLocation'] = $targetUserObject->getHome(); + $data['lastLogin'] = $targetUserObject->getLastLogin() * 1000; + $data['backend'] = $targetUserObject->getBackendClassName(); + $data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID()); + $data['quota'] = $this->fillStorageInfo($targetUserObject->getUID()); + $data[AccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress(); + $data[AccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName(); + $data[AccountManager::PROPERTY_PHONE] = $userAccount[AccountManager::PROPERTY_PHONE]['value']; + $data[AccountManager::PROPERTY_ADDRESS] = $userAccount[AccountManager::PROPERTY_ADDRESS]['value']; + $data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value']; + $data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value']; + $data['groups'] = $gids; + $data['language'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'lang'); + + return $data; + } + + /** + * Get the groups a user is a subadmin of + * + * @param string $userId + * @return array + * @throws OCSException + */ + protected function getUserSubAdminGroupsData(string $userId): array { + $user = $this->userManager->get($userId); + // Check if the user exists + if($user === null) { + throw new OCSNotFoundException('User does not exist'); + } + + // Get the subadmin groups + $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user); + $groups = []; + foreach ($subAdminGroups as $key => $group) { + $groups[] = $group->getGID(); + } + + return $groups; + } + + /** + * @param string $userId + * @return array + * @throws \OCP\Files\NotFoundException + */ + protected function fillStorageInfo(string $userId): array { + try { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($userId); + $storage = OC_Helper::getStorageInfo('/'); + $data = [ + 'free' => $storage['free'], + 'used' => $storage['used'], + 'total' => $storage['total'], + 'relative' => $storage['relative'], + 'quota' => $storage['quota'], + ]; + } catch (NotFoundException $ex) { + $data = []; + } + return $data; + } + +} \ No newline at end of file diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 4b45212429..62c234013b 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -12,6 +12,7 @@ declare(strict_types=1); * @author Roeland Jago Douma * @author Thomas Müller * @author Tom Needham + * @author John Molakvoæ * * @license AGPL-3.0 * @@ -54,6 +55,8 @@ use OCP\Security\ISecureRandom; class UsersController extends OCSController { + use UserDataTrait; + /** @var IUserManager */ private $userManager; /** @var IConfig */ @@ -334,62 +337,6 @@ class UsersController extends OCSController { throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED); } - /** - * creates a array with all user data - * - * @param $userId - * @return array - * @throws OCSException - */ - public function getUserData(string $userId): array { - $currentLoggedInUser = $this->userSession->getUser(); - - $data = []; - - // Check if the target user exists - $targetUserObject = $this->userManager->get($userId); - if($targetUserObject === null) { - throw new OCSException('The requested user could not be found', \OCP\API::RESPOND_NOT_FOUND); - } - - // Should be at least Admin Or SubAdmin! - if( $this->groupManager->isAdmin($currentLoggedInUser->getUID()) - || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) { - $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true'); - } else { - // Check they are looking up themselves - if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) { - return $data; - } - } - - // Get groups data - $userAccount = $this->accountManager->getUser($targetUserObject); - $groups = $this->groupManager->getUserGroups($targetUserObject); - $gids = []; - foreach ($groups as $group) { - $gids[] = $group->getDisplayName(); - } - - // Find the data - $data['id'] = $targetUserObject->getUID(); - $data['storageLocation'] = $targetUserObject->getHome(); - $data['lastLogin'] = $targetUserObject->getLastLogin() * 1000; - $data['backend'] = $targetUserObject->getBackendClassName(); - $data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID()); - $data['quota'] = $this->fillStorageInfo($targetUserObject->getUID()); - $data[AccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress(); - $data[AccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName(); - $data[AccountManager::PROPERTY_PHONE] = $userAccount[AccountManager::PROPERTY_PHONE]['value']; - $data[AccountManager::PROPERTY_ADDRESS] = $userAccount[AccountManager::PROPERTY_ADDRESS]['value']; - $data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value']; - $data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value']; - $data['groups'] = $gids; - $data['language'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'lang'); - - return $data; - } - /** * @NoAdminRequired * @NoSubAdminRequired @@ -855,30 +802,6 @@ class UsersController extends OCSController { } } - /** - * Get the groups a user is a subadmin of - * - * @param string $userId - * @return array - * @throws OCSException - */ - protected function getUserSubAdminGroupsData(string $userId): array { - $user = $this->userManager->get($userId); - // Check if the user exists - if($user === null) { - throw new OCSException('User does not exist', 101); - } - - // Get the subadmin groups - $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user); - $groups = []; - foreach ($subAdminGroups as $key => $group) { - $groups[] = $group->getGID(); - } - - return $groups; - } - /** * Get the groups a user is a subadmin of * @@ -891,38 +814,6 @@ class UsersController extends OCSController { return new DataResponse($groups); } - /** - * @param string $userId - * @return array - * @throws \OCP\Files\NotFoundException - */ - protected function fillStorageInfo(string $userId): array { - try { - \OC_Util::tearDownFS(); - \OC_Util::setupFS($userId); - $storage = OC_Helper::getStorageInfo('/'); - $data = [ - 'free' => $storage['free'], - 'used' => $storage['used'], - 'total' => $storage['total'], - 'relative' => $storage['relative'], - 'quota' => $storage['quota'], - ]; - } catch (NotFoundException $ex) { - // User fs is not setup yet - $user = $this->userManager->get($userId); - if ($user === null) { - throw new OCSException('User does not exist', 101); - } - $quota = OC_Helper::computerFileSize($user->getQuota()); - $data = [ - 'quota' => $quota ? $quota : 'none', - 'used' => 0 - ]; - } - return $data; - } - /** * @NoAdminRequired * @PasswordConfirmationRequired From 762002ec2eead8e282b671473a92c597a65b75e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 26 Mar 2018 20:04:32 +0200 Subject: [PATCH 6/8] Fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../lib/Controller/GroupsController.php | 17 ++-- .../tests/Controller/GroupsControllerTest.php | 84 ++++++++++--------- .../tests/Controller/UsersControllerTest.php | 6 +- build/autoloaderchecker.sh | 0 .../features/provisioning-v1.feature | 4 +- 5 files changed, 58 insertions(+), 53 deletions(-) mode change 100644 => 100755 build/autoloaderchecker.sh diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 880f498730..7c917fa6c9 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -76,15 +76,14 @@ class GroupsController extends OCSController { * @param ILogger $logger * @param UsersController $userController */ - public function __construct( - string $appName, - IRequest $request, - IUserManager $userManager, - IConfig $config, - IGroupManager $groupManager, - IUserSession $userSession, - AccountManager $accountManager, - ILogger $logger) { + public function __construct(string $appName, + IRequest $request, + IUserManager $userManager, + IConfig $config, + IGroupManager $groupManager, + IUserSession $userSession, + AccountManager $accountManager, + ILogger $logger) { parent::__construct($appName, $request); $this->groupManager = $groupManager; diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php index 9108e2e331..44b440a40b 100644 --- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php +++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php @@ -26,61 +26,67 @@ namespace OCA\Provisioning_API\Tests\Controller; +use OC\Accounts\AccountManager; +use OC\Group\Manager; +use OC\SubAdmin; use OCA\Provisioning_API\Controller\GroupsController; -use OCP\IGroupManager; +use OCP\IConfig; use OCP\ILogger; use OCP\IRequest; use OCP\IUser; +use OCP\IUserManager; use OCP\IUserSession; class GroupsControllerTest extends \Test\TestCase { - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ - protected $groupManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ - protected $userSession; - /** @var \OC\SubAdmin|\PHPUnit_Framework_MockObject_MockObject */ - protected $subAdminManager; - /** @var OCA\Provisioning_API\Controller\UsersController|\PHPUnit_Framework_MockObject_MockObject */ - protected $userController; - /** @var GroupsController */ + /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ + protected $request; + /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject */ + protected $userManager; + /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ + protected $config; + /** @var Manager|PHPUnit_Framework_MockObject_MockObject */ + protected $groupManager; + /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */ + protected $userSession; + /** @var AccountManager|PHPUnit_Framework_MockObject_MockObject */ + protected $accountManager; + /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */ + protected $logger; + + /** @var GroupsController|PHPUnit_Framework_MockObject_MockObject */ protected $api; protected function setUp() { parent::setUp(); - $this->subAdminManager = $this->getMockBuilder('OC\SubAdmin') - ->disableOriginalConstructor() - ->getMock(); + $this->request = $this->createMock(IRequest::class); + $this->userManager = $this->createMock(IUserManager::class); + $this->config = $this->createMock(IConfig::class); + $this->groupManager = $this->createMock(Manager::class); + $this->userSession = $this->createMock(IUserSession::class); + $this->accountManager = $this->createMock(AccountManager::class); + $this->logger = $this->createMock(ILogger::class); + + $this->subAdminManager = $this->createMock(SubAdmin::class); - $this->groupManager = $this->getMockBuilder('OC\Group\Manager') - ->disableOriginalConstructor() - ->getMock(); $this->groupManager - ->method('getSubAdmin') - ->willReturn($this->subAdminManager); - - $this->userSession = $this->getMockBuilder(IUserSession::class) - ->disableOriginalConstructor() + ->method('getSubAdmin') + ->willReturn($this->subAdminManager); + + $this->api = $this->getMockBuilder(GroupsController::class) + ->setConstructorArgs([ + 'provisioning_api', + $this->request, + $this->userManager, + $this->config, + $this->groupManager, + $this->userSession, + $this->accountManager, + $this->logger + ]) + ->setMethods(['fillStorageInfo']) ->getMock(); - $request = $this->getMockBuilder(IRequest::class) - ->disableOriginalConstructor() - ->getMock(); - - $logger = $this->createMock(ILogger::class); - - $this->userController = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController') - ->disableOriginalConstructor() - ->getMock(); - - $this->api = new GroupsController( - 'provisioning_api', - $request, - $this->groupManager, - $this->userSession, - $logger, - $this->userController - ); } /** diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index 0f53a7e639..3d6ab8f3eb 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -640,8 +640,8 @@ class UsersControllerTest extends TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 998 - * @expectedExceptionMessage The requested user could not be found + * @expectedExceptionCode 404 + * @expectedExceptionMessage User does not exist */ public function testGetUserTargetDoesNotExist() { $loggedInUser = $this->getMockBuilder(IUser::class) @@ -2818,7 +2818,7 @@ class UsersControllerTest extends TestCase { /** * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 + * @expectedExceptionCode 404 * @expectedExceptionMessage User does not exist */ public function testGetUserSubAdminGroupsNotExistingTargetUser() { diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh old mode 100644 new mode 100755 diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 84e2e30baa..647bcb1704 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -5,7 +5,7 @@ Feature: provisioning Scenario: Getting an not existing user Given As an "admin" When sending "GET" to "/cloud/users/test" - Then the OCS status code should be "998" + Then the OCS status code should be "404" And the HTTP status code should be "200" Scenario: Listing all users @@ -264,7 +264,7 @@ Feature: provisioning And user "not-user" does not exist And group "new-group" exists When sending "GET" to "/cloud/users/not-user/subadmins" - Then the OCS status code should be "101" + Then the OCS status code should be "404" And the HTTP status code should be "200" Scenario: Getting subadmin users of a group From 348171f311adb2758ad4c4de98d151569bec2d7a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 27 Mar 2018 11:05:36 +0200 Subject: [PATCH 7/8] Use abstract subclass so members can be defined Signed-off-by: Joas Schilling --- .../composer/composer/autoload_classmap.php | 2 +- .../composer/composer/autoload_static.php | 2 +- .../{UserDataTrait.php => AUserData.php} | 50 +++++++++++++++++-- .../lib/Controller/GroupsController.php | 33 +++--------- .../lib/Controller/UsersController.php | 30 +++-------- 5 files changed, 63 insertions(+), 54 deletions(-) rename apps/provisioning_api/lib/Controller/{UserDataTrait.php => AUserData.php} (76%) diff --git a/apps/provisioning_api/composer/composer/autoload_classmap.php b/apps/provisioning_api/composer/composer/autoload_classmap.php index 360fd40921..760eae8297 100644 --- a/apps/provisioning_api/composer/composer/autoload_classmap.php +++ b/apps/provisioning_api/composer/composer/autoload_classmap.php @@ -7,10 +7,10 @@ $baseDir = $vendorDir; return array( 'OCA\\Provisioning_API\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', + 'OCA\\Provisioning_API\\Controller\\AUserData' => $baseDir . '/../lib/Controller/AUserData.php', 'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir . '/../lib/Controller/AppConfigController.php', 'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir . '/../lib/Controller/AppsController.php', 'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir . '/../lib/Controller/GroupsController.php', - 'OCA\\Provisioning_API\\Controller\\UserDataTrait' => $baseDir . '/../lib/Controller/UserDataTrait.php', 'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir . '/../lib/Controller/UsersController.php', 'OCA\\Provisioning_API\\FederatedFileSharingFactory' => $baseDir . '/../lib/FederatedFileSharingFactory.php', 'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir . '/../lib/Middleware/Exceptions/NotSubAdminException.php', diff --git a/apps/provisioning_api/composer/composer/autoload_static.php b/apps/provisioning_api/composer/composer/autoload_static.php index 22fea99fa9..ccd4d54dcc 100644 --- a/apps/provisioning_api/composer/composer/autoload_static.php +++ b/apps/provisioning_api/composer/composer/autoload_static.php @@ -22,10 +22,10 @@ class ComposerStaticInitProvisioning_API public static $classMap = array ( 'OCA\\Provisioning_API\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', + 'OCA\\Provisioning_API\\Controller\\AUserData' => __DIR__ . '/..' . '/../lib/Controller/AUserData.php', 'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__ . '/..' . '/../lib/Controller/AppConfigController.php', 'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__ . '/..' . '/../lib/Controller/AppsController.php', 'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__ . '/..' . '/../lib/Controller/GroupsController.php', - 'OCA\\Provisioning_API\\Controller\\UserDataTrait' => __DIR__ . '/..' . '/../lib/Controller/UserDataTrait.php', 'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__ . '/..' . '/../lib/Controller/UsersController.php', 'OCA\\Provisioning_API\\FederatedFileSharingFactory' => __DIR__ . '/..' . '/../lib/FederatedFileSharingFactory.php', 'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__ . '/..' . '/../lib/Middleware/Exceptions/NotSubAdminException.php', diff --git a/apps/provisioning_api/lib/Controller/UserDataTrait.php b/apps/provisioning_api/lib/Controller/AUserData.php similarity index 76% rename from apps/provisioning_api/lib/Controller/UserDataTrait.php rename to apps/provisioning_api/lib/Controller/AUserData.php index ea481cb65f..2b209067ce 100644 --- a/apps/provisioning_api/lib/Controller/UserDataTrait.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -22,14 +22,54 @@ declare(strict_types=1); namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; -use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSNotFoundException; -use OCP\AppFramework\OCS\OCSForbiddenException; +use OCP\AppFramework\OCSController; use OCP\Files\NotFoundException; use OC_Helper; +use OCP\IConfig; +use OCP\IGroupManager; +use OCP\IRequest; +use OCP\IUserManager; +use OCP\IUserSession; -trait UserDataTrait { +abstract class AUserData extends OCSController { + + /** @var IUserManager */ + protected $userManager; + /** @var IConfig */ + protected $config; + /** @var IGroupManager|\OC\Group\Manager */ // FIXME Requires a method that is not on the interface + protected $groupManager; + /** @var IUserSession */ + protected $userSession; + /** @var AccountManager */ + protected $accountManager; + + /** + * @param string $appName + * @param IRequest $request + * @param IUserManager $userManager + * @param IConfig $config + * @param IGroupManager $groupManager + * @param IUserSession $userSession + * @param AccountManager $accountManager + */ + public function __construct(string $appName, + IRequest $request, + IUserManager $userManager, + IConfig $config, + IGroupManager $groupManager, + IUserSession $userSession, + AccountManager $accountManager) { + parent::__construct($appName, $request); + + $this->userManager = $userManager; + $this->config = $config; + $this->groupManager = $groupManager; + $this->userSession = $userSession; + $this->accountManager = $accountManager; + } /** * creates a array with all user data @@ -38,7 +78,7 @@ trait UserDataTrait { * @return array * @throws OCSException */ - public function getUserData(string $userId): array { + protected function getUserData(string $userId): array { $currentLoggedInUser = $this->userSession->getUser(); $data = []; @@ -134,4 +174,4 @@ trait UserDataTrait { return $data; } -} \ No newline at end of file +} diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 7c917fa6c9..c2958bc477 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCS\OCSForbiddenException; -use OCP\AppFramework\OCSController; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; @@ -43,24 +42,7 @@ use OCP\IUserManager; use OCP\IUserSession; use OCP\IUser; -class GroupsController extends OCSController { - - use UserDataTrait; - - /** @var IUserManager */ - private $userManager; - - /** @var IGroupManager */ - private $groupManager; - - /** @var IUserSession */ - private $userSession; - - /** @var IConfig */ - private $config; - - /** @var AccountManager */ - private $accountManager; +class GroupsController extends AUserData { /** @var ILogger */ private $logger; @@ -84,13 +66,14 @@ class GroupsController extends OCSController { IUserSession $userSession, AccountManager $accountManager, ILogger $logger) { - parent::__construct($appName, $request); + parent::__construct($appName, + $request, + $userManager, + $config, + $groupManager, + $userSession, + $accountManager); - $this->groupManager = $groupManager; - $this->userManager = $userManager; - $this->config = $config; - $this->userSession = $userSession; - $this->accountManager = $accountManager; $this->logger = $logger; } diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 62c234013b..1a710b592d 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -35,14 +35,11 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; use OC\HintException; use OC\Settings\Mailer\NewUserMailHelper; -use OC_Helper; use OCA\Provisioning_API\FederatedFileSharingFactory; use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSForbiddenException; -use OCP\AppFramework\OCSController; -use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; @@ -53,22 +50,10 @@ use OCP\IUserSession; use OCP\L10N\IFactory; use OCP\Security\ISecureRandom; -class UsersController extends OCSController { +class UsersController extends AUserData { - use UserDataTrait; - - /** @var IUserManager */ - private $userManager; - /** @var IConfig */ - private $config; /** @var IAppManager */ private $appManager; - /** @var IGroupManager|\OC\Group\Manager */ // FIXME Requires a method that is not on the interface - private $groupManager; - /** @var IUserSession */ - private $userSession; - /** @var AccountManager */ - private $accountManager; /** @var ILogger */ private $logger; /** @var IFactory */ @@ -108,14 +93,15 @@ class UsersController extends OCSController { NewUserMailHelper $newUserMailHelper, FederatedFileSharingFactory $federatedFileSharingFactory, ISecureRandom $secureRandom) { - parent::__construct($appName, $request); + parent::__construct($appName, + $request, + $userManager, + $config, + $groupManager, + $userSession, + $accountManager); - $this->userManager = $userManager; - $this->config = $config; $this->appManager = $appManager; - $this->groupManager = $groupManager; - $this->userSession = $userSession; - $this->accountManager = $accountManager; $this->logger = $logger; $this->l10nFactory = $l10nFactory; $this->newUserMailHelper = $newUserMailHelper; From eb4d7fba20f4c1857816188c2aa09bb67eff6429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 5 Apr 2018 17:12:52 +0200 Subject: [PATCH 8/8] Rebase to master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/provisioning_api/lib/Controller/AUserData.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index 2b209067ce..82ca98ced8 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -169,7 +169,16 @@ abstract class AUserData extends OCSController { 'quota' => $storage['quota'], ]; } catch (NotFoundException $ex) { - $data = []; + // User fs is not setup yet + $user = $this->userManager->get($userId); + if ($user === null) { + throw new OCSException('User does not exist', 101); + } + $quota = OC_Helper::computerFileSize($user->getQuota()); + $data = [ + 'quota' => $quota ? $quota : 'none', + 'used' => 0 + ]; } return $data; }