From c526a67d7ed865ab4cc145ddc3e4085abcb13c2c Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 30 Jul 2015 18:05:26 -0700
Subject: [PATCH] GUAC-1213: Add error messages for invalid/inaccessible
 accounts.

---
 .../org/glyptodon/guacamole/auth/jdbc/user/UserService.java   | 4 ++--
 .../src/main/resources/translations/en.json                   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java
index 8c51adca6..1a9e6090a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java
@@ -302,11 +302,11 @@ public class UserService extends ModeledDirectoryObjectService<ModeledUser, User
 
         // Verify user account is still valid as of today
         if (!user.isAccountValid())
-            throw new GuacamoleClientException("LOGIN.ERROR_NO_LONGER_VALID");
+            throw new GuacamoleClientException("LOGIN.ERROR_NOT_VALID");
 
         // Verify user account is allowed to be used at the current time
         if (!user.isAccountAccessible())
-            throw new GuacamoleClientException("LOGIN.ERROR_NOT_WITHIN_ACCESS_WINDOW");
+            throw new GuacamoleClientException("LOGIN.ERROR_NOT_ACCESSIBLE");
 
         // Update password if password is expired
         if (userModel.isExpired()) {
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
index 756aca2f1..477b9ff96 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
@@ -5,6 +5,8 @@
         "ERROR_PASSWORD_BLANK"    : "@:APP.ERROR_PASSWORD_BLANK",
         "ERROR_PASSWORD_SAME"     : "The new password must be different from the expired password.",
         "ERROR_PASSWORD_MISMATCH" : "@:APP.ERROR_PASSWORD_MISMATCH",
+        "ERROR_NOT_VALID"         : "This user account is not currently valid.",
+        "ERROR_NOT_ACCESSIBLE"    : "Access to this account is not currently allowed. Please try again later.",
 
         "INFO_PASSWORD_EXPIRED" : "Your password has expired and must be reset. Please enter a new password to continue.",