Cleanup Controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
b6182489be
commit
1ccb36a0f1
|
@ -1,4 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
/**
|
/**
|
||||||
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
|
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
|
||||||
*
|
*
|
||||||
|
@ -27,14 +28,10 @@ use OCA\OAuth2\Db\Client;
|
||||||
use OCA\OAuth2\Db\ClientMapper;
|
use OCA\OAuth2\Db\ClientMapper;
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
use OCP\AppFramework\Http\JSONResponse;
|
use OCP\AppFramework\Http\JSONResponse;
|
||||||
use OCP\AppFramework\Http\RedirectResponse;
|
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IURLGenerator;
|
|
||||||
use OCP\Security\ISecureRandom;
|
use OCP\Security\ISecureRandom;
|
||||||
|
|
||||||
class SettingsController extends Controller {
|
class SettingsController extends Controller {
|
||||||
/** @var IURLGenerator */
|
|
||||||
private $urlGenerator;
|
|
||||||
/** @var ClientMapper */
|
/** @var ClientMapper */
|
||||||
private $clientMapper;
|
private $clientMapper;
|
||||||
/** @var ISecureRandom */
|
/** @var ISecureRandom */
|
||||||
|
@ -49,7 +46,6 @@ class SettingsController extends Controller {
|
||||||
/**
|
/**
|
||||||
* @param string $appName
|
* @param string $appName
|
||||||
* @param IRequest $request
|
* @param IRequest $request
|
||||||
* @param IURLGenerator $urlGenerator
|
|
||||||
* @param ClientMapper $clientMapper
|
* @param ClientMapper $clientMapper
|
||||||
* @param ISecureRandom $secureRandom
|
* @param ISecureRandom $secureRandom
|
||||||
* @param AccessTokenMapper $accessTokenMapper
|
* @param AccessTokenMapper $accessTokenMapper
|
||||||
|
@ -57,14 +53,12 @@ class SettingsController extends Controller {
|
||||||
*/
|
*/
|
||||||
public function __construct(string $appName,
|
public function __construct(string $appName,
|
||||||
IRequest $request,
|
IRequest $request,
|
||||||
IURLGenerator $urlGenerator,
|
|
||||||
ClientMapper $clientMapper,
|
ClientMapper $clientMapper,
|
||||||
ISecureRandom $secureRandom,
|
ISecureRandom $secureRandom,
|
||||||
AccessTokenMapper $accessTokenMapper,
|
AccessTokenMapper $accessTokenMapper,
|
||||||
DefaultTokenMapper $defaultTokenMapper
|
DefaultTokenMapper $defaultTokenMapper
|
||||||
) {
|
) {
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
$this->urlGenerator = $urlGenerator;
|
|
||||||
$this->secureRandom = $secureRandom;
|
$this->secureRandom = $secureRandom;
|
||||||
$this->clientMapper = $clientMapper;
|
$this->clientMapper = $clientMapper;
|
||||||
$this->accessTokenMapper = $accessTokenMapper;
|
$this->accessTokenMapper = $accessTokenMapper;
|
||||||
|
|
|
@ -27,17 +27,13 @@ use OCA\OAuth2\Db\AccessTokenMapper;
|
||||||
use OCA\OAuth2\Db\Client;
|
use OCA\OAuth2\Db\Client;
|
||||||
use OCA\OAuth2\Db\ClientMapper;
|
use OCA\OAuth2\Db\ClientMapper;
|
||||||
use OCP\AppFramework\Http\JSONResponse;
|
use OCP\AppFramework\Http\JSONResponse;
|
||||||
use OCP\AppFramework\Http\RedirectResponse;
|
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IURLGenerator;
|
|
||||||
use OCP\Security\ISecureRandom;
|
use OCP\Security\ISecureRandom;
|
||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
|
|
||||||
class SettingsControllerTest extends TestCase {
|
class SettingsControllerTest extends TestCase {
|
||||||
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $request;
|
private $request;
|
||||||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
|
|
||||||
private $urlGenerator;
|
|
||||||
/** @var ClientMapper|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var ClientMapper|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $clientMapper;
|
private $clientMapper;
|
||||||
/** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
@ -53,7 +49,6 @@ class SettingsControllerTest extends TestCase {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->request = $this->createMock(IRequest::class);
|
$this->request = $this->createMock(IRequest::class);
|
||||||
$this->urlGenerator = $this->createMock(IURLGenerator::class);
|
|
||||||
$this->clientMapper = $this->createMock(ClientMapper::class);
|
$this->clientMapper = $this->createMock(ClientMapper::class);
|
||||||
$this->secureRandom = $this->createMock(ISecureRandom::class);
|
$this->secureRandom = $this->createMock(ISecureRandom::class);
|
||||||
$this->accessTokenMapper = $this->createMock(AccessTokenMapper::class);
|
$this->accessTokenMapper = $this->createMock(AccessTokenMapper::class);
|
||||||
|
@ -62,7 +57,6 @@ class SettingsControllerTest extends TestCase {
|
||||||
$this->settingsController = new SettingsController(
|
$this->settingsController = new SettingsController(
|
||||||
'oauth2',
|
'oauth2',
|
||||||
$this->request,
|
$this->request,
|
||||||
$this->urlGenerator,
|
|
||||||
$this->clientMapper,
|
$this->clientMapper,
|
||||||
$this->secureRandom,
|
$this->secureRandom,
|
||||||
$this->accessTokenMapper,
|
$this->accessTokenMapper,
|
||||||
|
|
Loading…
Reference in New Issue