Merge pull request #4 from locomotivemtl/fix-email-case-sensivity

Fix email case sensitivity
locomotivemtl · Dec 3, 2019 · 4b94348 · 4b94348
2 parents 8350e7a + 512d481
commit 4b94348
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/Charcoal/User/AbstractAuthenticator.php b/src/Charcoal/User/AbstractAuthenticator.php
@@ -474,11 +474,6 @@ public function authenticateByPassword($identifier, $password, $remember = false
         // Load the user by email
         $user->loadFrom($user->getAuthIdentifierKey(), $identifier);
 
-        // Check identifier is as requested
-        if ($user->getAuthIdentifier() !== $identifier) {
-            return null;
-        }
-
         // Allow model to validate user standing
         if (!$this->validateAuthentication($user)) {
             return null;

diff --git a/src/Charcoal/User/AbstractUser.php b/src/Charcoal/User/AbstractUser.php
@@ -531,16 +531,17 @@ protected function validateLoginUnique()
 
         $originalUser = $factory->create($objType)->load($this->getAuthId());
 
-        if ($originalUser->id() && $originalUser->getAuthIdentifier() !== $userLogin) {
+        if ($originalUser->getAuthIdentifier() !== $userLogin) {
             $existingUser = $factory->create($objType)->loadFrom($userKey, $userLogin);
             /** Check for existing user with given email. */
             if (!empty($existingUser->getAuthId())) {
                 $this->validator()->error(
                     sprintf('User Credentials: "%s" is not available.', $userKey),
                     $userKey
                 );
+
+                return false;
             }
-            return false;
         }
 
         return true;