Integrate web sockets with CMS session

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / AnonymousLoginModule.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
index 7a1283afa9d7cc72ed93b50eafb07320ce7e4ff1..19c0d60edff4f892ec1170775bd28f452628b847 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
@@ -1,5 +1,6 @@
 package org.argeo.cms.auth;
 
+import java.util.Locale;
 import java.util.Map;
 
 import javax.security.auth.Subject;
@@ -49,10 +50,14 @@ public class AnonymousLoginModule implements LoginModule {
        public boolean commit() throws LoginException {
                UserAdmin userAdmin = bc.getService(bc.getServiceReference(UserAdmin.class));
                Authorization authorization = userAdmin.getAuthorization(null);
-               CmsAuthUtils.addAuthorization(subject, authorization,
-                               (HttpServletRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST));
-               if (log.isDebugEnabled())
-                       log.debug("Anonymous logged in to CMS: " + subject);
+               HttpServletRequest request = (HttpServletRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
+               Locale locale = Locale.getDefault();
+               if (request != null)
+                       locale = request.getLocale();
+               CmsAuthUtils.addAuthorization(subject, authorization, locale, request);
+               CmsAuthUtils.registerSessionAuthorization(request, subject, authorization, locale);
+               if (log.isTraceEnabled())
+                       log.trace("Anonymous logged in to CMS: " + subject);
                return true;
        }