[seam-commits] Seam SVN: r7797 - trunk/src/main/org/jboss/seam/security.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2008-04-02 20:51:29 -0400 (Wed, 02 Apr 2008)
New Revision: 7797

Modified:
   trunk/src/main/org/jboss/seam/security/Identity.java
Log:
fix logic for login() when silent login occurs beforehand

Modified: trunk/src/main/org/jboss/seam/security/Identity.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/Identity.java	2008-04-02 18:20:09 UTC (rev 7796)
+++ trunk/src/main/org/jboss/seam/security/Identity.java	2008-04-03 00:51:29 UTC (rev 7797)
@@ -60,13 +60,14 @@
    public static final String EVENT_LOGGED_OUT = "org.jboss.seam.security.loggedOut";
    public static final String EVENT_CREDENTIALS_UPDATED = "org.jboss.seam.security.credentialsUpdated";
    public static final String EVENT_REMEMBER_ME = "org.jboss.seam.security.rememberMe";
-   public static final String EVENT_ALREADY_LOGGED_IN = "org.jboss.seam.security.alreadyLoggedIn";
+   public static final String EVENT_ALREADY_LOGGED_IN = "org.jboss.seam.security.alreadyLoggedIn";   
    
    protected static boolean securityEnabled = true;
    
    public static final String ROLES_GROUP = "Roles";
    
    private static final String LOGIN_TRIED = "org.jboss.seam.security.loginTried";
+   private static final String SILENT_LOGIN = "org.jboss.seam.security.silentLogin";
    
    private static final long serialVersionUID = 3751659008033189259L;
    
@@ -211,11 +212,20 @@
    public String login()
    {
       try
-      {         
+      {            
          if (isLoggedIn(false))
          {
+            // If authentication has already occurred during this request via a silent login,
+            // and login() is explicitly called then we still want to raise the LOGIN_SUCCESSFUL event,
+            // and then return.
+            if (Contexts.isEventContextActive() && Contexts.getEventContext().isSet(SILENT_LOGIN))
+            {
+               if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL);
+               return "loggedIn";            
+            }            
+            
             if (Events.exists()) Events.instance().raiseEvent(EVENT_ALREADY_LOGGED_IN);
-            return "loggedIn";            
+            return "loggedIn";           
          }
          
          authenticate();
@@ -248,7 +258,14 @@
    {
       try
       {
-         if (isCredentialsSet()) authenticate();
+         if (isCredentialsSet()) 
+         {
+            authenticate();
+            if (isLoggedIn(false) && Contexts.isEventContextActive())
+            {
+               Contexts.getEventContext().set(SILENT_LOGIN, true);
+            }
+         }
       }
       catch (LoginException ex) { }
    }