Merge pull request #34 from elfarqy/develop

Develop - enhance code
elfarqy · Feb 6, 2017 · 3b432a9 · 3b432a9
2 parents 8697000 + 26569ec
commit 3b432a9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 38 deletions.
diff --git a/api/forms/LoginForm.php b/api/forms/LoginForm.php
@@ -54,20 +54,4 @@ public function login()
         }
         return false;
     }
-
-    /**
-     * This class permits its instance to get the login column.
-     *
-     * @author Muhammad Yahya Muhaimin <myahyamuhaimin@yahoo.com>
-     */
-    public function getLoginColumn()
-    {
-        try {
-            $loginColumn = parent::getLoginColumn();
-        } catch (InvalidConfigException $e) {
-            return $e->getMessage();
-        }
-
-        return $loginColumn;
-    }
 }
diff --git a/api/modules/v1/controllers/AuthController.php b/api/modules/v1/controllers/AuthController.php
@@ -109,24 +109,9 @@ public function actionLogin()
              */
             $user = \Yii::$app->user->getIdentity();
 
-            $msgLoginBy = '';
-            $loginColumn = $loginForm->getLoginColumn();
-
-            switch ($loginColumn) {
-                case 'username':
-                    $msgLoginBy = 'username ' . $user->username;
-                    break;
-                case 'email':
-                    $msgLoginBy = 'email ' . $user->email;
-                    break;
-                default:
-                    $msgLoginBy = $loginColumn;
-                    break;
-            }
-
             return [
                 'name'    => 'Success',
-                'message' => 'Login by ' . $msgLoginBy . ' success.',
+                'message' => 'Login by ' . $loginForm->loginColumn . ' success.',
                 'code'    => ApiCode::LOGIN_SUCCESS,
                 'status'  => 200,
                 'data'    => $user->toArray([

diff --git a/common/config/params.php b/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

diff --git a/common/forms/LoginForm.php b/common/forms/LoginForm.php
@@ -173,10 +173,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;