mirror of
https://github.com/elyby/accounts.git
synced 2024-12-27 23:50:19 +05:30
Исправлена логика авторизации, чтобы не требовать отсутствия Bearer токена для случаев, когда авторизация не требуется
This commit is contained in:
parent
667c034aca
commit
db1d41449c
@ -24,6 +24,7 @@ use yii\web\User as YiiUserComponent;
|
||||
* @property AccountIdentity|null $identity
|
||||
*
|
||||
* @method AccountIdentity|null loginByAccessToken($token, $type = null)
|
||||
* @method AccountIdentity|null getIdentity($autoRenew = true)
|
||||
*/
|
||||
class Component extends YiiUserComponent {
|
||||
|
||||
@ -44,8 +45,6 @@ class Component extends YiiUserComponent {
|
||||
|
||||
public $sessionTimeout = 'P7D';
|
||||
|
||||
private $_identity;
|
||||
|
||||
public function init() {
|
||||
parent::init();
|
||||
if (!$this->secret) {
|
||||
@ -53,24 +52,6 @@ class Component extends YiiUserComponent {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param bool $autoRenew
|
||||
* @return null|AccountIdentity
|
||||
*/
|
||||
public function getIdentity($autoRenew = true) {
|
||||
$result = parent::getIdentity($autoRenew);
|
||||
if ($result === null && $this->_identity !== false) {
|
||||
$bearer = $this->getBearerToken();
|
||||
if ($bearer !== null) {
|
||||
$result = $this->loginByAccessToken($bearer);
|
||||
}
|
||||
|
||||
$this->_identity = $result ?: false;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param IdentityInterface $identity
|
||||
* @param bool $rememberMe
|
||||
|
@ -10,7 +10,7 @@ class FeedbackController extends Controller {
|
||||
public function behaviors() {
|
||||
return ArrayHelper::merge(parent::behaviors(), [
|
||||
'authenticator' => [
|
||||
'except' => ['index'],
|
||||
'optional' => ['index'],
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
@ -41,46 +41,6 @@ class ComponentTest extends TestCase {
|
||||
];
|
||||
}
|
||||
|
||||
public function testGetIdentity() {
|
||||
$this->specify('getIdentity should return null, if not authorization header', function() {
|
||||
$this->mockAuthorizationHeader(null);
|
||||
$this->assertNull($this->component->getIdentity());
|
||||
});
|
||||
|
||||
$this->specify('getIdentity should return null, if passed bearer token don\'t return any account', function() {
|
||||
$this->mockAuthorizationHeader('some-auth');
|
||||
/** @var Component|\PHPUnit_Framework_MockObject_MockObject $component */
|
||||
$component = $this->getMockBuilder(Component::class)
|
||||
->setMethods(['loginByAccessToken'])
|
||||
->setConstructorArgs([$this->getComponentArguments()])
|
||||
->getMock();
|
||||
|
||||
$component
|
||||
->expects($this->once())
|
||||
->method('loginByAccessToken')
|
||||
->willReturn(null);
|
||||
|
||||
$this->assertNull($component->getIdentity());
|
||||
});
|
||||
|
||||
$this->specify('getIdentity should return identity from loginByAccessToken method', function() {
|
||||
$identity = new AccountIdentity();
|
||||
$this->mockAuthorizationHeader('some-auth');
|
||||
/** @var Component|\PHPUnit_Framework_MockObject_MockObject $component */
|
||||
$component = $this->getMockBuilder(Component::class)
|
||||
->setMethods(['loginByAccessToken'])
|
||||
->setConstructorArgs([$this->getComponentArguments()])
|
||||
->getMock();
|
||||
|
||||
$component
|
||||
->expects($this->once())
|
||||
->method('loginByAccessToken')
|
||||
->willReturn($identity);
|
||||
|
||||
$this->assertEquals($identity, $component->getIdentity());
|
||||
});
|
||||
}
|
||||
|
||||
public function testLogin() {
|
||||
$this->mockRequest();
|
||||
$this->specify('success get LoginResult object without session value', function() {
|
||||
|
Loading…
Reference in New Issue
Block a user