Improve logging

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / core / OsAuthenticationProvider.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java
index e9c83839f2e35c6d3ca836aa578a1913da517e89..524e73f8f7cdf4d440d7eb7b5e0fc89aab492868 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/OsAuthenticationProvider.java
@@ -20,16 +20,16 @@ public class OsAuthenticationProvider implements AuthenticationProvider {
 
        public Authentication authenticate(Authentication authentication)
                        throws AuthenticationException {
-               if (authentication instanceof OsAuthenticationToken) {
-                       List<GrantedAuthority> auths = new ArrayList<GrantedAuthority>();
-                       auths.add(new GrantedAuthorityImpl(osUserRole));
-                       auths.add(new GrantedAuthorityImpl(userRole));
-                       if (isAdmin)
-                               auths.add(new GrantedAuthorityImpl(adminRole));
-                       return new OsAuthenticationToken(
-                                       auths.toArray(new GrantedAuthority[auths.size()]));
-               }
-               return null;
+               if (!(authentication instanceof OsAuthenticationToken))
+                       return null;
+
+               List<GrantedAuthority> auths = new ArrayList<GrantedAuthority>();
+               auths.add(new GrantedAuthorityImpl(osUserRole));
+               auths.add(new GrantedAuthorityImpl(userRole));
+               if (isAdmin)
+                       auths.add(new GrantedAuthorityImpl(adminRole));
+               return new OsAuthenticationToken(
+                               auths.toArray(new GrantedAuthority[auths.size()]));
        }
 
        @SuppressWarnings("rawtypes")
@@ -41,6 +41,10 @@ public class OsAuthenticationProvider implements AuthenticationProvider {
                this.osUserRole = osUserRole;
        }
 
+       public void setUserRole(String userRole) {
+               this.userRole = userRole;
+       }
+
        public void setAdminRole(String adminRole) {
                this.adminRole = adminRole;
        }