Merge branch 'master' of https://github.com/haqqi/yii2-advanced-api

api/components/ErrorHandler.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace api\components;
+
+class ErrorHandler extends \common\components\ErrorHandler
+{
+    public $errorAction = 'site/error';
+}

api/config/main.php

@@ -39,7 +39,7 @@
             ],
         ],
         'errorHandler' => [
-            'class' => \common\components\ErrorHandler::className(),
+            'class' => api\components\ErrorHandler::className(),
         ],
         'urlManager'   => [
             // to improve the security

api/controllers/SiteController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace api\controllers;
+
+use yii\rest\Controller;
+
+/**
+ * Site controller.
+ */
+class SiteController extends Controller
+{
+    public function behaviors()
+    {
+        $behaviors = parent::behaviors();
+
+        $behaviors['authenticator']['except'] = [
+            'error',
+        ];
+
+        return $behaviors;
+    }
+
+    public function actionError()
+    {
+        $exception = \Yii::$app->errorHandler->exception;
+
+        if ($exception !== null) {
+            return [
+                'name'   => $exception->getName(),
+                'status' => $exception->statusCode,
+            ];
+        }
+    }
+}

api/forms/LoginForm.php

@@ -54,4 +54,4 @@ public function login()
         }
         return false;
     }
-}
+}

api/modules/v1/controllers/AuthController.php

@@ -98,14 +98,6 @@ public function actionLogin()
             throw new HttpException(400, $e->getMessage(), ApiCode::DEVICE_IDENTIFIER_NOT_FOUND);
         }
 
-        $loginByEmail = \Yii::$app->params['loginByEmail'];
-
-        if ($loginByEmail) {
-            $loginForm->setScenario(LoginForm::SCENARIO_SUBMIT_LOGIN_EMAIL);
-        } else {
-            $loginForm->setScenario(LoginForm::SCENARIO_SUBMIT_LOGIN_USERNAME);
-        }
-
         $loginForm->load(\Yii::$app->request->post(), 'User');
 
         /*
@@ -117,11 +109,9 @@ public function actionLogin()
              */
             $user = \Yii::$app->user->getIdentity();
 
-            $msgLoginBy = $loginByEmail ? 'email ' . $user->email : 'username ' . $user->username;
-
             return [
                 'name'    => 'Success',
-                'message' => 'Login by ' . $msgLoginBy . ' success.',
+                'message' => 'Login by ' . $loginForm->loginColumn . ' success.',
                 'code'    => ApiCode::LOGIN_SUCCESS,
                 'status'  => 200,
                 'data'    => $user->toArray([
@@ -226,7 +216,6 @@ public function actionResetPassword($resetPasswordToken)
 
         // this will catch POST request
         if (\Yii::$app->request->isPost) {
-
             $passwordForm->load(\Yii::$app->request->post(), 'User');
 
             if ($passwordForm->validate() && $passwordForm->resetPassword()) {

common/config/params.php

@@ -13,8 +13,6 @@
     'supportEmail' => 'support@example.com',
     /** set password reset token expired 60 sec * 60 Min  */
     'user.passwordResetTokenExpire' => 3600,
-    /** set login params. If value is true, then should login by email. else, login by username. */
-    'loginByEmail' => false,
     /**
      * Is user must be use strong password?
      * there is only 5 choices : simple | normal | fair | medium | strong

common/forms/LoginForm.php

@@ -175,10 +175,7 @@ protected function getUser()
             $loginColumn = $this->getLoginColumn();
 
             $this->_user = $class::findOne([$loginColumn => $this->username]);
-
-            if (!($this->_user instanceof IdentityInterface)) {
-                throw new InvalidConfigException('User class must implement IdentityInterface');
-            }
+
         }
 
         return $this->_user;