From 6a0a7a0bf20248b5ae28a0ba38a7df432dd008c6 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Thu, 5 Jan 2017 01:39:23 +0700
Subject: [PATCH] Added login by Login or Email

---
 .../Controller/SessionController.php          |  4 +-
 src/PHPCensor/Store/Base/UserStoreBase.php    | 41 +++++++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/PHPCensor/Controller/SessionController.php b/src/PHPCensor/Controller/SessionController.php
index 51e3afe8..b63d8c84 100644
--- a/src/PHPCensor/Controller/SessionController.php
+++ b/src/PHPCensor/Controller/SessionController.php
@@ -51,7 +51,7 @@ class SessionController extends Controller
             } else {
                 unset($_SESSION['login_token']);
 
-                $user = $this->userStore->getByEmail($this->getParam('email'));
+                $user = $this->userStore->getByEmailOrName($this->getParam('email'));
 
                 if ($user && password_verify($this->getParam('password', ''), $user->getHash())) {
                     session_regenerate_id(true);
@@ -69,7 +69,7 @@ class SessionController extends Controller
         $form->setMethod('POST');
         $form->setAction(APP_URL.'session/login');
 
-        $email = new b8\Form\Element\Email('email');
+        $email = new b8\Form\Element\Text('email');
         $email->setLabel(Lang::get('email_address'));
         $email->setRequired(true);
         $email->setContainerClass('form-group');
diff --git a/src/PHPCensor/Store/Base/UserStoreBase.php b/src/PHPCensor/Store/Base/UserStoreBase.php
index dd6824e5..fee5fe24 100644
--- a/src/PHPCensor/Store/Base/UserStoreBase.php
+++ b/src/PHPCensor/Store/Base/UserStoreBase.php
@@ -52,17 +52,23 @@ class UserStoreBase extends Store
     }
 
     /**
+     * 
      * Get a single User by Email.
-     * @return null|User
+     * 
+     * @param string $value
+     * 
+     * @throws HttpException
+     * 
+     * @return User
      */
-    public function getByEmail($value, $useConnection = 'read')
+    public function getByEmail($value)
     {
         if (is_null($value)) {
             throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
         }
 
         $query = 'SELECT * FROM `user` WHERE `email` = :email LIMIT 1';
-        $stmt = Database::getConnection($useConnection)->prepare($query);
+        $stmt = Database::getConnection()->prepare($query);
         $stmt->bindValue(':email', $value);
 
         if ($stmt->execute()) {
@@ -74,6 +80,35 @@ class UserStoreBase extends Store
         return null;
     }
 
+    /**
+     *
+     * Get a single User by Email or Name.
+     *
+     * @param string $value
+     *
+     * @throws HttpException
+     *
+     * @return User
+     */
+    public function getByEmailOrName($value)
+    {
+        if (is_null($value)) {
+            throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
+        }
+
+        $query = 'SELECT * FROM `user` WHERE `email` = :value OR `name` = :value LIMIT 1';
+        $stmt = Database::getConnection()->prepare($query);
+        $stmt->bindValue(':value', $value);
+
+        if ($stmt->execute()) {
+            if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                return new User($data);
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Get multiple User by Name.
      * @return array