X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FHttpSessionLoginModule.java;h=7b7207ef3e32536b84b8c67f099617ca14d42fe1;hb=6be83ba7b02c903dfb5aa5df9f7ef58bbbd9f6be;hp=81ca5baf3778727783b1f73f6dd045b6a0d893f2;hpb=6960fb17d7601de34cc6c4f320c9d1f63caca692;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
index 81ca5baf3..7b7207ef3 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
@@ -41,6 +41,7 @@ public class HttpSessionLoginModule implements LoginModule {
 	private BundleContext bc;
 
 	private Authorization authorization;
+	private Locale locale;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -90,6 +91,7 @@ public class HttpSessionLoginModule implements LoginModule {
 			}
 			if (sr.size() == 1) {
 				CmsSession cmsSession = bc.getService(sr.iterator().next());
+				locale = cmsSession.getLocale();
 				authorization = cmsSession.getAuthorization();
 				if (authorization.getName() == null)
 					authorization = null;// anonymous is not sufficient
@@ -120,8 +122,11 @@ public class HttpSessionLoginModule implements LoginModule {
 		}
 
 		if (authorization != null) {
-			Locale locale = request.getLocale();
-			CmsAuthUtils.addAuthorization(subject, authorization,locale , request);
+			// Locale locale = request.getLocale();
+			if (locale == null)
+				locale = request.getLocale();
+			subject.getPublicCredentials().add(locale);
+			CmsAuthUtils.addAuthorization(subject, authorization, locale, request);
 			CmsAuthUtils.registerSessionAuthorization(request, subject, authorization, locale);
 			cleanUp();
 			return true;