X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCurrentUser.java;h=86a748325ec0e0a553ab3e46d2be403a59fe5c73;hb=c615307d7b87bcb260d8a9f402c6e0a880862f38;hp=9808305ce0000c4132b933db09142efe5c71cc7b;hpb=b7683883512d924a039a43c2e1102290aa49f64d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
index 9808305ce..86a748325 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -13,12 +13,12 @@ import java.util.UUID;
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.CmsSessionId;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.auth.ImpliedByPrincipal;
-import org.argeo.cms.internal.kernel.Activator;
+import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.osgi.service.useradmin.Authorization;
 
 /**
@@ -86,7 +86,7 @@ public final class CurrentUser {
 		if (subject == null)
 			throw new IllegalArgumentException("Subject cannot be null");
 		if (subject.getPrincipals(X500Principal.class).size() != 1)
-			return NodeConstants.ROLE_ANONYMOUS;
+			return CmsConstants.ROLE_ANONYMOUS;
 		Principal principal = subject.getPrincipals(X500Principal.class).iterator().next();
 		return principal.getName();
 	}
@@ -107,7 +107,7 @@ public final class CurrentUser {
 	public final static Locale locale(Subject subject) {
 		Set<Locale> locales = subject.getPublicCredentials(Locale.class);
 		if (locales.isEmpty()) {
-			Locale defaultLocale = Activator.getNodeState().getDefaultLocale();
+			Locale defaultLocale = CmsContextImpl.getCmsContext().getDefaultLocale();
 			return defaultLocale;
 		} else
 			return locales.iterator().next();
@@ -118,10 +118,10 @@ public final class CurrentUser {
 		if (subject == null)
 			return true;
 		String username = getUsername(subject);
-		return username == null || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
+		return username == null || username.equalsIgnoreCase(CmsConstants.ROLE_ANONYMOUS);
 	}
 
-	public CmsSession getCmsSession() {
+	public static CmsSession getCmsSession() {
 		Subject subject = currentSubject();
 		CmsSessionId cmsSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next();
 		return CmsSessionImpl.getByUuid(cmsSessionId.getUuid());
@@ -152,7 +152,7 @@ public final class CurrentUser {
 		else
 			return false;
 		CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
-		
+
 		// FIXME logout all views
 		// TODO check why it is sometimes null
 		if (cmsSession != null)