[portal-commits] JBoss Portal SVN: r10805 - modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth.
Author: thomas.heute(a)jboss.com
Date: 2008-05-23 10:54:41 -0400 (Fri, 23 May 2008)
New Revision: 10805
Modified:
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java
Log:
- i18n day
Modified:
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java
===================================================================
---
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-23
12:48:14 UTC (rev 10804)
+++
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-23
14:54:41 UTC (rev 10805)
@@ -59,7 +59,7 @@
*/
public class IdentityLoginModule extends UsernamePasswordLoginModule
{
-
+
protected String userModuleJNDIName;
protected String roleModuleJNDIName;
@@ -175,29 +175,16 @@
{
UserStatus userStatus = getUserStatus(inputPassword);
+
+ // Set the user Status in the request so that the login page can show an
error message accordingly
+ request.setAttribute("org.jboss.portal.userStatus",
userStatus);
- if (userStatus == UserStatus.DISABLE)
+ if (userStatus == UserStatus.OK)
{
- request.setAttribute("org.jboss.portal.loginError",
"Your account is disabled");
- return false;
- }
- else if (userStatus == UserStatus.NOTASSIGNEDTOROLE)
- {
- request.setAttribute("org.jboss.portal.loginError", "The
user doesn't have the correct role");
- return false;
- }
- else if ((userStatus == UserStatus.UNEXISTING) || userStatus ==
UserStatus.WRONGPASSWORD)
- {
- request.setAttribute("org.jboss.portal.loginError", "The
user doesn't exist or the password is incorrect");
- return false;
- }
- else if (userStatus == UserStatus.OK)
- {
return true;
}
else
{
- log.error("Unexpected error while logging in");
return false;
}
}