Fix various issues raised when adapting upper layers

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

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/HttpRequestCallbackHandler.java b/org.argeo.cms/src/org/argeo/cms/auth/HttpRequestCallbackHandler.java
index 191a114523fd595c054df750b96d8c67169b6ebd..934fdd96bdf86ae7fa047507fc6c68acd3e58c25 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpRequestCallbackHandler.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpRequestCallbackHandler.java
@@ -4,29 +4,39 @@ import java.io.IOException;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.LanguageCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * Callback handler populating {@link HttpRequestCallback}s with the provided
  * {@link HttpServletRequest}, and ignoring any other callback.
  */
 public class HttpRequestCallbackHandler implements CallbackHandler {
-       final private HttpServletRequest request;
-       final private HttpServletResponse response;
+       final private HttpRequest request;
+       final private HttpResponse response;
+       final private HttpSession httpSession;
 
-       public HttpRequestCallbackHandler(HttpServletRequest request, HttpServletResponse response) {
+       public HttpRequestCallbackHandler(HttpRequest request, HttpResponse response) {
                this.request = request;
+               this.httpSession = request.getSession();
                this.response = response;
        }
 
+       public HttpRequestCallbackHandler(HttpSession httpSession) {
+               this.httpSession = httpSession;
+               this.request = null;
+               this.response = null;
+       }
+
        @Override
        public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
                for (Callback callback : callbacks)
                        if (callback instanceof HttpRequestCallback) {
                                ((HttpRequestCallback) callback).setRequest(request);
                                ((HttpRequestCallback) callback).setResponse(response);
+                               ((HttpRequestCallback) callback).setHttpSession(httpSession);
+                       } else if (callback instanceof LanguageCallback) {
+                               ((LanguageCallback) callback).setLocale(request.getLocale());
                        }
        }