From 5a5511c48005a2c9da85ff0b7a83538201743ae8 Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Wed, 18 May 2022 16:28:05 +0200 Subject: [PATCH] Removes copyright comments. And uncessary libs. --- appinfo/routes.php | 26 ------------ lib/Controller/ASCIMGroup.php | 43 ++----------------- lib/Controller/ASCIMUser.php | 54 +++++------------------- lib/Controller/GroupController.php | 60 +++------------------------ lib/Controller/UserController.php | 64 ++++------------------------- lib/Responses/SCIMErrorResponse.php | 17 ++++---- lib/Responses/SCIMJSONResponse.php | 4 +- lib/Responses/SCIMListResponse.php | 16 ++++---- 8 files changed, 44 insertions(+), 240 deletions(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index f023c1b..20f5718 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -1,30 +1,4 @@ - * @author Christoph Wurst - * @author Joas Schilling - * @author John Molakvoæ - * @author Morris Jobke - * @author Roeland Jago Douma - * @author Tom Needham - * - * @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 - * - */ return [ 'resources' => [ 'user' => ['url' => '/Users'], diff --git a/lib/Controller/ASCIMGroup.php b/lib/Controller/ASCIMGroup.php index 1ef999c..747d056 100644 --- a/lib/Controller/ASCIMGroup.php +++ b/lib/Controller/ASCIMGroup.php @@ -2,51 +2,16 @@ declare(strict_types=1); -/** - * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) - * - * @author Arthur Schiwon - * @author Christoph Wurst - * @author Georg Ehrke - * @author Joas Schilling - * @author John Molakvoæ - * @author Roeland Jago Douma - * @author Vincent Petry - * - * @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 OCA\SCIMServiceProvider\Controller; use OC\Group\Manager; use OCP\Accounts\IAccountManager; -use OCP\Accounts\PropertyDoesNotExistException; use OCP\AppFramework\ApiController; -use OCP\AppFramework\Http; -use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IGroupManager; use OCP\IRequest; use OCP\IUserManager; use OCP\IUserSession; -use OCP\L10N\IFactory; -use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse; -use OCP\AppFramework\Http\DataResponse; -use OCP\IUser; -use Psr\Log\LoggerInterface; abstract class ASCIMGroup extends ApiController { /** @var IUserManager */ @@ -103,8 +68,8 @@ abstract class ASCIMGroup extends ApiController { } return [ - 'schemas' => ['urn:ietf:params:scim:schemas:core:2.0:Group'], - 'id' => $groupId, + 'schemas' => ['urn:ietf:params:scim:schemas:core:2.0:Group'], + 'id' => $groupId, 'displayName' => $group->getDisplayName(), 'externalId' => '1234', // todo 'meta' => [ @@ -113,7 +78,7 @@ abstract class ASCIMGroup extends ApiController { 'created' => '2022-04-28T18:27:17.783Z', // todo 'lastModified' => '2022-04-28T18:27:17.783Z' // todo ], - 'members' => $members - ]; + 'members' => $members + ]; } } diff --git a/lib/Controller/ASCIMUser.php b/lib/Controller/ASCIMUser.php index 7c60bf5..1e8b1b3 100644 --- a/lib/Controller/ASCIMUser.php +++ b/lib/Controller/ASCIMUser.php @@ -2,48 +2,16 @@ declare(strict_types=1); -/** - * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) - * - * @author Arthur Schiwon - * @author Christoph Wurst - * @author Georg Ehrke - * @author Joas Schilling - * @author John Molakvoæ - * @author Roeland Jago Douma - * @author Vincent Petry - * - * @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 OCA\SCIMServiceProvider\Controller; use OC\Group\Manager; use OCP\Accounts\IAccountManager; -use OCP\Accounts\PropertyDoesNotExistException; use OCP\AppFramework\ApiController; -use OCP\AppFramework\Http; -use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IGroupManager; use OCP\IRequest; use OCP\IUserManager; use OCP\IUserSession; -use OCP\L10N\IFactory; -use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse; abstract class ASCIMUser extends ApiController { /** @var IUserManager */ @@ -91,27 +59,27 @@ abstract class ASCIMUser extends ApiController { $enabled = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true'; return [ - 'schemas' => ["urn:ietf:params:scim:schemas:core:2.0:User"], - 'id' => $userId, + 'schemas' => ["urn:ietf:params:scim:schemas:core:2.0:User"], + 'id' => $userId, 'name' => [ 'formatted' => $targetUserObject->getDisplayName() ], - 'meta' => [ + 'meta' => [ 'resourceType' => 'User', 'location' => '/Users/' . $userId, 'created' => '2022-04-28T18:27:17.783Z', // todo 'lastModified' => '2022-04-28T18:27:17.783Z' // todo - ], - 'userName' => $userId, - 'displayName' => $targetUserObject->getDisplayName(), - 'emails' => [ // todo if no emails + ], + 'userName' => $userId, + 'displayName' => $targetUserObject->getDisplayName(), + 'emails' => [ // todo if no emails [ - 'primary' => true, - 'value' => $targetUserObject->getSystemEMailAddress() + 'primary' => true, + 'value' => $targetUserObject->getSystemEMailAddress() ] ], 'externalId' => '1234', // todo - 'active' => $enabled - ]; + 'active' => $enabled + ]; } } diff --git a/lib/Controller/GroupController.php b/lib/Controller/GroupController.php index fcad879..63fde8e 100644 --- a/lib/Controller/GroupController.php +++ b/lib/Controller/GroupController.php @@ -2,52 +2,9 @@ declare(strict_types=1); -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Arthur Schiwon - * @author Bjoern Schiessle - * @author Christoph Wurst - * @author Daniel Calviño Sánchez - * @author Daniel Kesselberg - * @author Joas Schilling - * @author John Molakvoæ - * @author Julius Härtl - * @author Lukas Reschke - * @author michag86 - * @author Mikael Hammarin - * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma - * @author Sujith Haridasan - * @author Thomas Citharel - * @author Thomas Müller - * @author Tom Needham - * @author Vincent Petry - * - * @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\SCIMServiceProvider\Controller; -use InvalidArgumentException; -use OC\HintException; -use OC\KnownUser\KnownUserService; use OCP\Accounts\IAccountManager; -use OCP\AppFramework\OCS\OCSException; -use OCP\AppFramework\OCSController; use OCP\AppFramework\Http\Response; use OCP\IConfig; use OCP\IGroupManager; @@ -62,7 +19,6 @@ use OCA\SCIMServiceProvider\Responses\SCIMListResponse; use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse; use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse; - class GroupController extends ASCIMGroup { /** @var IURLGenerator */ @@ -71,8 +27,6 @@ class GroupController extends ASCIMGroup { private $logger; /** @var ISecureRandom */ private $secureRandom; - /** @var KnownUserService */ - private $knownUserService; /** @var IEventDispatcher */ private $eventDispatcher; @@ -86,7 +40,6 @@ class GroupController extends ASCIMGroup { IURLGenerator $urlGenerator, LoggerInterface $logger, ISecureRandom $secureRandom, - KnownUserService $knownUserService, IEventDispatcher $eventDispatcher) { parent::__construct($appName, $request, @@ -99,7 +52,6 @@ class GroupController extends ASCIMGroup { $this->urlGenerator = $urlGenerator; $this->logger = $logger; $this->secureRandom = $secureRandom; - $this->knownUserService = $knownUserService; $this->eventDispatcher = $eventDispatcher; } @@ -138,13 +90,12 @@ class GroupController extends ASCIMGroup { * @NoCSRFRequired * * @param string $displayName - * @param array $members + * @param array $members * @return SCIMJSONResponse * @throws Exception */ - public function create( string $displayName = '', + public function create(string $displayName = '', array $members = []): SCIMJSONResponse { - $id = urlencode($displayName); // Validate name if (empty($id)) { @@ -173,13 +124,13 @@ class GroupController extends ASCIMGroup { * @NoCSRFRequired * * @param string $id - * + * * @param string $displayName - * @param array $members + * @param array $members * @return DataResponse * @throws Exception */ - public function update( string $id, + public function update(string $id, string $displayName = '', array $members = []): SCIMJSONResponse { $group = $this->groupManager->get($id); @@ -214,5 +165,4 @@ class GroupController extends ASCIMGroup { $response->setStatus(204); return $response; } - } diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php index f760837..a6119b3 100644 --- a/lib/Controller/UserController.php +++ b/lib/Controller/UserController.php @@ -2,52 +2,9 @@ declare(strict_types=1); -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Arthur Schiwon - * @author Bjoern Schiessle - * @author Christoph Wurst - * @author Daniel Calviño Sánchez - * @author Daniel Kesselberg - * @author Joas Schilling - * @author John Molakvoæ - * @author Julius Härtl - * @author Lukas Reschke - * @author michag86 - * @author Mikael Hammarin - * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma - * @author Sujith Haridasan - * @author Thomas Citharel - * @author Thomas Müller - * @author Tom Needham - * @author Vincent Petry - * - * @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\SCIMServiceProvider\Controller; -use InvalidArgumentException; -use OC\HintException; -use OC\KnownUser\KnownUserService; use OCP\Accounts\IAccountManager; -use OCP\AppFramework\OCS\OCSException; -use OCP\AppFramework\OCSController; use OCP\AppFramework\Http\Response; use OCP\IConfig; use OCP\IGroupManager; @@ -62,7 +19,6 @@ use OCA\SCIMServiceProvider\Responses\SCIMListResponse; use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse; use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse; - class UserController extends ASCIMUser { /** @var IURLGenerator */ @@ -71,8 +27,6 @@ class UserController extends ASCIMUser { private $logger; /** @var ISecureRandom */ private $secureRandom; - /** @var KnownUserService */ - private $knownUserService; /** @var IEventDispatcher */ private $eventDispatcher; @@ -86,7 +40,6 @@ class UserController extends ASCIMUser { IURLGenerator $urlGenerator, LoggerInterface $logger, ISecureRandom $secureRandom, - KnownUserService $knownUserService, IEventDispatcher $eventDispatcher) { parent::__construct($appName, $request, @@ -99,7 +52,6 @@ class UserController extends ASCIMUser { $this->urlGenerator = $urlGenerator; $this->logger = $logger; $this->secureRandom = $secureRandom; - $this->knownUserService = $knownUserService; $this->eventDispatcher = $eventDispatcher; } @@ -149,13 +101,13 @@ class UserController extends ASCIMUser { * * @param bool $active * @param string $displayName - * @param array $emails + * @param array $emails * @param string $userName * @return SCIMJSONResponse * @throws Exception */ - public function create( bool $active = true, - string $displayName = '', + public function create(bool $active = true, + string $displayName = '', array $emails = [], string $userName = ''): SCIMJSONResponse { if ($this->userManager->userExists($userName)) { @@ -165,7 +117,7 @@ class UserController extends ASCIMUser { try { $newUser = $this->userManager->createUser($userName, $this->secureRandom->generate(64)); - $this->logger->info('Successful createUser call with userid: ' . ['app' => 'SCIMServiceProvider']); + $this->logger->info('Successful createUser call with userid: ' . $userName, ['app' => 'SCIMServiceProvider']); foreach ($emails as $email) { $this->logger->error('Log email: ' . $email['value'], ['app' => 'SCIMServiceProvider']); if ($email['primary'] === true) { @@ -185,14 +137,14 @@ class UserController extends ASCIMUser { * @NoCSRFRequired * * @param string $id - * + * * @param bool $active * @param string $displayName - * @param array $emails + * @param array $emails * @return DataResponse * @throws Exception */ - public function update( string $id, + public function update(string $id, bool $active, string $displayName = '', array $emails = []): SCIMJSONResponse { @@ -209,7 +161,6 @@ class UserController extends ASCIMUser { $targetUser->setEnabled($active); } return new SCIMJSONResponse($this->getSCIMUser($id)); - } /** @@ -234,5 +185,4 @@ class UserController extends ASCIMUser { return new SCIMErrorResponse(['message' => 'Couldn\'t delete user'], 503); } } - } diff --git a/lib/Responses/SCIMErrorResponse.php b/lib/Responses/SCIMErrorResponse.php index 0614be5..ab37d42 100644 --- a/lib/Responses/SCIMErrorResponse.php +++ b/lib/Responses/SCIMErrorResponse.php @@ -3,13 +3,10 @@ namespace OCA\SCIMServiceProvider\Responses; use OCP\AppFramework\Http\Response; -use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse; - - /** * Class SCIMErrorResponse - * + * */ class SCIMErrorResponse extends SCIMJSONResponse { /** @@ -26,11 +23,11 @@ class SCIMErrorResponse extends SCIMJSONResponse { */ public function render() { $message = [ - 'schemas' => ['urn:ietf:params:scim:api:messages:2.0:Error'], - 'detail' => $this->data['message'], - 'scimType' => '', - 'status' => $this->getStatus() - ]; + 'schemas' => ['urn:ietf:params:scim:api:messages:2.0:Error'], + 'detail' => $this->data['message'], + 'scimType' => '', + 'status' => $this->getStatus() + ]; $response = json_encode($message, JSON_UNESCAPED_SLASHES); if ($response === false) { @@ -40,4 +37,4 @@ class SCIMErrorResponse extends SCIMJSONResponse { return $response; } -} \ No newline at end of file +} diff --git a/lib/Responses/SCIMJSONResponse.php b/lib/Responses/SCIMJSONResponse.php index 62878f4..47576f9 100644 --- a/lib/Responses/SCIMJSONResponse.php +++ b/lib/Responses/SCIMJSONResponse.php @@ -6,7 +6,7 @@ use OCP\AppFramework\Http\Response; /** * Class SCIMResourceResponse - * + * */ class SCIMJSONResponse extends Response { /** @@ -46,4 +46,4 @@ class SCIMJSONResponse extends Response { return $response; } -} \ No newline at end of file +} diff --git a/lib/Responses/SCIMListResponse.php b/lib/Responses/SCIMListResponse.php index 9cc4aa2..835e6fd 100644 --- a/lib/Responses/SCIMListResponse.php +++ b/lib/Responses/SCIMListResponse.php @@ -8,7 +8,7 @@ use OCA\SCIMServiceProvider\Exceptions\SCIMException; /** * Class SCIMListResponse - * + * */ class SCIMListResponse extends Response { /** @@ -39,12 +39,12 @@ class SCIMListResponse extends Response { * @throws \Exception If data could not get encoded */ public function render() { - $scimReponse = [ - 'schemas' => ['urn:ietf:params:scim:api:messages:2.0:ListResponse'], - 'startIndex' => 1, // todo pagination - 'Resources' => $this->data, - 'totalResults' => sizeof($this->data) - ]; + $scimReponse = [ + 'schemas' => ['urn:ietf:params:scim:api:messages:2.0:ListResponse'], + 'startIndex' => 1, // todo pagination + 'Resources' => $this->data, + 'totalResults' => sizeof($this->data) + ]; $response = json_encode($scimReponse, JSON_UNESCAPED_SLASHES); if ($response === false) { @@ -54,4 +54,4 @@ class SCIMListResponse extends Response { return $response; } -} \ No newline at end of file +}