mirror of
				https://github.com/elyby/accounts.git
				synced 2025-05-31 14:11:46 +05:30 
			
		
		
		
	Rework identity provider for the legacy OAuth2 tokens [skip ci]
This commit is contained in:
		| @@ -5,7 +5,7 @@ namespace codeception\api\unit\components\User; | ||||
|  | ||||
| use api\components\User\Component; | ||||
| use api\components\User\JwtIdentity; | ||||
| use api\components\User\OAuth2Identity; | ||||
| use api\components\User\LegacyOAuth2Identity; | ||||
| use api\tests\unit\TestCase; | ||||
| use common\models\Account; | ||||
| use common\models\AccountSession; | ||||
| @@ -41,7 +41,7 @@ class ComponentTest extends TestCase { | ||||
|         $this->assertNull($component->getActiveSession()); | ||||
|  | ||||
|         // Identity is a Oauth2Identity | ||||
|         $component->setIdentity(mock(OAuth2Identity::class)); | ||||
|         $component->setIdentity(mock(LegacyOAuth2Identity::class)); | ||||
|         $this->assertNull($component->getActiveSession()); | ||||
|  | ||||
|         // Identity is correct, but have no jti claim | ||||
|   | ||||
| @@ -7,7 +7,7 @@ use api\components\OAuth2\Component; | ||||
| use api\components\OAuth2\Entities\AccessTokenEntity; | ||||
| use api\components\User\IdentityFactory; | ||||
| use api\components\User\JwtIdentity; | ||||
| use api\components\User\OAuth2Identity; | ||||
| use api\components\User\LegacyOAuth2Identity; | ||||
| use api\tests\unit\TestCase; | ||||
| use Carbon\Carbon; | ||||
| use League\OAuth2\Server\AbstractServer; | ||||
| @@ -37,7 +37,7 @@ class IdentityFactoryTest extends TestCase { | ||||
|         Yii::$app->set('oauth', $component); | ||||
|  | ||||
|         $identity = IdentityFactory::findIdentityByAccessToken('mock-token'); | ||||
|         $this->assertInstanceOf(OAuth2Identity::class, $identity); | ||||
|         $this->assertInstanceOf(LegacyOAuth2Identity::class, $identity); | ||||
|     } | ||||
|  | ||||
|     public function testFindIdentityByAccessTokenWithEmptyValue() { | ||||
|   | ||||
| @@ -5,14 +5,12 @@ namespace api\tests\unit\components\User; | ||||
| 
 | ||||
| use api\components\OAuth2\Component; | ||||
| use api\components\OAuth2\Entities\AccessTokenEntity; | ||||
| use api\components\User\OAuth2Identity; | ||||
| use api\components\User\LegacyOAuth2Identity; | ||||
| use api\tests\unit\TestCase; | ||||
| use League\OAuth2\Server\AbstractServer; | ||||
| use League\OAuth2\Server\Storage\AccessTokenInterface; | ||||
| use Yii; | ||||
| use yii\web\UnauthorizedHttpException; | ||||
| 
 | ||||
| class OAuth2IdentityTest extends TestCase { | ||||
| class LegacyOAuth2IdentityTest extends TestCase { | ||||
| 
 | ||||
|     public function testFindIdentityByAccessToken() { | ||||
|         $accessToken = new AccessTokenEntity(mock(AbstractServer::class)); | ||||
| @@ -20,7 +18,7 @@ class OAuth2IdentityTest extends TestCase { | ||||
|         $accessToken->setId('mock-token'); | ||||
|         $this->mockFoundedAccessToken($accessToken); | ||||
| 
 | ||||
|         $identity = OAuth2Identity::findIdentityByAccessToken('mock-token'); | ||||
|         $identity = LegacyOAuth2Identity::findIdentityByAccessToken('mock-token'); | ||||
|         $this->assertSame('mock-token', $identity->getId()); | ||||
|     } | ||||
| 
 | ||||
| @@ -28,7 +26,7 @@ class OAuth2IdentityTest extends TestCase { | ||||
|         $this->expectException(UnauthorizedHttpException::class); | ||||
|         $this->expectExceptionMessage('Incorrect token'); | ||||
| 
 | ||||
|         OAuth2Identity::findIdentityByAccessToken('not exists token'); | ||||
|         LegacyOAuth2Identity::findIdentityByAccessToken('not exists token'); | ||||
|     } | ||||
| 
 | ||||
|     public function testFindIdentityByAccessTokenWithExpiredToken() { | ||||
| @@ -39,7 +37,7 @@ class OAuth2IdentityTest extends TestCase { | ||||
|         $accessToken->setExpireTime(time() - 3600); | ||||
|         $this->mockFoundedAccessToken($accessToken); | ||||
| 
 | ||||
|         OAuth2Identity::findIdentityByAccessToken('mock-token'); | ||||
|         LegacyOAuth2Identity::findIdentityByAccessToken('mock-token'); | ||||
|     } | ||||
| 
 | ||||
|     private function mockFoundedAccessToken(AccessTokenEntity $accessToken) { | ||||
		Reference in New Issue
	
	Block a user