[jboss-svn-commits] JBL Code SVN: r33399 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main: plugin/resources/templates and 1 other directories.

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

Author: lkrzyzanek
Date: 2010-06-08 08:06:13 -0400 (Tue, 08 Jun 2010)
New Revision: 33399

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/plugin/resources/templates/choose-master-account.ftl
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
Log:
Added password field

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 11:35:22 UTC (rev 33398)
+++ 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 12:06:13 UTC (rev 33399)
@@ -60,6 +60,8 @@
 
   private String masterAccountUsername;
 
+  private String masterPassword;
+
   private NukesAccountManager nukesAccountManager;
 
   private SbsAccountManager sbsAccountManager;
@@ -71,14 +73,7 @@
       return false;
     }
 
-    try {
-      nukesAccountManager.authenticateNukesUser(username.toString(), password.toString());
-    } catch (UsernameNotFoundException e) {
-      return false;
-    } catch (BadCredentialsException e) {
-      return false;
-    }
-    return true;
+    return checkUsernamePassword(username.toString(), password.toString());
   }
 
   @Override
@@ -99,11 +94,29 @@
     return INPUT;
   }
 
+  private boolean checkUsernamePassword(String u, String p) {
+    try {
+      nukesAccountManager.authenticateNukesUser(u, p);
+    } catch (UsernameNotFoundException e) {
+      return false;
+    } catch (BadCredentialsException e) {
+      return false;
+    }
+    return true;
+  }
+
   @Override
   public String execute() {
     if (!authenticate()) {
       return UNAUTHORIZED;
     }
+
+    if (!checkUsernamePassword(masterAccountUsername, masterPassword)) {
+      addFieldError("masterPassword", getText("plugin.nukesauth.masteraccount.masterpassword.notcorrect",
+          new String[] { masterPassword }));
+      return INPUT;
+    }
+
     final NukesUser masterAccount = nukesAccountManager.getAccountByUsername(masterAccountUsername);
 
     try {
@@ -179,4 +192,13 @@
     this.sbsAccountManager = sbsAccountManager;
   }
 
+  public void setMasterPassword(String masterPassword) {
+    this.masterPassword = masterPassword;
+  }
+
+  @RequiredFieldValidator(fieldName = "masterPassword", key = "plugin.nukesauth.masteraccount.masterpassword.required", message = "Password is required")
+  public String getMasterPassword() {
+    return masterPassword;
+  }
+
 }

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 11:35:22 UTC (rev 33398)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl	2010-06-08 12:06:13 UTC (rev 33399)
@@ -76,7 +76,8 @@
         <p>&nbsp;</p>
         <@s.form theme="simple">
         <table>
-          <@s.radio key="plugin.nukesauth.masteraccount.choosemaster" name="masterAccountUsername" list="duplicateAccounts" listKey="username" listValue="username" theme="xhtml"/>
+          <@s.radio key="plugin.nukesauth.masteraccount.choosemaster" name="masterAccountUsername" list="duplicateAccounts" listKey="username" listValue="username" theme="xhtml" required="true"/>
+          <@s.password key="plugin.nukesauth.masteraccount.masterpassword" name="masterPassword" theme="xhtml" required="true"/>
           <tr><td>&nbsp;</td></tr>
           <tr><td colspan="2">
           <@s.submit key="plugin.nukesauth.masteraccount.submit" method="execute"/>

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 11:35:22 UTC (rev 33398)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties	2010-06-08 12:06:13 UTC (rev 33399)
@@ -10,6 +10,9 @@
 plugin.nukesauth.masteraccount.account.url=URL
 plugin.nukesauth.masteraccount.account.companyname=Company name
 
+plugin.nukesauth.masteraccount.masterpassword=Password
+plugin.nukesauth.masteraccount.masterpassword.required=Password is required
+plugin.nukesauth.masteraccount.masterpassword.notcorrect=Password is not correct.
 
 plugin.nukesauth.masteraccount.choosemaster=Choose a Master Account
 plugin.nukesauth.masteraccount.choosemaster.required=You need to choose a Master Acount