nextcloud /
server
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCA\OAuth2\Db\ClientMapper; |
| 28 | 28 | use OCP\AppFramework\Controller; |
| 29 | 29 | use OCP\AppFramework\Http\JSONResponse; |
| 30 | -use OCP\AppFramework\Http\RedirectResponse; |
|
| 31 | 30 | use OCP\IRequest; |
| 32 | 31 | use OCP\IURLGenerator; |
| 33 | 32 | use OCP\Security\ISecureRandom; |
@@ -33,87 +33,87 @@ |
||
| 33 | 33 | use OCP\Security\ISecureRandom; |
| 34 | 34 | |
| 35 | 35 | class SettingsController extends Controller { |
| 36 | - /** @var IURLGenerator */ |
|
| 37 | - private $urlGenerator; |
|
| 38 | - /** @var ClientMapper */ |
|
| 39 | - private $clientMapper; |
|
| 40 | - /** @var ISecureRandom */ |
|
| 41 | - private $secureRandom; |
|
| 42 | - /** @var AccessTokenMapper */ |
|
| 43 | - private $accessTokenMapper; |
|
| 44 | - /** @var DefaultTokenMapper */ |
|
| 45 | - private $defaultTokenMapper; |
|
| 36 | + /** @var IURLGenerator */ |
|
| 37 | + private $urlGenerator; |
|
| 38 | + /** @var ClientMapper */ |
|
| 39 | + private $clientMapper; |
|
| 40 | + /** @var ISecureRandom */ |
|
| 41 | + private $secureRandom; |
|
| 42 | + /** @var AccessTokenMapper */ |
|
| 43 | + private $accessTokenMapper; |
|
| 44 | + /** @var DefaultTokenMapper */ |
|
| 45 | + private $defaultTokenMapper; |
|
| 46 | 46 | |
| 47 | - const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; |
|
| 47 | + const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @param string $appName |
|
| 51 | - * @param IRequest $request |
|
| 52 | - * @param IURLGenerator $urlGenerator |
|
| 53 | - * @param ClientMapper $clientMapper |
|
| 54 | - * @param ISecureRandom $secureRandom |
|
| 55 | - * @param AccessTokenMapper $accessTokenMapper |
|
| 56 | - * @param DefaultTokenMapper $defaultTokenMapper |
|
| 57 | - */ |
|
| 58 | - public function __construct(string $appName, |
|
| 59 | - IRequest $request, |
|
| 60 | - IURLGenerator $urlGenerator, |
|
| 61 | - ClientMapper $clientMapper, |
|
| 62 | - ISecureRandom $secureRandom, |
|
| 63 | - AccessTokenMapper $accessTokenMapper, |
|
| 64 | - DefaultTokenMapper $defaultTokenMapper |
|
| 65 | - ) { |
|
| 66 | - parent::__construct($appName, $request); |
|
| 67 | - $this->urlGenerator = $urlGenerator; |
|
| 68 | - $this->secureRandom = $secureRandom; |
|
| 69 | - $this->clientMapper = $clientMapper; |
|
| 70 | - $this->accessTokenMapper = $accessTokenMapper; |
|
| 71 | - $this->defaultTokenMapper = $defaultTokenMapper; |
|
| 72 | - } |
|
| 49 | + /** |
|
| 50 | + * @param string $appName |
|
| 51 | + * @param IRequest $request |
|
| 52 | + * @param IURLGenerator $urlGenerator |
|
| 53 | + * @param ClientMapper $clientMapper |
|
| 54 | + * @param ISecureRandom $secureRandom |
|
| 55 | + * @param AccessTokenMapper $accessTokenMapper |
|
| 56 | + * @param DefaultTokenMapper $defaultTokenMapper |
|
| 57 | + */ |
|
| 58 | + public function __construct(string $appName, |
|
| 59 | + IRequest $request, |
|
| 60 | + IURLGenerator $urlGenerator, |
|
| 61 | + ClientMapper $clientMapper, |
|
| 62 | + ISecureRandom $secureRandom, |
|
| 63 | + AccessTokenMapper $accessTokenMapper, |
|
| 64 | + DefaultTokenMapper $defaultTokenMapper |
|
| 65 | + ) { |
|
| 66 | + parent::__construct($appName, $request); |
|
| 67 | + $this->urlGenerator = $urlGenerator; |
|
| 68 | + $this->secureRandom = $secureRandom; |
|
| 69 | + $this->clientMapper = $clientMapper; |
|
| 70 | + $this->accessTokenMapper = $accessTokenMapper; |
|
| 71 | + $this->defaultTokenMapper = $defaultTokenMapper; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - public function addClient(string $name, |
|
| 75 | - string $redirectUri): JSONResponse { |
|
| 76 | - $client = new Client(); |
|
| 77 | - $client->setName($name); |
|
| 78 | - $client->setRedirectUri($redirectUri); |
|
| 79 | - $client->setSecret($this->secureRandom->generate(64, self::validChars)); |
|
| 80 | - $client->setClientIdentifier($this->secureRandom->generate(64, self::validChars)); |
|
| 81 | - $client = $this->clientMapper->insert($client); |
|
| 74 | + public function addClient(string $name, |
|
| 75 | + string $redirectUri): JSONResponse { |
|
| 76 | + $client = new Client(); |
|
| 77 | + $client->setName($name); |
|
| 78 | + $client->setRedirectUri($redirectUri); |
|
| 79 | + $client->setSecret($this->secureRandom->generate(64, self::validChars)); |
|
| 80 | + $client->setClientIdentifier($this->secureRandom->generate(64, self::validChars)); |
|
| 81 | + $client = $this->clientMapper->insert($client); |
|
| 82 | 82 | |
| 83 | - $result = [ |
|
| 84 | - 'id' => $client->getId(), |
|
| 85 | - 'name' => $client->getName(), |
|
| 86 | - 'redirectUri' => $client->getRedirectUri(), |
|
| 87 | - 'clientId' => $client->getClientIdentifier(), |
|
| 88 | - 'clientSecret' => $client->getSecret(), |
|
| 89 | - ]; |
|
| 83 | + $result = [ |
|
| 84 | + 'id' => $client->getId(), |
|
| 85 | + 'name' => $client->getName(), |
|
| 86 | + 'redirectUri' => $client->getRedirectUri(), |
|
| 87 | + 'clientId' => $client->getClientIdentifier(), |
|
| 88 | + 'clientSecret' => $client->getSecret(), |
|
| 89 | + ]; |
|
| 90 | 90 | |
| 91 | - return new JSONResponse($result); |
|
| 92 | - } |
|
| 91 | + return new JSONResponse($result); |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - public function deleteClient(int $id): JSONResponse { |
|
| 95 | - $client = $this->clientMapper->getByUid($id); |
|
| 96 | - $this->accessTokenMapper->deleteByClientId($id); |
|
| 97 | - $this->defaultTokenMapper->deleteByName($client->getName()); |
|
| 98 | - $this->clientMapper->delete($client); |
|
| 99 | - return new JSONResponse([]); |
|
| 100 | - } |
|
| 94 | + public function deleteClient(int $id): JSONResponse { |
|
| 95 | + $client = $this->clientMapper->getByUid($id); |
|
| 96 | + $this->accessTokenMapper->deleteByClientId($id); |
|
| 97 | + $this->defaultTokenMapper->deleteByName($client->getName()); |
|
| 98 | + $this->clientMapper->delete($client); |
|
| 99 | + return new JSONResponse([]); |
|
| 100 | + } |
|
| 101 | 101 | |
| 102 | - public function getClients(): JSONResponse { |
|
| 103 | - $clients = $this->clientMapper->getClients(); |
|
| 102 | + public function getClients(): JSONResponse { |
|
| 103 | + $clients = $this->clientMapper->getClients(); |
|
| 104 | 104 | |
| 105 | - $result = []; |
|
| 105 | + $result = []; |
|
| 106 | 106 | |
| 107 | - foreach ($clients as $client) { |
|
| 108 | - $result[] = [ |
|
| 109 | - 'id' => $client->getId(), |
|
| 110 | - 'name' => $client->getName(), |
|
| 111 | - 'redirectUri' => $client->getRedirectUri(), |
|
| 112 | - 'clientId' => $client->getClientIdentifier(), |
|
| 113 | - 'clientSecret' => $client->getSecret(), |
|
| 114 | - ]; |
|
| 115 | - } |
|
| 107 | + foreach ($clients as $client) { |
|
| 108 | + $result[] = [ |
|
| 109 | + 'id' => $client->getId(), |
|
| 110 | + 'name' => $client->getName(), |
|
| 111 | + 'redirectUri' => $client->getRedirectUri(), |
|
| 112 | + 'clientId' => $client->getClientIdentifier(), |
|
| 113 | + 'clientSecret' => $client->getSecret(), |
|
| 114 | + ]; |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - return new JSONResponse($result); |
|
| 118 | - } |
|
| 117 | + return new JSONResponse($result); |
|
| 118 | + } |
|
| 119 | 119 | } |
@@ -20,31 +20,31 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | return [ |
| 23 | - 'routes' => [ |
|
| 24 | - [ |
|
| 25 | - 'name' => 'Settings#addClient', |
|
| 26 | - 'url' => '/clients', |
|
| 27 | - 'verb' => 'POST', |
|
| 28 | - ], |
|
| 29 | - [ |
|
| 30 | - 'name' => 'Settings#getClients', |
|
| 31 | - 'url' => '/clients', |
|
| 32 | - 'verb' => 'GET', |
|
| 33 | - ], |
|
| 34 | - [ |
|
| 35 | - 'name' => 'Settings#deleteClient', |
|
| 36 | - 'url' => '/clients/{id}', |
|
| 37 | - 'verb' => 'DELETE' |
|
| 38 | - ], |
|
| 39 | - [ |
|
| 40 | - 'name' => 'LoginRedirector#authorize', |
|
| 41 | - 'url' => '/authorize', |
|
| 42 | - 'verb' => 'GET', |
|
| 43 | - ], |
|
| 44 | - [ |
|
| 45 | - 'name' => 'OauthApi#getToken', |
|
| 46 | - 'url' => '/api/v1/token', |
|
| 47 | - 'verb' => 'POST' |
|
| 48 | - ], |
|
| 49 | - ], |
|
| 23 | + 'routes' => [ |
|
| 24 | + [ |
|
| 25 | + 'name' => 'Settings#addClient', |
|
| 26 | + 'url' => '/clients', |
|
| 27 | + 'verb' => 'POST', |
|
| 28 | + ], |
|
| 29 | + [ |
|
| 30 | + 'name' => 'Settings#getClients', |
|
| 31 | + 'url' => '/clients', |
|
| 32 | + 'verb' => 'GET', |
|
| 33 | + ], |
|
| 34 | + [ |
|
| 35 | + 'name' => 'Settings#deleteClient', |
|
| 36 | + 'url' => '/clients/{id}', |
|
| 37 | + 'verb' => 'DELETE' |
|
| 38 | + ], |
|
| 39 | + [ |
|
| 40 | + 'name' => 'LoginRedirector#authorize', |
|
| 41 | + 'url' => '/authorize', |
|
| 42 | + 'verb' => 'GET', |
|
| 43 | + ], |
|
| 44 | + [ |
|
| 45 | + 'name' => 'OauthApi#getToken', |
|
| 46 | + 'url' => '/api/v1/token', |
|
| 47 | + 'verb' => 'POST' |
|
| 48 | + ], |
|
| 49 | + ], |
|
| 50 | 50 | ]; |
@@ -26,39 +26,39 @@ |
||
| 26 | 26 | use OCP\Settings\ISettings; |
| 27 | 27 | |
| 28 | 28 | class Admin implements ISettings { |
| 29 | - /** @var ClientMapper */ |
|
| 30 | - private $clientMapper; |
|
| 29 | + /** @var ClientMapper */ |
|
| 30 | + private $clientMapper; |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @param ClientMapper $clientMapper |
|
| 34 | - */ |
|
| 35 | - public function __construct(ClientMapper $clientMapper) { |
|
| 36 | - $this->clientMapper = $clientMapper; |
|
| 37 | - } |
|
| 32 | + /** |
|
| 33 | + * @param ClientMapper $clientMapper |
|
| 34 | + */ |
|
| 35 | + public function __construct(ClientMapper $clientMapper) { |
|
| 36 | + $this->clientMapper = $clientMapper; |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @return TemplateResponse |
|
| 41 | - */ |
|
| 42 | - public function getForm() { |
|
| 43 | - return new TemplateResponse( |
|
| 44 | - 'oauth2', |
|
| 45 | - 'admin', |
|
| 46 | - [], |
|
| 47 | - '' |
|
| 48 | - ); |
|
| 49 | - } |
|
| 39 | + /** |
|
| 40 | + * @return TemplateResponse |
|
| 41 | + */ |
|
| 42 | + public function getForm() { |
|
| 43 | + return new TemplateResponse( |
|
| 44 | + 'oauth2', |
|
| 45 | + 'admin', |
|
| 46 | + [], |
|
| 47 | + '' |
|
| 48 | + ); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * {@inheritdoc} |
|
| 53 | - */ |
|
| 54 | - public function getSection() { |
|
| 55 | - return 'security'; |
|
| 56 | - } |
|
| 51 | + /** |
|
| 52 | + * {@inheritdoc} |
|
| 53 | + */ |
|
| 54 | + public function getSection() { |
|
| 55 | + return 'security'; |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * {@inheritdoc} |
|
| 60 | - */ |
|
| 61 | - public function getPriority() { |
|
| 62 | - return 0; |
|
| 63 | - } |
|
| 58 | + /** |
|
| 59 | + * {@inheritdoc} |
|
| 60 | + */ |
|
| 61 | + public function getPriority() { |
|
| 62 | + return 0; |
|
| 63 | + } |
|
| 64 | 64 | } |
