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

Исправлен NPE в AccountOwner

Browse Source
This commit is contained in:
ErickSkrauch 2017-12-23 01:10:54 +03:00
parent bd3e8cf2bd
commit 3138a74a7f
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/rbac/rules/AccountOwner.php
View File

@ -30,7 +30,10 @@ class AccountOwner extends Rule {
} }
$identity = Yii::$app->user->findIdentityByAccessToken($accessToken); $identity = Yii::$app->user->findIdentityByAccessToken($accessToken);
/** @noinspection NullPointerExceptionInspection это исключено, т.к. уже сработал authManager */ if ($identity === null) {
return false;
}
$account = $identity->getAccount(); $account = $identity->getAccount();
if ($account === null) { if ($account === null) {
return false; return false;

10
tests/codeception/common/unit/rbac/rules/AccountOwnerTest.php
View File

@ -12,6 +12,16 @@ use const common\LATEST_RULES_VERSION;
class AccountOwnerTest extends TestCase { class AccountOwnerTest extends TestCase {
public function testIdentityIsNull() {
$component = mock(Component::class . '[findIdentityByAccessToken]', [['secret' => 'secret']]);
$component->shouldDeferMissing();
$component->shouldReceive('findIdentityByAccessToken')->andReturn(null);
Yii::$app->set('user', $component);
$this->assertFalse((new AccountOwner())->execute('some token', new Item(), ['accountId' => 123]));
}
public function testExecute() { public function testExecute() {
$rule = new AccountOwner(); $rule = new AccountOwner();
$item = new Item(); $item = new Item();