X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fcore%2FInternalAuthentication.java;h=31e29d18d773f6d338559af2397ae7f8990b2f10;hb=d12f4cda6ff7b1de242a19362c3680f30ccc5168;hp=267ddd312af8d0741c1876bbd9a86b388f7195ef;hpb=10ed6557c631d5feee8541badd0c9f16a9e791c6;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java b/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java
index 267ddd312..31e29d18d 100644
--- a/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java
+++ b/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java
@@ -15,33 +15,26 @@
  */
 package org.argeo.security.core;
 
+import java.util.Collections;
+
 import org.argeo.security.SystemAuthentication;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.adapters.PrincipalSpringSecurityUserToken;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 /** A token base on a system key used to request a system authentication. */
-public class InternalAuthentication extends PrincipalSpringSecurityUserToken
+public class InternalAuthentication extends UsernamePasswordAuthenticationToken
 		implements SystemAuthentication {
 	private static final long serialVersionUID = -6783376375615949315L;
-	/** 'admin' for consistency with JCR */
-	public final static String DEFAULT_SYSTEM_USERNAME = "admin";
-	public final static String DEFAULT_SYSTEM_ROLE = "ROLE_SYSTEM";
-	public final static String SYSTEM_KEY_PROPERTY = "argeo.security.systemKey";
 	public final static String SYSTEM_KEY_DEFAULT = "argeo";
 
 	public InternalAuthentication(String key, String systemUsername,
 			String systemRole) {
-		super(
-				key,
-				systemUsername,
-				key,
-				new GrantedAuthority[] { new GrantedAuthorityImpl(systemRole) },
-				systemUsername);
+		super(systemUsername, key, Collections
+				.singleton(new SimpleGrantedAuthority(systemRole)));
 	}
 
 	public InternalAuthentication(String key) {
-		this(key, DEFAULT_SYSTEM_USERNAME, DEFAULT_SYSTEM_ROLE);
+		this(key, SystemAuthentication.USERNAME_SYSTEM, SystemAuthentication.ROLE_SYSTEM);
 	}
 
 }