From 592f9df9d821a36868d3d49f87c1b848867e3e89 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 18 Oct 2023 10:51:33 +0200 Subject: [PATCH] Export RemoteAuthHttpExchange --- .../cms/{internal => }/http/RemoteAuthHttpExchange.java | 6 +++++- .../src/org/argeo/cms/http/server/HttpServerUtils.java | 2 +- .../src/org/argeo/cms/internal/http/CmsAuthenticator.java | 1 + .../org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) rename org.argeo.cms/src/org/argeo/cms/{internal => }/http/RemoteAuthHttpExchange.java (93%) diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/RemoteAuthHttpExchange.java b/org.argeo.cms/src/org/argeo/cms/http/RemoteAuthHttpExchange.java similarity index 93% rename from org.argeo.cms/src/org/argeo/cms/internal/http/RemoteAuthHttpExchange.java rename to org.argeo.cms/src/org/argeo/cms/http/RemoteAuthHttpExchange.java index b7e670c79..7f34a5230 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/http/RemoteAuthHttpExchange.java +++ b/org.argeo.cms/src/org/argeo/cms/http/RemoteAuthHttpExchange.java @@ -1,4 +1,4 @@ -package org.argeo.cms.internal.http; +package org.argeo.cms.http; import java.util.ArrayList; import java.util.Collections; @@ -12,6 +12,10 @@ import org.argeo.cms.auth.RemoteAuthSession; import com.sun.net.httpserver.HttpExchange; +/** + * Implementation of {@link RemoteAuthRequest} and {@link RemoteAuthResponse} + * based on {@link HttpExchange}. + */ public class RemoteAuthHttpExchange implements RemoteAuthRequest, RemoteAuthResponse { private final HttpExchange httpExchange; private RemoteAuthSession remoteAuthSession; diff --git a/org.argeo.cms/src/org/argeo/cms/http/server/HttpServerUtils.java b/org.argeo.cms/src/org/argeo/cms/http/server/HttpServerUtils.java index a170507e5..9d2c1930a 100644 --- a/org.argeo.cms/src/org/argeo/cms/http/server/HttpServerUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/http/server/HttpServerUtils.java @@ -18,7 +18,7 @@ import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.ContentSession; import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.http.HttpMethod; -import org.argeo.cms.internal.http.RemoteAuthHttpExchange; +import org.argeo.cms.http.RemoteAuthHttpExchange; import com.sun.net.httpserver.HttpContext; import com.sun.net.httpserver.HttpExchange; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/CmsAuthenticator.java b/org.argeo.cms/src/org/argeo/cms/internal/http/CmsAuthenticator.java index e17a089fe..a66a7397e 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/http/CmsAuthenticator.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/http/CmsAuthenticator.java @@ -10,6 +10,7 @@ import org.argeo.cms.auth.RemoteAuthCallbackHandler; import org.argeo.cms.auth.RemoteAuthRequest; import org.argeo.cms.auth.RemoteAuthResponse; import org.argeo.cms.auth.RemoteAuthUtils; +import org.argeo.cms.http.RemoteAuthHttpExchange; import com.sun.net.httpserver.Authenticator; import com.sun.net.httpserver.HttpExchange; diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java index c80933a55..2847cb32f 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java @@ -26,7 +26,7 @@ import org.argeo.cms.dav.DavHttpHandler; import org.argeo.cms.dav.DavPropfind; import org.argeo.cms.dav.DavResponse; import org.argeo.cms.http.HttpStatus; -import org.argeo.cms.internal.http.RemoteAuthHttpExchange; +import org.argeo.cms.http.RemoteAuthHttpExchange; import org.argeo.cms.util.StreamUtils; import com.sun.net.httpserver.HttpExchange; -- 2.30.2