openinfra/openstackid
Code Issues Proposed changes

Updated user error

Browse Source 
updated non verified user wording

Change-Id: I880baec469f676cd990efdd2462e28508f4016ff
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2020-10-23 13:31:09 -03:00
parent 3577ccc4d1
commit 0c63a1fe21
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/libs/Auth/CustomAuthProvider.php
View File

@ -122,14 +122,14 @@ class CustomAuthProvider implements UserProvider
if (is_null($user)) //user must exists if (is_null($user)) //user must exists
{ {
throw new AuthenticationException(sprintf("user %s does not exists!", $email)); throw new AuthenticationException(sprintf("User %s does not exists.", $email));
} }
if(!$user->canLogin()) if(!$user->canLogin())
{ {
if(!$user->isEmailVerified()) if(!$user->isEmailVerified())
throw new UnverifiedEmailMemberException(sprintf("user %s is not verified yet!", $email)); throw new UnverifiedEmailMemberException(sprintf("User %s is not yet verified; check your email and click on the confirmation link before trying to log in again.", $email));
throw new AuthenticationException(sprintf("user %s does not exists!", $email)); throw new AuthenticationException(sprintf("User %s does not exists.", $email));
} }
$valid_password = $user->checkPassword($password); $valid_password = $user->checkPassword($password);
@ -144,7 +144,7 @@ class CustomAuthProvider implements UserProvider
if (!$user->isActive()) { if (!$user->isActive()) {
Log::warning(sprintf("user %s is on lock state", $email)); Log::warning(sprintf("user %s is on lock state", $email));
throw new AuthenticationLockedUserLoginAttempt($email, throw new AuthenticationLockedUserLoginAttempt($email,
sprintf("user %s is on lock state", $email)); sprintf("User %s is locked.", $email));
} }
//update user fields //update user fields