Feature #26: handle the User_Disabled exception and report an error m…

…essage
stcarrez · Sep 17, 2022 · 282827f · 282827f
1 parent 25760c2
commit 282827f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/awa/bundles/users.properties b/awa/bundles/users.properties
@@ -41,6 +41,7 @@ login_submit_login_title=Login using email and password
 login_openid_title=Connect with...
 login_classic_title=Connect with your email and password
 login_signup_fail_message=Invalid email address or password.
+login_signup_account_disabled_message=This user account is disabled.
 openid_google_auth=Authenticate with Google
 openid_yahoo_auth=Authenticate with Yahoo!
 openid_orange_auth=Authenticate with Orange

diff --git a/awa/bundles/users_fr.properties b/awa/bundles/users_fr.properties
@@ -36,6 +36,7 @@ lost_password_create_account_link=Créer un compte
 lost_password_create_account_title=Créer un compte
 login_classic_title=Connexion avec l'adresse e-mail et un mot de passe
 login_signup_fail_message=Adresse e-mail ou mot de passe invalide.
+login_signup_account_disabled_message=Ce compte est désactivé.
 openid_google_auth=Connexion avec votre compte Google
 openid_yahoo_auth=Connexion avec votre compte Yahoo!
 openid_orange_auth=Connexion avec votre compte Orange

diff --git a/awa/src/awa-users-beans.adb b/awa/src/awa-users-beans.adb
@@ -211,6 +211,11 @@ package body AWA.Users.Beans is
          Outcome := To_Unbounded_String ("failure");
 
          ASF.Applications.Messages.Factory.Add_Message ("users.login_signup_fail_message");
+
+      when Services.User_Disabled =>
+         Outcome := To_Unbounded_String ("failure");
+
+         ASF.Applications.Messages.Factory.Add_Message ("users.login_signup_account_disabled_message");
    end Authenticate_User;
 
    --  ------------------------------