ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-11-08 21:52:33 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fix all tests

Browse Source
This commit is contained in:
ErickSkrauch 2019-09-24 01:56:32 +03:00
parent 2beacd0827
commit 22982b319b
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/components/OAuth2/Repositories/InternalScopeRepository.php
View File

@ -22,7 +22,12 @@ class InternalScopeRepository implements ScopeRepositoryInterface {
P::ESCAPE_IDENTITY_VERIFICATION,
];
private const PUBLIC_SCOPES_TO_INTERNAL_PERMISSIONS = [
'internal_account_info' => P::OBTAIN_EXTENDED_ACCOUNT_INFO,
];
public function getScopeEntityByIdentifier($identifier): ?ScopeEntityInterface {
$identifier = $this->convertToInternalPermission($identifier);
if (!in_array($identifier, self::ALLOWED_SCOPES, true)) {
return null;
}
@ -51,4 +56,8 @@ class InternalScopeRepository implements ScopeRepositoryInterface {
return $scopes;
}
private function convertToInternalPermission(string $publicScope): string {
return self::PUBLIC_SCOPES_TO_INTERNAL_PERMISSIONS[$publicScope] ?? $publicScope;
}
}

2
api/tests/functional/_steps/OauthSteps.php
View File

@ -54,7 +54,7 @@ class OauthSteps extends FunctionalTester {
'grant_type' => 'client_credentials',
'client_id' => $useTrusted ? 'trusted-client' : 'default-client',
'client_secret' => $useTrusted ? 'tXBbyvMcyaOgHMOAXBpN2EC7uFoJAaL9' : 'AzWRy7ZjS1yRQUk2vRBDic8fprOKDB1W',
'scope' => implode(',', $permissions),
'scope' => implode(' ', $permissions),
]);
$response = json_decode($this->grabResponse(), true);

1
api/tests/unit/models/authentication/LoginFormTest.php
View File

@ -131,6 +131,7 @@ class LoginFormTest extends TestCase {
'login' => 'erickskrauch',
'password' => '12345678',
'account' => new Account([
'id' => 1,
'username' => 'erickskrauch',
'password' => '12345678',
'status' => Account::STATUS_ACTIVE,