summaryrefslogtreecommitdiffstats
path: root/apps/provisioning_api/lib/Controller
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-03-23 18:24:03 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-04-05 17:09:00 +0200
commitb023bfe38fa7802de7efb42bb9ee11b81d73b7a7 (patch)
tree3f766bdaf551cfd02b89ba63538206e47eaab592 /apps/provisioning_api/lib/Controller
parent4011ea97b1a8553ecced4110f1d6d46268a52979 (diff)
downloadnextcloud-server-b023bfe38fa7802de7efb42bb9ee11b81d73b7a7.tar.gz
nextcloud-server-b023bfe38fa7802de7efb42bb9ee11b81d73b7a7.zip
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/provisioning_api/lib/Controller')
-rw-r--r--apps/provisioning_api/lib/Controller/GroupsController.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php
index 423313418a8..15818ea423c 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();
}
/**