[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security UserDetailsHibernateService.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
In directory james.mmbase.org:/tmp/cvs-serv22915

Modified Files:
      Tag: b1_5
        UserDetailsHibernateService.java 
Log Message:
CMSC-948 Registration portlet for CMS container


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security
See also: http://www.mmbase.org/jira/browse/CMSC-948


Index: UserDetailsHibernateService.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/UserDetailsHibernateService.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- UserDetailsHibernateService.java    23 Sep 2008 07:12:57 -0000      1.4
+++ UserDetailsHibernateService.java    27 Nov 2008 08:28:30 -0000      1.4.2.1
@@ -25,6 +25,9 @@
 import java.util.ArrayList;
 
 import com.finalist.cmsc.services.HibernateService;
+import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.cmsc.services.community.person.PersonService;
+import com.finalist.cmsc.services.community.person.RegisterStatus;
 
 /**
  * <p>
@@ -36,6 +39,7 @@
 public class UserDetailsHibernateService extends HibernateService implements 
UserDetailsService {
 
    private AuthenticationService authenticationService;
+   private PersonService personService; 
 
    @Transactional(readOnly = true)
    public UserDetails loadUserByUsername(String userName) throws 
UsernameNotFoundException, DataAccessException {
@@ -44,7 +48,10 @@
       if (authentication == null) {
          throw new UsernameNotFoundException("User not found");
       }
-
+      Person person = 
personService.getPersonByAuthenticationId(authentication.getId());
+      if (RegisterStatus.UNCONFIRMED.getName().equals(person.getActive())) {
+         throw new UsernameNotFoundException("User not confirm");
+      }
       /* Get authorities */
       Set < Authority > authorities = authentication.getAuthorities();
       List < GrantedAuthority > grantedAuthorities = new ArrayList < 
GrantedAuthority >();
@@ -64,4 +71,8 @@
    public void setAuthenticationService(AuthenticationService 
authenticationService) {
       this.authenticationService = authenticationService;
    }
+   @Required
+   public void setPersonService(PersonService personService) {
+      this.personService = personService;
+   }
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs