mirror of
				https://github.com/elyby/accounts.git
				synced 2025-05-31 14:11:46 +05:30 
			
		
		
		
	Исправлена логика авторизации, чтобы не требовать отсутствия Bearer токена для случаев, когда авторизация не требуется
This commit is contained in:
		@@ -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'],
 | 
			
		||||
            ],
 | 
			
		||||
        ]);
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user