[jboss-svn-commits] JBL Code SVN: r6065 - in labs/jbosslabs/trunk/portal-extensions/forge-login: . src/java/org/jboss src/java/org/jboss/labs/login

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

Author: szimano
Date: 2006-09-01 12:18:54 -0400 (Fri, 01 Sep 2006)
New Revision: 6065

Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/portal/
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-login/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
Log:
deleting ribbish, modified login


Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/project.xml	2006-09-01 15:41:02 UTC (rev 6064)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/project.xml	2006-09-01 16:18:54 UTC (rev 6065)
@@ -45,7 +45,11 @@
 	    <version>1.0</version>
 	    <jar>javax.servlet.jar</jar>
 </dependency>
-
+<dependency>
+	    <groupId>jboss-forge</groupId>
+	    <artifactId>forge-common</artifactId>
+	    <version>1.0</version>
+	</dependency>
 </dependencies>
 
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java	2006-09-01 15:41:02 UTC (rev 6064)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java	2006-09-01 16:18:54 UTC (rev 6065)
@@ -28,6 +28,7 @@
 import java.sql.Statement;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -39,7 +40,10 @@
 import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 
+import org.jboss.forge.common.PermissionTools;
 import org.jboss.portal.common.transaction.Transactions;
+import org.jboss.portal.core.modules.ModuleConstants;
+import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portal.identity.*;
 import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
 import org.jboss.security.SimpleGroup;
@@ -115,7 +119,7 @@
 									User user = module
 											.findUserByUserName(getUsername());
 									if (havingRole == null
-											|| user.getRoleNames().contains(
+											|| PermissionTools.getRoleNames(user).contains(
 													havingRole)) {
 										return checkIfPasswordChanged(user);
 									} else {
@@ -140,8 +144,8 @@
 	}
 
 	private String checkIfPasswordChanged(User user) throws LoginException {
-		String password = user.getPassword();
-
+		String password = null;
+		
 		if (!getUsername().equals("admin")) {
 			/*
 			 * check if password in the main db changed (not for admin account)
@@ -160,15 +164,14 @@
 				ResultSet rs = st.executeQuery(sql);
 
 				if (rs.next()) {
-					if (!password.equals(rs.getString("pn_pass"))) {
+					if (!user.validatePassword(rs.getString("pn_pass"))) {
 						/*
 						 * User user = userModule
 						 * .findUserByUserName(getUsername());
 						 */
-						user.setPassword(rs.getString("pn_pass"));
-						password = rs.getString("pn_pass");
+						user.updatePassword(rs.getString("pn_pass"));
 					}
-
+					password = rs.getString("pn_pass");
 				}
 
 				conn.close();
@@ -235,7 +238,7 @@
 						Role role = roleModule.findRoleByName(defaultRole);
 						if (role != null) {
 							roleSet.add(role);
-							user.setRoles(roleSet);
+							PermissionTools.setRoles(user, roleSet);
 						} else {
 							log
 									.error("The role you specified as default role does not exist, check your portlet configuration");
@@ -248,13 +251,10 @@
 					log.error("Cannot create user " + getUsername(), e);
 
 					throw new LoginException(e.toString());
-				} catch (ModuleException e) {
-					log.error("Cannot create user " + getUsername(), e);
-					throw new LoginException(e.toString());
-				}
+				} 
 
 				if (user != null
-						&& (havingRole == null || user.getRoleNames().contains(
+						&& (havingRole == null || PermissionTools.getRoleNames(user).contains(
 								havingRole))) {
 					/*
 					 * User has been just created and it's only in the defaule
@@ -288,7 +288,7 @@
 								UserModule module = getUserModule();
 								User user = module
 										.findUserByUserName(getUsername());
-								Set roleNames = user.getRoleNames();
+								List<String> roleNames = PermissionTools.getRoleNames(user);
 
 								//
 								Group rolesGroup = new SimpleGroup("Roles");