[jboss-cvs] jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/04 04:37:26

  Modified:    examples/seamspace/src/org/jboss/seam/example/seamspace 
                        Authenticator.java
  Log:
  simplified authentication
  
  Revision  Changes    Path
  1.11      +8 -4      jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Authenticator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamspace/src/org/jboss/seam/example/seamspace/Authenticator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Authenticator.java	2 Feb 2007 23:16:48 -0000	1.10
  +++ Authenticator.java	4 Feb 2007 09:37:26 -0000	1.11
  @@ -10,6 +10,7 @@
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Out;
  +import org.jboss.seam.security.Identity;
   
   /**
    * Authenticator bean - authenticates the user against the database
  @@ -25,16 +26,19 @@
      @Out(required = false, scope = SESSION)
      private Member authenticatedMember;
   
  -   public boolean authenticate(String username, String password, Set<String> roles) 
  +   @In
  +   private Identity identity;
  +
  +   public boolean authenticate() 
      {
         try
         {            
            Member member = (Member) entityManager.createQuery(
               "from Member where username = :username")
  -            .setParameter("username", username)
  +            .setParameter("username", identity.getUsername())
               .getSingleResult();
            
  -         if (!compareHash(member.getHashedPassword(), password)) {
  +         if (!compareHash(member.getHashedPassword(), identity.getPassword())) {
                return false;
            }
            
  @@ -43,7 +47,7 @@
            if (authenticatedMember.getRoles() != null)
            {
               for (MemberRole mr : authenticatedMember.getRoles())
  -               roles.add(mr.getName());
  +               identity.addRole(mr.getName());
            }
            
            return true;