[jboss-svn-commits] JBL Code SVN: r33394 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main: java/org/jboss/labs/sbs/plugin/nukesauth/listener and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 8 03:47:59 EDT 2010
Author: lkrzyzanek
Date: 2010-06-08 03:47:58 -0400 (Tue, 08 Jun 2010)
New Revision: 33394
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/listener/SyncUserWithNukesListener.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/resources/templates/choose-master-account-success.ftl
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl
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:
ORG-606: Improved creating master account - validations etc.
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 03:34:40 UTC (rev 33393)
+++ 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)
@@ -32,6 +32,8 @@
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;
@@ -81,6 +83,12 @@
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/listener/SyncUserWithNukesListener.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/listener/SyncUserWithNukesListener.java 2010-06-08 03:34:40 UTC (rev 33393)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/listener/SyncUserWithNukesListener.java 2010-06-08 07:47:58 UTC (rev 33394)
@@ -49,8 +49,8 @@
@Override
public void handle(UserEvent e) {
if (UserEvent.Type.MODIFIED.compareTo(e.getType()) == 0) {
- if (log.isDebugEnabled()) {
- log.debug("params: " + e.getParams());
+ if (log.isTraceEnabled()) {
+ log.trace("params: " + e.getParams());
}
User user = e.getPayload();
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 03:34:40 UTC (rev 33393)
+++ 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)
@@ -33,6 +33,8 @@
import com.jivesoftware.base.UserAlreadyExistsException;
import com.jivesoftware.community.action.JiveActionException;
import com.jivesoftware.community.action.JiveActionSupport;
+import com.opensymphony.xwork2.Preparable;
+import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
import com.opensymphony.xwork2.validator.annotations.Validation;
/**
@@ -41,7 +43,7 @@
* @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
*/
@Validation()
-public class ChooseMasterAccountAction extends JiveActionSupport {
+public class ChooseMasterAccountAction extends JiveActionSupport implements Preparable {
public static final String USERNAME_KEY = "username";
@@ -77,14 +79,20 @@
}
@Override
+ public void prepare() throws Exception {
+ if (!authenticate()) {
+ return;
+ }
+ NukesUser user = nukesAccountManager.getAccountByUsername(username.toString());
+ duplicateAccounts = nukesAccountManager.getNukesAccountsByEmail(user.getEmail());
+ }
+
+ @Override
public String input() {
if (!authenticate()) {
return UNAUTHORIZED;
}
- NukesUser user = nukesAccountManager.getAccountByUsername(username.toString());
- duplicateAccounts = nukesAccountManager.getNukesAccountsByEmail(user.getEmail());
-
return INPUT;
}
@@ -104,10 +112,20 @@
// should not occur because we're creating not existing SBS account
throw new JiveActionException(e);
}
+ cleanupSession();
+
+ return SUCCESS;
+ }
+
+ private void cleanupSession() {
getRequest().getSession().removeAttribute(USERNAME_KEY);
getRequest().getSession().removeAttribute(PASSWORD_KEY);
+ }
- return SUCCESS;
+ @Override
+ public String cancel() {
+ cleanupSession();
+ return CANCEL;
}
public List<NukesUser> getDuplicateAccounts() {
@@ -118,6 +136,7 @@
this.duplicateAccounts = duplicateAccounts;
}
+ @RequiredFieldValidator(fieldName = "masterAccountUsername", key = "plugin.nukesauth.masteraccount.choosemaster.required", message = "You need to choose a Master Acount")
public String getMasterAccountUsername() {
return masterAccountUsername;
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account-success.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account-success.ftl 2010-06-08 03:34:40 UTC (rev 33393)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account-success.ftl 2010-06-08 07:47:58 UTC (rev 33394)
@@ -20,6 +20,7 @@
<div id="jive-body-maincol">
<p><@s.text name="plugin.nukesauth.masteraccount.name.created.description" /></p>
+ <p> </p>
<p><a href="/login.jspa"><@s.text name="plugin.nukesauth.masteraccount.name.created.loginlink" /></a></p>
</div>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl 2010-06-08 03:34:40 UTC (rev 33393)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl 2010-06-08 07:47:58 UTC (rev 33394)
@@ -33,27 +33,28 @@
<tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.firstname" />:</td>
<@s.iterator value="duplicateAccounts">
- <td><@s.property value="firstname" default="-" /></td>
+ <td><@s.property value="firstName" default="-" /></td>
</@s.iterator>
</tr>
<tr>
<td><@s.text name="plugin.nukesauth.masteraccount.account.lastname" />:</td>
<@s.iterator value="duplicateAccounts">
- <td><@s.property value="lastname" default="-" /></td>
+ <td><@s.property value="lastName" default="-" /></td>
</@s.iterator>
</tr>
</table>
<p> </p>
+ <@s.form theme="simple">
<table>
- <@s.form theme="simple">
<@s.radio key="plugin.nukesauth.masteraccount.choosemaster" name="masterAccountUsername" list="duplicateAccounts" listKey="username" listValue="username" theme="xhtml"/>
<tr><td> </td></tr>
- <tr><td>
+ <tr><td colspan="2">
<@s.submit key="plugin.nukesauth.masteraccount.submit" method="execute"/>
+
<@s.submit key="plugin.nukesauth.masteraccount.cancel" method="cancel"/>
</td></tr>
+ </table>
</@s.form>
- </table>
</div>
</div>
<!-- END main body column -->
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 03:34:40 UTC (rev 33393)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml 2010-06-08 07:47:58 UTC (rev 33394)
@@ -13,6 +13,7 @@
<result name="success" type="freemarker">
/plugins/nukesauthentication/resources/templates/choose-master-account-success.ftl
</result>
+ <result name="cancel" type="redirect">/</result>
<interceptor-ref name="paramsPrepareParamsStack" />
</action>
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 03:34:40 UTC (rev 33393)
+++ 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)
@@ -6,6 +6,7 @@
plugin.nukesauth.masteraccount.account.lastname=Last name
plugin.nukesauth.masteraccount.choosemaster=Choose a Master Account
+plugin.nukesauth.masteraccount.choosemaster.required=You need to choose a Master Acount
plugin.nukesauth.masteraccount.submit=Create The Master Account
plugin.nukesauth.masteraccount.cancel=Cancel
More information about the jboss-svn-commits
mailing list