Removes copyright comments.
And uncessary libs.
This commit is contained in:
parent
f420b252ae
commit
5a5511c480
8 changed files with 44 additions and 240 deletions
|
@ -1,30 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
||||||
*
|
|
||||||
* @author Bjoern Schiessle <bjoern@schiessle.org>
|
|
||||||
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
|
||||||
* @author Morris Jobke <hey@morrisjobke.de>
|
|
||||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
|
||||||
* @author Tom Needham <tom@owncloud.com>
|
|
||||||
*
|
|
||||||
* @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 <http://www.gnu.org/licenses/>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
return [
|
return [
|
||||||
'resources' => [
|
'resources' => [
|
||||||
'user' => ['url' => '/Users'],
|
'user' => ['url' => '/Users'],
|
||||||
|
|
|
@ -2,51 +2,16 @@
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
|
||||||
*
|
|
||||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
|
|
||||||
* @author Georg Ehrke <oc.list@georgehrke.com>
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
|
||||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
|
||||||
* @author Vincent Petry <vincent@nextcloud.com>
|
|
||||||
*
|
|
||||||
* @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 <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
namespace OCA\SCIMServiceProvider\Controller;
|
namespace OCA\SCIMServiceProvider\Controller;
|
||||||
|
|
||||||
use OC\Group\Manager;
|
use OC\Group\Manager;
|
||||||
use OCP\Accounts\IAccountManager;
|
use OCP\Accounts\IAccountManager;
|
||||||
use OCP\Accounts\PropertyDoesNotExistException;
|
|
||||||
use OCP\AppFramework\ApiController;
|
use OCP\AppFramework\ApiController;
|
||||||
use OCP\AppFramework\Http;
|
|
||||||
use OCP\Files\NotFoundException;
|
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IGroupManager;
|
use OCP\IGroupManager;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IUserManager;
|
use OCP\IUserManager;
|
||||||
use OCP\IUserSession;
|
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 {
|
abstract class ASCIMGroup extends ApiController {
|
||||||
/** @var IUserManager */
|
/** @var IUserManager */
|
||||||
|
@ -103,8 +68,8 @@ abstract class ASCIMGroup extends ApiController {
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'schemas' => ['urn:ietf:params:scim:schemas:core:2.0:Group'],
|
'schemas' => ['urn:ietf:params:scim:schemas:core:2.0:Group'],
|
||||||
'id' => $groupId,
|
'id' => $groupId,
|
||||||
'displayName' => $group->getDisplayName(),
|
'displayName' => $group->getDisplayName(),
|
||||||
'externalId' => '1234', // todo
|
'externalId' => '1234', // todo
|
||||||
'meta' => [
|
'meta' => [
|
||||||
|
@ -113,7 +78,7 @@ abstract class ASCIMGroup extends ApiController {
|
||||||
'created' => '2022-04-28T18:27:17.783Z', // todo
|
'created' => '2022-04-28T18:27:17.783Z', // todo
|
||||||
'lastModified' => '2022-04-28T18:27:17.783Z' // todo
|
'lastModified' => '2022-04-28T18:27:17.783Z' // todo
|
||||||
],
|
],
|
||||||
'members' => $members
|
'members' => $members
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,48 +2,16 @@
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
|
||||||
*
|
|
||||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
|
|
||||||
* @author Georg Ehrke <oc.list@georgehrke.com>
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
|
||||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
|
||||||
* @author Vincent Petry <vincent@nextcloud.com>
|
|
||||||
*
|
|
||||||
* @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 <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
namespace OCA\SCIMServiceProvider\Controller;
|
namespace OCA\SCIMServiceProvider\Controller;
|
||||||
|
|
||||||
use OC\Group\Manager;
|
use OC\Group\Manager;
|
||||||
use OCP\Accounts\IAccountManager;
|
use OCP\Accounts\IAccountManager;
|
||||||
use OCP\Accounts\PropertyDoesNotExistException;
|
|
||||||
use OCP\AppFramework\ApiController;
|
use OCP\AppFramework\ApiController;
|
||||||
use OCP\AppFramework\Http;
|
|
||||||
use OCP\Files\NotFoundException;
|
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IGroupManager;
|
use OCP\IGroupManager;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IUserManager;
|
use OCP\IUserManager;
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
use OCP\L10N\IFactory;
|
|
||||||
use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse;
|
|
||||||
|
|
||||||
abstract class ASCIMUser extends ApiController {
|
abstract class ASCIMUser extends ApiController {
|
||||||
/** @var IUserManager */
|
/** @var IUserManager */
|
||||||
|
@ -91,27 +59,27 @@ abstract class ASCIMUser extends ApiController {
|
||||||
$enabled = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
|
$enabled = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'schemas' => ["urn:ietf:params:scim:schemas:core:2.0:User"],
|
'schemas' => ["urn:ietf:params:scim:schemas:core:2.0:User"],
|
||||||
'id' => $userId,
|
'id' => $userId,
|
||||||
'name' => [
|
'name' => [
|
||||||
'formatted' => $targetUserObject->getDisplayName()
|
'formatted' => $targetUserObject->getDisplayName()
|
||||||
],
|
],
|
||||||
'meta' => [
|
'meta' => [
|
||||||
'resourceType' => 'User',
|
'resourceType' => 'User',
|
||||||
'location' => '/Users/' . $userId,
|
'location' => '/Users/' . $userId,
|
||||||
'created' => '2022-04-28T18:27:17.783Z', // todo
|
'created' => '2022-04-28T18:27:17.783Z', // todo
|
||||||
'lastModified' => '2022-04-28T18:27:17.783Z' // todo
|
'lastModified' => '2022-04-28T18:27:17.783Z' // todo
|
||||||
],
|
],
|
||||||
'userName' => $userId,
|
'userName' => $userId,
|
||||||
'displayName' => $targetUserObject->getDisplayName(),
|
'displayName' => $targetUserObject->getDisplayName(),
|
||||||
'emails' => [ // todo if no emails
|
'emails' => [ // todo if no emails
|
||||||
[
|
[
|
||||||
'primary' => true,
|
'primary' => true,
|
||||||
'value' => $targetUserObject->getSystemEMailAddress()
|
'value' => $targetUserObject->getSystemEMailAddress()
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
'externalId' => '1234', // todo
|
'externalId' => '1234', // todo
|
||||||
'active' => $enabled
|
'active' => $enabled
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,52 +2,9 @@
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
||||||
*
|
|
||||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
* @author Bjoern Schiessle <bjoern@schiessle.org>
|
|
||||||
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
|
|
||||||
* @author Daniel Calviño Sánchez <danxuliu@gmail.com>
|
|
||||||
* @author Daniel Kesselberg <mail@danielkesselberg.de>
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
|
||||||
* @author Julius Härtl <jus@bitgrid.net>
|
|
||||||
* @author Lukas Reschke <lukas@statuscode.ch>
|
|
||||||
* @author michag86 <micha_g@arcor.de>
|
|
||||||
* @author Mikael Hammarin <mikael@try2.se>
|
|
||||||
* @author Morris Jobke <hey@morrisjobke.de>
|
|
||||||
* @author Robin Appelman <robin@icewind.nl>
|
|
||||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
|
||||||
* @author Sujith Haridasan <sujith.h@gmail.com>
|
|
||||||
* @author Thomas Citharel <nextcloud@tcit.fr>
|
|
||||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
|
||||||
* @author Tom Needham <tom@owncloud.com>
|
|
||||||
* @author Vincent Petry <vincent@nextcloud.com>
|
|
||||||
*
|
|
||||||
* @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 <http://www.gnu.org/licenses/>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
namespace OCA\SCIMServiceProvider\Controller;
|
namespace OCA\SCIMServiceProvider\Controller;
|
||||||
|
|
||||||
use InvalidArgumentException;
|
|
||||||
use OC\HintException;
|
|
||||||
use OC\KnownUser\KnownUserService;
|
|
||||||
use OCP\Accounts\IAccountManager;
|
use OCP\Accounts\IAccountManager;
|
||||||
use OCP\AppFramework\OCS\OCSException;
|
|
||||||
use OCP\AppFramework\OCSController;
|
|
||||||
use OCP\AppFramework\Http\Response;
|
use OCP\AppFramework\Http\Response;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IGroupManager;
|
use OCP\IGroupManager;
|
||||||
|
@ -62,7 +19,6 @@ use OCA\SCIMServiceProvider\Responses\SCIMListResponse;
|
||||||
use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse;
|
use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse;
|
||||||
use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse;
|
use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse;
|
||||||
|
|
||||||
|
|
||||||
class GroupController extends ASCIMGroup {
|
class GroupController extends ASCIMGroup {
|
||||||
|
|
||||||
/** @var IURLGenerator */
|
/** @var IURLGenerator */
|
||||||
|
@ -71,8 +27,6 @@ class GroupController extends ASCIMGroup {
|
||||||
private $logger;
|
private $logger;
|
||||||
/** @var ISecureRandom */
|
/** @var ISecureRandom */
|
||||||
private $secureRandom;
|
private $secureRandom;
|
||||||
/** @var KnownUserService */
|
|
||||||
private $knownUserService;
|
|
||||||
/** @var IEventDispatcher */
|
/** @var IEventDispatcher */
|
||||||
private $eventDispatcher;
|
private $eventDispatcher;
|
||||||
|
|
||||||
|
@ -86,7 +40,6 @@ class GroupController extends ASCIMGroup {
|
||||||
IURLGenerator $urlGenerator,
|
IURLGenerator $urlGenerator,
|
||||||
LoggerInterface $logger,
|
LoggerInterface $logger,
|
||||||
ISecureRandom $secureRandom,
|
ISecureRandom $secureRandom,
|
||||||
KnownUserService $knownUserService,
|
|
||||||
IEventDispatcher $eventDispatcher) {
|
IEventDispatcher $eventDispatcher) {
|
||||||
parent::__construct($appName,
|
parent::__construct($appName,
|
||||||
$request,
|
$request,
|
||||||
|
@ -99,7 +52,6 @@ class GroupController extends ASCIMGroup {
|
||||||
$this->urlGenerator = $urlGenerator;
|
$this->urlGenerator = $urlGenerator;
|
||||||
$this->logger = $logger;
|
$this->logger = $logger;
|
||||||
$this->secureRandom = $secureRandom;
|
$this->secureRandom = $secureRandom;
|
||||||
$this->knownUserService = $knownUserService;
|
|
||||||
$this->eventDispatcher = $eventDispatcher;
|
$this->eventDispatcher = $eventDispatcher;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -138,13 +90,12 @@ class GroupController extends ASCIMGroup {
|
||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
*
|
*
|
||||||
* @param string $displayName
|
* @param string $displayName
|
||||||
* @param array $members
|
* @param array $members
|
||||||
* @return SCIMJSONResponse
|
* @return SCIMJSONResponse
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function create( string $displayName = '',
|
public function create(string $displayName = '',
|
||||||
array $members = []): SCIMJSONResponse {
|
array $members = []): SCIMJSONResponse {
|
||||||
|
|
||||||
$id = urlencode($displayName);
|
$id = urlencode($displayName);
|
||||||
// Validate name
|
// Validate name
|
||||||
if (empty($id)) {
|
if (empty($id)) {
|
||||||
|
@ -175,11 +126,11 @@ class GroupController extends ASCIMGroup {
|
||||||
* @param string $id
|
* @param string $id
|
||||||
*
|
*
|
||||||
* @param string $displayName
|
* @param string $displayName
|
||||||
* @param array $members
|
* @param array $members
|
||||||
* @return DataResponse
|
* @return DataResponse
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function update( string $id,
|
public function update(string $id,
|
||||||
string $displayName = '',
|
string $displayName = '',
|
||||||
array $members = []): SCIMJSONResponse {
|
array $members = []): SCIMJSONResponse {
|
||||||
$group = $this->groupManager->get($id);
|
$group = $this->groupManager->get($id);
|
||||||
|
@ -214,5 +165,4 @@ class GroupController extends ASCIMGroup {
|
||||||
$response->setStatus(204);
|
$response->setStatus(204);
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,52 +2,9 @@
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
||||||
*
|
|
||||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
* @author Bjoern Schiessle <bjoern@schiessle.org>
|
|
||||||
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
|
|
||||||
* @author Daniel Calviño Sánchez <danxuliu@gmail.com>
|
|
||||||
* @author Daniel Kesselberg <mail@danielkesselberg.de>
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
|
||||||
* @author Julius Härtl <jus@bitgrid.net>
|
|
||||||
* @author Lukas Reschke <lukas@statuscode.ch>
|
|
||||||
* @author michag86 <micha_g@arcor.de>
|
|
||||||
* @author Mikael Hammarin <mikael@try2.se>
|
|
||||||
* @author Morris Jobke <hey@morrisjobke.de>
|
|
||||||
* @author Robin Appelman <robin@icewind.nl>
|
|
||||||
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
|
||||||
* @author Sujith Haridasan <sujith.h@gmail.com>
|
|
||||||
* @author Thomas Citharel <nextcloud@tcit.fr>
|
|
||||||
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
|
||||||
* @author Tom Needham <tom@owncloud.com>
|
|
||||||
* @author Vincent Petry <vincent@nextcloud.com>
|
|
||||||
*
|
|
||||||
* @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 <http://www.gnu.org/licenses/>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
namespace OCA\SCIMServiceProvider\Controller;
|
namespace OCA\SCIMServiceProvider\Controller;
|
||||||
|
|
||||||
use InvalidArgumentException;
|
|
||||||
use OC\HintException;
|
|
||||||
use OC\KnownUser\KnownUserService;
|
|
||||||
use OCP\Accounts\IAccountManager;
|
use OCP\Accounts\IAccountManager;
|
||||||
use OCP\AppFramework\OCS\OCSException;
|
|
||||||
use OCP\AppFramework\OCSController;
|
|
||||||
use OCP\AppFramework\Http\Response;
|
use OCP\AppFramework\Http\Response;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IGroupManager;
|
use OCP\IGroupManager;
|
||||||
|
@ -62,7 +19,6 @@ use OCA\SCIMServiceProvider\Responses\SCIMListResponse;
|
||||||
use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse;
|
use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse;
|
||||||
use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse;
|
use OCA\SCIMServiceProvider\Responses\SCIMErrorResponse;
|
||||||
|
|
||||||
|
|
||||||
class UserController extends ASCIMUser {
|
class UserController extends ASCIMUser {
|
||||||
|
|
||||||
/** @var IURLGenerator */
|
/** @var IURLGenerator */
|
||||||
|
@ -71,8 +27,6 @@ class UserController extends ASCIMUser {
|
||||||
private $logger;
|
private $logger;
|
||||||
/** @var ISecureRandom */
|
/** @var ISecureRandom */
|
||||||
private $secureRandom;
|
private $secureRandom;
|
||||||
/** @var KnownUserService */
|
|
||||||
private $knownUserService;
|
|
||||||
/** @var IEventDispatcher */
|
/** @var IEventDispatcher */
|
||||||
private $eventDispatcher;
|
private $eventDispatcher;
|
||||||
|
|
||||||
|
@ -86,7 +40,6 @@ class UserController extends ASCIMUser {
|
||||||
IURLGenerator $urlGenerator,
|
IURLGenerator $urlGenerator,
|
||||||
LoggerInterface $logger,
|
LoggerInterface $logger,
|
||||||
ISecureRandom $secureRandom,
|
ISecureRandom $secureRandom,
|
||||||
KnownUserService $knownUserService,
|
|
||||||
IEventDispatcher $eventDispatcher) {
|
IEventDispatcher $eventDispatcher) {
|
||||||
parent::__construct($appName,
|
parent::__construct($appName,
|
||||||
$request,
|
$request,
|
||||||
|
@ -99,7 +52,6 @@ class UserController extends ASCIMUser {
|
||||||
$this->urlGenerator = $urlGenerator;
|
$this->urlGenerator = $urlGenerator;
|
||||||
$this->logger = $logger;
|
$this->logger = $logger;
|
||||||
$this->secureRandom = $secureRandom;
|
$this->secureRandom = $secureRandom;
|
||||||
$this->knownUserService = $knownUserService;
|
|
||||||
$this->eventDispatcher = $eventDispatcher;
|
$this->eventDispatcher = $eventDispatcher;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,13 +101,13 @@ class UserController extends ASCIMUser {
|
||||||
*
|
*
|
||||||
* @param bool $active
|
* @param bool $active
|
||||||
* @param string $displayName
|
* @param string $displayName
|
||||||
* @param array $emails
|
* @param array $emails
|
||||||
* @param string $userName
|
* @param string $userName
|
||||||
* @return SCIMJSONResponse
|
* @return SCIMJSONResponse
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function create( bool $active = true,
|
public function create(bool $active = true,
|
||||||
string $displayName = '',
|
string $displayName = '',
|
||||||
array $emails = [],
|
array $emails = [],
|
||||||
string $userName = ''): SCIMJSONResponse {
|
string $userName = ''): SCIMJSONResponse {
|
||||||
if ($this->userManager->userExists($userName)) {
|
if ($this->userManager->userExists($userName)) {
|
||||||
|
@ -165,7 +117,7 @@ class UserController extends ASCIMUser {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$newUser = $this->userManager->createUser($userName, $this->secureRandom->generate(64));
|
$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) {
|
foreach ($emails as $email) {
|
||||||
$this->logger->error('Log email: ' . $email['value'], ['app' => 'SCIMServiceProvider']);
|
$this->logger->error('Log email: ' . $email['value'], ['app' => 'SCIMServiceProvider']);
|
||||||
if ($email['primary'] === true) {
|
if ($email['primary'] === true) {
|
||||||
|
@ -188,11 +140,11 @@ class UserController extends ASCIMUser {
|
||||||
*
|
*
|
||||||
* @param bool $active
|
* @param bool $active
|
||||||
* @param string $displayName
|
* @param string $displayName
|
||||||
* @param array $emails
|
* @param array $emails
|
||||||
* @return DataResponse
|
* @return DataResponse
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function update( string $id,
|
public function update(string $id,
|
||||||
bool $active,
|
bool $active,
|
||||||
string $displayName = '',
|
string $displayName = '',
|
||||||
array $emails = []): SCIMJSONResponse {
|
array $emails = []): SCIMJSONResponse {
|
||||||
|
@ -209,7 +161,6 @@ class UserController extends ASCIMUser {
|
||||||
$targetUser->setEnabled($active);
|
$targetUser->setEnabled($active);
|
||||||
}
|
}
|
||||||
return new SCIMJSONResponse($this->getSCIMUser($id));
|
return new SCIMJSONResponse($this->getSCIMUser($id));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -234,5 +185,4 @@ class UserController extends ASCIMUser {
|
||||||
return new SCIMErrorResponse(['message' => 'Couldn\'t delete user'], 503);
|
return new SCIMErrorResponse(['message' => 'Couldn\'t delete user'], 503);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
namespace OCA\SCIMServiceProvider\Responses;
|
namespace OCA\SCIMServiceProvider\Responses;
|
||||||
|
|
||||||
use OCP\AppFramework\Http\Response;
|
use OCP\AppFramework\Http\Response;
|
||||||
use OCA\SCIMServiceProvider\Responses\SCIMJSONResponse;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class SCIMErrorResponse
|
* Class SCIMErrorResponse
|
||||||
|
@ -26,11 +23,11 @@ class SCIMErrorResponse extends SCIMJSONResponse {
|
||||||
*/
|
*/
|
||||||
public function render() {
|
public function render() {
|
||||||
$message = [
|
$message = [
|
||||||
'schemas' => ['urn:ietf:params:scim:api:messages:2.0:Error'],
|
'schemas' => ['urn:ietf:params:scim:api:messages:2.0:Error'],
|
||||||
'detail' => $this->data['message'],
|
'detail' => $this->data['message'],
|
||||||
'scimType' => '',
|
'scimType' => '',
|
||||||
'status' => $this->getStatus()
|
'status' => $this->getStatus()
|
||||||
];
|
];
|
||||||
$response = json_encode($message, JSON_UNESCAPED_SLASHES);
|
$response = json_encode($message, JSON_UNESCAPED_SLASHES);
|
||||||
|
|
||||||
if ($response === false) {
|
if ($response === false) {
|
||||||
|
|
|
@ -39,12 +39,12 @@ class SCIMListResponse extends Response {
|
||||||
* @throws \Exception If data could not get encoded
|
* @throws \Exception If data could not get encoded
|
||||||
*/
|
*/
|
||||||
public function render() {
|
public function render() {
|
||||||
$scimReponse = [
|
$scimReponse = [
|
||||||
'schemas' => ['urn:ietf:params:scim:api:messages:2.0:ListResponse'],
|
'schemas' => ['urn:ietf:params:scim:api:messages:2.0:ListResponse'],
|
||||||
'startIndex' => 1, // todo pagination
|
'startIndex' => 1, // todo pagination
|
||||||
'Resources' => $this->data,
|
'Resources' => $this->data,
|
||||||
'totalResults' => sizeof($this->data)
|
'totalResults' => sizeof($this->data)
|
||||||
];
|
];
|
||||||
$response = json_encode($scimReponse, JSON_UNESCAPED_SLASHES);
|
$response = json_encode($scimReponse, JSON_UNESCAPED_SLASHES);
|
||||||
|
|
||||||
if ($response === false) {
|
if ($response === false) {
|
||||||
|
|
Loading…
Reference in a new issue