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

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

Author: lkrzyzanek
Date: 2010-06-25 09:05:17 -0400 (Fri, 25 Jun 2010)
New Revision: 33640

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.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/proxy/RegistrationManagerNukesProxy.java
Log:
Moved creating account from listener to RegistrationManager due to password is not in UserEvent

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java	2010-06-25 11:56:40 UTC (rev 33639)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/NukesAccountManagerImpl.java	2010-06-25 13:05:17 UTC (rev 33640)
@@ -87,6 +87,9 @@
     }
 
     NukesUser nukesUser = convertToNukesAccount(sbsUser, false);
+    String passwordHash = passwordEncoder.encodePassword(sbsUser.getPassword(), null);
+    nukesUser.setPasswordHash(passwordHash);
+
     if (log.isDebugEnabled()) {
       log.debug("Converted nukesUser: " + nukesUser);
     }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java	2010-06-25 11:56:40 UTC (rev 33639)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/dao/DbNukesUserDAOImpl.java	2010-06-25 13:05:17 UTC (rev 33640)
@@ -52,11 +52,11 @@
       + " WHERE pn_uname = ?";
 
   private static final String INSERT_USER = "INSERT INTO nuke_users "
-      + "  (pn_uname, pn_user_regdate, pn_user_viewemail, pn_email, pn_last_visit, pn_fname, pn_lname, pn_name, pn_phone, pn_femail, pn_user_icq"
+      + "  (pn_uname, pn_pass, pn_user_regdate, pn_user_viewemail, pn_email, pn_last_visit, pn_fname, pn_lname, pn_name, pn_phone, pn_femail, pn_user_icq"
       + ", pn_user_aim, pn_user_yim, pn_user_msnm, pn_user_occ, pn_user_intrest, pn_cname, pn_title"
       + ", pn_companysize, pn_url, pn_bio, pn_usertype, pn_globally_disabled, pn_timezone_offset, pn_user_avatar, pn_user_from, pn_user_sig"
       + ", pn_theme, pn_umode, pn_question, pn_answer, pn_enabled)"
-      + " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+      + " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
   @Override
   public NukesUser getNukesUser(String username) {
@@ -77,6 +77,7 @@
     List<Object> args = new LinkedList<Object>();
 
     args.add(user.getUsername());
+    args.add(user.getPasswordHash());
     args.add(user.getCreationDate());
     args.add(user.isEmailVisible());
     args.add(shrink(user.getEmail(), 60));

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-25 11:56:40 UTC (rev 33639)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/listener/SyncUserWithNukesListener.java	2010-06-25 13:05:17 UTC (rev 33640)
@@ -86,10 +86,6 @@
       List<String> duplicateUsernames = sbsAccountManager.getDuplicateAccountUsernames(user);
       nukesAccountManager.updateNukesAccounts(user, duplicateUsernames);
     }
-    if (UserEvent.Type.CREATED.compareTo(e.getType()) == 0) {
-      User user = e.getPayload();
-      nukesAccountManager.createNukesUser(user);
-    }
 
   }
 

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/proxy/RegistrationManagerNukesProxy.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/proxy/RegistrationManagerNukesProxy.java	2010-06-25 11:56:40 UTC (rev 33639)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/proxy/RegistrationManagerNukesProxy.java	2010-06-25 13:05:17 UTC (rev 33640)
@@ -62,7 +62,15 @@
       }
     }
 
-    return super.registerUser(user);
+    User createdUser = super.registerUser(user);
+
+    UserTemplate ut = new UserTemplate(createdUser);
+    // password is not in created user.
+    ut.setPassword(user.getPassword());
+
+    nukesAccountManager.createNukesUser(ut);
+
+    return createdUser;
   }
 
   public void setNukesAccountManager(NukesAccountManager nukesAccountManager) {