X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=d50535eaefcedaa791f06b93342c94634f68b552;hb=a5459b7f0a4ce0463b950efd5c776368fe169256;hp=65ccbd6aba15c7c2cfa71fcb7f39d7107eb5d7a0;hpb=6ecc30c54a64fb658aa7949349b05d655ff386a8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
index 65ccbd6ab..d50535eae 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -23,26 +23,22 @@ import org.argeo.node.NodeConstants;
 import org.argeo.node.security.AnonymousPrincipal;
 import org.argeo.node.security.DataAdminPrincipal;
 import org.argeo.node.security.NodeSecurityUtils;
+import org.argeo.osgi.useradmin.AuthenticatingUser;
 import org.osgi.service.http.HttpContext;
 import org.osgi.service.useradmin.Authorization;
 
 class CmsAuthUtils {
-	/** Shared HTTP request */
-	final static String SHARED_STATE_HTTP_REQUEST = "org.argeo.cms.auth.http.request";
-	/** From org.osgi.service.http.HttpContext */
-	// final static String SHARED_STATE_AUTHORIZATION =
-	// "org.osgi.service.useradmin.authorization";
-	/** From com.sun.security.auth.module.*LoginModule */
-	final static String SHARED_STATE_NAME = "javax.security.auth.login.name";
-	/** From com.sun.security.auth.module.*LoginModule */
-	final static String SHARED_STATE_PWD = "javax.security.auth.login.password";
+	// Standard
+	final static String SHARED_STATE_NAME = AuthenticatingUser.SHARED_STATE_NAME;
+	final static String SHARED_STATE_PWD = AuthenticatingUser.SHARED_STATE_PWD;
+	final static String HEADER_AUTHORIZATION = "Authorization";
+	final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
 
+	// Argeo specific
+	final static String SHARED_STATE_HTTP_REQUEST = "org.argeo.cms.auth.http.request";
 	final static String SHARED_STATE_SPNEGO_TOKEN = "org.argeo.cms.auth.spnegoToken";
 	final static String SHARED_STATE_SPNEGO_OUT_TOKEN = "org.argeo.cms.auth.spnegoOutToken";
 
-	final static String HEADER_AUTHORIZATION = "Authorization";
-	final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
-
 	static void addAuthorization(Subject subject, Authorization authorization, Locale locale,
 			HttpServletRequest request) {
 		assert subject != null;