Merge pull request #23 from 0xDarker/master

api模块增加登出接口
jianyan74 · Jul 31, 2019 · 2cb592b · 2cb592b
2 parents 733a083 + 835479d
commit 2cb592b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/api/config/main.php b/api/config/main.php
@@ -87,6 +87,7 @@
                         'pluralize' => false, // 是否启用复数形式，注意index的复数indices，开启后不直观
                         'extraPatterns' => [
                             'POST login' => 'login', // 登录获取token
+                            'POST logout' => 'logout', // 登出
                             'POST refresh' => 'refresh', // 重置token
                             'POST sms-code' => 'sms-code', // 获取验证码
                             'POST register' => 'register', // 注册

diff --git a/api/modules/v1/controllers/SiteController.php b/api/modules/v1/controllers/SiteController.php
@@ -54,6 +54,20 @@ public function actionLogin()
         return ResultDataHelper::api(422, $this->getError($model));
     }
 
+    /**
+     * 登出
+     *
+     * @return array|mixed
+     */
+    public function actionLogout()
+    {
+        if (Yii::$app->services->apiAccessToken->disableToken(Yii::$app->user->identity->access_token)) {
+            return ResultDataHelper::api(200, '成功');
+        } else {
+            return ResultDataHelper::api(500, '失败');
+        }
+    }
+
     /**
      * 重置令牌
      *

diff --git a/common/models/api/AccessToken.php b/common/models/api/AccessToken.php
@@ -2,6 +2,7 @@
 
 namespace common\models\api;
 
+use common\enums\StatusEnum;
 use Yii;
 use yii\behaviors\BlameableBehavior;
 use yii\db\ActiveRecord;
@@ -112,7 +113,7 @@ public static function findIdentityByAccessToken($token, $type = null)
      */
     public static function findIdentityByRefreshToken($token, $group = null)
     {
-        return static::findOne(['group' => $group, 'refresh_token' => $token]);
+        return static::findOne(['group' => $group, 'refresh_token' => $token, 'status' => StatusEnum::ENABLED]);
     }
 
     /**

diff --git a/services/api/AccessTokenService.php b/services/api/AccessTokenService.php
@@ -2,6 +2,7 @@
 
 namespace services\api;
 
+use common\enums\StatusEnum;
 use Yii;
 use yii\db\ActiveRecord;
 use yii\web\UnprocessableEntityHttpException;
@@ -48,6 +49,7 @@ public function getAccessToken(Member $member, $group, $cycle_index = 1)
         !empty($model->access_token) && Yii::$app->cache->delete(CacheKeyEnum::API_ACCESS_TOKEN . $model->access_token);
         $model->refresh_token = Yii::$app->security->generateRandomString() . '_' . time();
         $model->access_token = Yii::$app->security->generateRandomString() . '_' . time();
+        $model->status = StatusEnum::ENABLED;
 
         if (!$model->save()) {
             if ($cycle_index <= 3) {
@@ -108,11 +110,27 @@ public function getTokenToCache($token, $type)
     public function getTokenByAccessToken($token)
     {
         return AccessToken::find()
-            ->where(['access_token' => $token])
+            ->where(['access_token' => $token, 'status' => StatusEnum::ENABLED])
             ->andFilterWhere(['merchant_id' => $this->getMerchantId()])
             ->one();
     }
 
+    /**
+     * 禁用token
+     * @param $access_token
+     * @return bool
+     */
+    public function disableToken($access_token)
+    {
+        if ($this->cache === true) {
+            Yii::$app->cache->delete(CacheKeyEnum::API_ACCESS_TOKEN . $access_token);
+        }
+
+        $model = $this->getTokenByAccessToken($access_token);
+        $model->status = StatusEnum::DISABLED;
+        return $model->save();
+    }
+
     /**
      * 返回模型
      *
@@ -132,4 +150,4 @@ protected function findModel($member_id, $group)
 
         return $model;
     }
-}
+}