diff options
author | Joas Schilling <coding@schilljs.com> | 2021-12-02 00:17:19 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2021-12-02 00:17:19 +0300 |
commit | c6ae53096c36e6a475467eaeb6df00ac8d38e4b2 (patch) | |
tree | 80deaa0d05a26564937a03d430197d1f6a57d30b /apps/oauth2 | |
parent | 9f001790379829096939015e790f0a35b6a38787 (diff) |
More test fixing
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/oauth2')
-rw-r--r-- | apps/oauth2/lib/Controller/SettingsController.php | 14 | ||||
-rw-r--r-- | apps/oauth2/tests/Controller/SettingsControllerTest.php | 9 |
2 files changed, 0 insertions, 23 deletions
diff --git a/apps/oauth2/lib/Controller/SettingsController.php b/apps/oauth2/lib/Controller/SettingsController.php index 28500128629..046e6d77041 100644 --- a/apps/oauth2/lib/Controller/SettingsController.php +++ b/apps/oauth2/lib/Controller/SettingsController.php @@ -30,7 +30,6 @@ declare(strict_types=1); */ namespace OCA\OAuth2\Controller; -use OC\Authentication\Token\DefaultTokenMapper; use OCA\OAuth2\Db\AccessTokenMapper; use OCA\OAuth2\Db\Client; use OCA\OAuth2\Db\ClientMapper; @@ -48,34 +47,22 @@ class SettingsController extends Controller { private $secureRandom; /** @var AccessTokenMapper */ private $accessTokenMapper; - /** @var DefaultTokenMapper */ - private $defaultTokenMapper; /** @var IL10N */ private $l; public const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - /** - * @param string $appName - * @param IRequest $request - * @param ClientMapper $clientMapper - * @param ISecureRandom $secureRandom - * @param AccessTokenMapper $accessTokenMapper - * @param DefaultTokenMapper $defaultTokenMapper - */ public function __construct(string $appName, IRequest $request, ClientMapper $clientMapper, ISecureRandom $secureRandom, AccessTokenMapper $accessTokenMapper, - DefaultTokenMapper $defaultTokenMapper, IL10N $l ) { parent::__construct($appName, $request); $this->secureRandom = $secureRandom; $this->clientMapper = $clientMapper; $this->accessTokenMapper = $accessTokenMapper; - $this->defaultTokenMapper = $defaultTokenMapper; $this->l = $l; } @@ -106,7 +93,6 @@ class SettingsController extends Controller { public function deleteClient(int $id): JSONResponse { $client = $this->clientMapper->getByUid($id); $this->accessTokenMapper->deleteByClientId($id); - $this->defaultTokenMapper->deleteByName($client->getName()); $this->clientMapper->delete($client); return new JSONResponse([]); } diff --git a/apps/oauth2/tests/Controller/SettingsControllerTest.php b/apps/oauth2/tests/Controller/SettingsControllerTest.php index 40785e280a0..4954d379f9d 100644 --- a/apps/oauth2/tests/Controller/SettingsControllerTest.php +++ b/apps/oauth2/tests/Controller/SettingsControllerTest.php @@ -26,7 +26,6 @@ */ namespace OCA\OAuth2\Tests\Controller; -use OC\Authentication\Token\DefaultTokenMapper; use OCA\OAuth2\Controller\SettingsController; use OCA\OAuth2\Db\AccessTokenMapper; use OCA\OAuth2\Db\Client; @@ -47,8 +46,6 @@ class SettingsControllerTest extends TestCase { private $secureRandom; /** @var AccessTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ private $accessTokenMapper; - /** @var DefaultTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ - private $defaultTokenMapper; /** @var SettingsController */ private $settingsController; @@ -59,7 +56,6 @@ class SettingsControllerTest extends TestCase { $this->clientMapper = $this->createMock(ClientMapper::class); $this->secureRandom = $this->createMock(ISecureRandom::class); $this->accessTokenMapper = $this->createMock(AccessTokenMapper::class); - $this->defaultTokenMapper = $this->createMock(DefaultTokenMapper::class); $l = $this->createMock(IL10N::class); $l->method('t') ->willReturnArgument(0); @@ -70,7 +66,6 @@ class SettingsControllerTest extends TestCase { $this->clientMapper, $this->secureRandom, $this->accessTokenMapper, - $this->defaultTokenMapper, $l ); } @@ -136,10 +131,6 @@ class SettingsControllerTest extends TestCase { ->expects($this->once()) ->method('deleteByClientId') ->with(123); - $this->defaultTokenMapper - ->expects($this->once()) - ->method('deleteByName') - ->with('My Client Name'); $this->clientMapper ->method('delete') ->with($client); |