[jboss-svn-commits] JBL Code SVN: r33395 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main: java/org/jboss/labs/sbs/plugin/nukesauth/struts and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-06-08 06:12:38 -0400 (Tue, 08 Jun 2010)
New Revision: 33395

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
Log:
Improved showing page "master-account-created".

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java	2010-06-08 07:47:58 UTC (rev 33394)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/filter/NukesSyncFilter.java	2010-06-08 10:12:38 UTC (rev 33395)
@@ -32,8 +32,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.ui.AbstractProcessingFilter;
-import org.acegisecurity.ui.savedrequest.SavedRequest;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.jboss.labs.sbs.plugin.nukesauth.NukesAccountManager;
@@ -83,12 +81,6 @@
     HttpServletRequest httpRequest = (HttpServletRequest) request;
     HttpServletResponse httpResponse = (HttpServletResponse) response;
 
-    if (log.isDebugEnabled()) {
-      SavedRequest savedRequest = (SavedRequest) httpRequest.getSession().getAttribute(
-          AbstractProcessingFilter.ACEGI_SAVED_REQUEST_KEY);
-      log.debug("savedRequest: " + savedRequest);
-    }
-
     if (requiresAuthentication(httpRequest, httpResponse)) {
       final String username = obtainUsername(httpRequest);
       final String password = obtainPassword(httpRequest);

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java	2010-06-08 07:47:58 UTC (rev 33394)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java	2010-06-08 10:12:38 UTC (rev 33395)
@@ -30,9 +30,11 @@
 import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
 
 import com.jivesoftware.base.EmailAlreadyExistsException;
+import com.jivesoftware.base.User;
 import com.jivesoftware.base.UserAlreadyExistsException;
 import com.jivesoftware.community.action.JiveActionException;
 import com.jivesoftware.community.action.JiveActionSupport;
+import com.jivesoftware.community.web.struts.NoValidation;
 import com.opensymphony.xwork2.Preparable;
 import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
 import com.opensymphony.xwork2.validator.annotations.Validation;
@@ -112,7 +114,6 @@
       // should not occur because we're creating not existing SBS account
       throw new JiveActionException(e);
     }
-    cleanupSession();
 
     return SUCCESS;
   }
@@ -128,6 +129,23 @@
     return CANCEL;
   }
 
+  @NoValidation
+  public String accountCreated() {
+    User u = getUser();
+
+    // handle case when user is authenticated.
+    if (u != null && !u.isAnonymous()) {
+      return "authenticated";
+    }
+
+    if (!authenticate()) {
+      return UNAUTHORIZED;
+    }
+
+    cleanupSession();
+    return "accountCreated";
+  }
+
   public List<NukesUser> getDuplicateAccounts() {
     return duplicateAccounts;
   }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml	2010-06-08 07:47:58 UTC (rev 33394)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml	2010-06-08 10:12:38 UTC (rev 33395)
@@ -10,14 +10,23 @@
       <result name="input" type="freemarker">
         /plugins/nukesauthentication/resources/templates/choose-master-account.ftl
       </result>
-      <result name="success" type="freemarker">
-        /plugins/nukesauthentication/resources/templates/choose-master-account-success.ftl
+      <result name="success" type="jive-redirect-action">
+        <param name="actionName">master-account-created</param>
       </result>
       <result name="cancel" type="redirect">/</result>
       <interceptor-ref name="paramsPrepareParamsStack" />
     </action>
 
+    <action name="master-account-created"
+      class="org.jboss.labs.sbs.plugin.nukesauth.struts.ChooseMasterAccountAction"
+      method="accountCreated">
+      <result name="accountCreated" type="freemarker">
+        /plugins/nukesauthentication/resources/templates/choose-master-account-success.ftl
+      </result>
+      <result name="authenticated" type="redirect">/</result>
+      <interceptor-ref name="paramsPrepareParamsStack" />
+    </action>
+
   </package>
 
-
 </struts>

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties	2010-06-08 07:47:58 UTC (rev 33394)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties	2010-06-08 10:12:38 UTC (rev 33395)
@@ -12,4 +12,4 @@
 
 plugin.nukesauth.masteraccount.name.created=Master account created
 plugin.nukesauth.masteraccount.name.created.description=Account has been successfuly created. Now you can login.
-plugin.nukesauth.masteraccount.name.created.loginlink=Go to login page
+plugin.nukesauth.masteraccount.name.created.loginlink=Go to Login page