Rename remote auth interfaces

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

diff --git a/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java b/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
index 8e12a8986e663be7ed8508c1e83953107d9002a2..66bccc07ad536775190ee3eb798ddd846a8ec94c 100644 (file)
--- a/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
+++ b/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
@@ -16,7 +16,7 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
@@ -24,7 +24,9 @@ import org.argeo.api.NodeState;
 import org.argeo.api.cms.CmsView;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.LocaleUtils;
-import org.argeo.cms.auth.HttpRequestCallback;
+import org.argeo.cms.auth.RemoteAuthCallback;
+import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletHttpResponse;
 import org.argeo.cms.swt.CmsStyles;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.eclipse.ui.specific.UiContext;
@@ -308,9 +310,9 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
                                ((NameCallback) callback).setName(usernameT.getText());
                        else if (callback instanceof PasswordCallback && passwordT != null)
                                ((PasswordCallback) callback).setPassword(passwordT.getTextChars());
-                       else if (callback instanceof HttpRequestCallback) {
-                               ((HttpRequestCallback) callback).setRequest(UiContext.getHttpRequest());
-                               ((HttpRequestCallback) callback).setResponse(UiContext.getHttpResponse());
+                       else if (callback instanceof RemoteAuthCallback) {
+                               ((RemoteAuthCallback) callback).setRequest(new ServletHttpRequest(UiContext.getHttpRequest()));
+                               ((RemoteAuthCallback) callback).setResponse(new ServletHttpResponse(UiContext.getHttpResponse()));
                        } else if (callback instanceof LanguageCallback) {
                                Locale toUse = null;
                                if (localeChoice != null)