X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=rap%2Forg.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FAbstractCmsEntryPoint.java;h=7b7bddc5c5d13b603f010266eb91f612cb72927e;hb=4185ff8826f893a4a1f054f61a11b89333c3e85d;hp=c20068fa76b6925efb46e55ed628dc2ae7974c47;hpb=beec30ca4ad6e0a27b3fe984d987b98988e14e76;p=lgpl%2Fargeo-commons.git diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java index c20068fa7..7b7bddc5c 100644 --- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java +++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java @@ -27,8 +27,8 @@ import org.argeo.api.NodeConstants; import org.argeo.api.cms.CmsView; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.auth.HttpRequestCallback; -import org.argeo.cms.auth.HttpRequestCallbackHandler; +import org.argeo.cms.auth.RemoteAuthCallback; +import org.argeo.cms.auth.RemoteAuthCallbackHandler; import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.cms.servlet.ServletHttpResponse; import org.argeo.cms.swt.CmsStyles; @@ -86,7 +86,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement LoginContext lc; try { lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, - new HttpRequestCallbackHandler(new ServletHttpRequest(UiContext.getHttpRequest()), + new RemoteAuthCallbackHandler(new ServletHttpRequest(UiContext.getHttpRequest()), new ServletHttpResponse(UiContext.getHttpResponse()))); lc.login(); } catch (LoginException e) { @@ -293,10 +293,10 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement super.handle(callbacks); // handle HTTP context for (Callback callback : callbacks) { - if (callback instanceof HttpRequestCallback) { - ((HttpRequestCallback) callback) + if (callback instanceof RemoteAuthCallback) { + ((RemoteAuthCallback) callback) .setRequest(new ServletHttpRequest(UiContext.getHttpRequest())); - ((HttpRequestCallback) callback) + ((RemoteAuthCallback) callback) .setResponse(new ServletHttpResponse(UiContext.getHttpResponse())); } }