[jboss-cvs] JBossBlog SVN: r338 - labs/src/portal/org/jboss/blog/session/security/external.

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

Author: sviluppatorefico
Date: 2009-01-17 13:51:59 -0500 (Sat, 17 Jan 2009)
New Revision: 338

Modified:
   labs/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java
Log:
see https://jira.jboss.org/jira/browse/JBBLOG-76

Modified: labs/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java
===================================================================
--- labs/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java	2009-01-17 18:45:17 UTC (rev 337)
+++ labs/src/portal/org/jboss/blog/session/security/external/PortalSecurityServiceImpl.java	2009-01-17 18:51:59 UTC (rev 338)
@@ -1,22 +1,30 @@
 package org.jboss.blog.session.security.external;
 
-import org.jboss.seam.annotations.*;
-import org.jboss.seam.log.Log;
-import org.jboss.portal.identity.*;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.common.util.Tools;
-import org.jboss.blog.session.security.InvalidLoginException;
-import org.jboss.blog.tools.StringTools;
+import java.util.ArrayList;
+import java.util.List;
 
+import javax.ejb.Remove;
 import javax.ejb.Stateless;
-import javax.ejb.Remove;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import java.util.List;
-import java.util.ArrayList;
 
+import org.jboss.blog.session.security.InvalidLoginException;
+import org.jboss.blog.tools.StringTools;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.MembershipModule;
+import org.jboss.portal.identity.NoSuchUserException;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.log.Log;
+
 /**
  * @author Adam Warski (adam at warski dot org)
  */
@@ -83,14 +91,8 @@
             throw new PortalSecurityException(e);
         }
 
-        if ("admin".equals(username)) {
-            if (!user.validatePassword(password)) {
-                throw new InvalidLoginException();
-            }
-        } else {
-            if (!user.validatePassword(Tools.md5AsHexString(password))) {
-                throw new InvalidLoginException();
-            }
+        if (!user.validatePassword(password)) {
+           throw new InvalidLoginException();
         }
 
         return new PortalUser(user.getId().toString(), user.getUserName(), getUserEmail(user));