Merge pull request #2 from virbo/dev

Dev
virbo · Dec 9, 2019 · c0f65cb · c0f65cb
2 parents 612c7a5 + eaa212a
commit c0f65cb
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/Feeder.php b/src/Feeder.php
@@ -99,8 +99,6 @@ public function init()
      * */
     public function actFeeder($data = [])
     {
-        Yii::$app->response->format = Response::FORMAT_JSON;
-
         if (!is_array($data)) {
             throw new BadRequestHttpException('Data must array');
         }
@@ -123,10 +121,8 @@ public function actFeeder($data = [])
             if ($request->data['error_code'] == 0) {
                 return $request->data;
             } else {
-                if ($request->data['error_code'] === 100) {
-                    $session = Yii::$app->session;
-                    $session['token'] = null;
-                    $this->getToken();
+                if ($request->data['error_code'] == 100) {
+                    $this->getToken($renew = true);
                 } else {
                     throw new BadRequestHttpException('Error '.$request->data['error_code'].' - '.$request->data['error_desc']);
                 }
@@ -136,11 +132,11 @@ public function actFeeder($data = [])
         }
     }
 
-    protected function getToken()
+    protected function getToken($renew = false)
     {
         $session = Yii::$app->session;
 
-        if ($session['token'] === null) {
+        if ($session['token'] === null || $renew) {
             $act = Json::encode([
                 'act' => 'GetToken',
                 'username' => $this->username,