From 6be83ba7b02c903dfb5aa5df9f7ef58bbbd9f6be Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 22:13:41 +0200 Subject: [PATCH] Persist locale in HTTP session --- .../src/org/argeo/cms/auth/HttpSessionLoginModule.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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; -- 2.30.2