fix path prefix detection (#294)

Author: azahnen

xtraplatform-auth/src/main/java/de/ii/xtraplatform/auth/infra/rest/OidcEndpoint.java

@@ -10,6 +10,7 @@
 import com.github.azahnen.dagger.annotations.AutoBind;
 import de.ii.xtraplatform.auth.domain.Oidc;
 import de.ii.xtraplatform.auth.domain.SplitCookie;
+import de.ii.xtraplatform.services.domain.ServicesContext;
 import de.ii.xtraplatform.web.domain.Endpoint;
 import de.ii.xtraplatform.web.domain.ForwardedUri;
 import de.ii.xtraplatform.web.domain.LoginHandler;
@@ -33,10 +34,13 @@
 @Singleton
 @AutoBind
 public class OidcEndpoint implements Endpoint, LoginHandler {
+
+  private final ServicesContext servicesContext;
   private final Oidc oidc;
 
   @Inject
-  public OidcEndpoint(Oidc oidc) {
+  public OidcEndpoint(ServicesContext servicesContext, Oidc oidc) {
+    this.servicesContext = servicesContext;
     this.oidc = oidc;
   }
 
@@ -75,20 +79,22 @@ public Response getLogout(
 
   private URI getCallbackUri(ContainerRequestContext containerRequestContext) {
     return URI.create(
-        ForwardedUri.base(containerRequestContext).appendPath(PATH_CALLBACK).toString());
+        ForwardedUri.base(containerRequestContext, servicesContext)
+            .appendPath(PATH_CALLBACK)
+            .toString());
   }
 
   private URI getCallbackRedirectUri(
       ContainerRequestContext containerRequestContext, String redirectUri) {
     return URI.create(
-        ForwardedUri.base(containerRequestContext)
+        ForwardedUri.base(containerRequestContext, servicesContext)
             .appendPath(PATH_CALLBACK)
             .addParameter(LoginHandler.PARAM_LOGIN_REDIRECT_URI, redirectUri)
             .toString());
   }
 
   private String getAssetsPrefix(ContainerRequestContext containerRequestContext) {
-    return ForwardedUri.base(containerRequestContext)
+    return ForwardedUri.base(containerRequestContext, servicesContext)
         .appendPath(StaticResourceHandler.PREFIX)
         .getPath();
   }

xtraplatform-base/src/main/java/de/ii/xtraplatform/base/domain/AppContext.java

@@ -8,10 +8,9 @@
 package de.ii.xtraplatform.base.domain;
 
 import de.ii.xtraplatform.base.domain.Constants.ENV;
-import java.net.URI;
 import java.nio.file.Path;
 
-public interface AppContext {
+public interface AppContext extends WebContext {
 
   String getName();
 
@@ -25,8 +24,6 @@ public interface AppContext {
 
   AppConfiguration getConfiguration();
 
-  URI getUri();
-
   String getInstanceName();
 
   default boolean isDevEnv() {

xtraplatform-base/src/main/java/de/ii/xtraplatform/base/domain/WebContext.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 interactive instruments GmbH
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package de.ii.xtraplatform.base.domain;
+
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
+import java.net.URI;
+import java.util.List;
+
+public interface WebContext {
+
+  URI getUri();
+
+  default List<String> getPathPrefix() {
+    return Strings.isNullOrEmpty(getUri().getPath())
+        ? List.of()
+        : Splitter.on('/').trimResults().omitEmptyStrings().splitToList(getUri().getPath());
+  }
+}

xtraplatform-services/src/main/java/de/ii/xtraplatform/services/app/ServicesContextImpl.java

@@ -11,22 +11,27 @@
 import de.ii.xtraplatform.base.domain.AppContext;
 import de.ii.xtraplatform.services.domain.ServicesContext;
 import java.net.URI;
+import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 @Singleton
 @AutoBind
 public class ServicesContextImpl implements ServicesContext {
 
-  private final URI uri;
+  private final AppContext appContext;
 
   @Inject
   ServicesContextImpl(AppContext appContext) {
-    this.uri = appContext.getUri();
+    this.appContext = appContext;
   }
 
   @Override
   public URI getUri() {
-    return uri;
+    return appContext.getUri();
+  }
+
+  public List<String> getPathPrefix() {
+    return appContext.getPathPrefix();
   }
 }

xtraplatform-services/src/main/java/de/ii/xtraplatform/services/app/ServicesEndpoint.java

@@ -69,7 +69,7 @@ public class ServicesEndpoint implements Endpoint {
 
   private final EntityRegistry entityRegistry;
   private final ServiceInjectableContext serviceContext;
-  private final URI servicesUri;
+  private final ServicesContext servicesContext;
   private final StaticResourceHandler staticResourceHandler;
   private final Lazy<Set<LoginHandler>> loginHandler;
 
@@ -86,7 +86,7 @@ public ServicesEndpoint(
       Lazy<Set<ServiceEndpoint>> serviceResources,
       Lazy<Set<ServiceListingProvider>> serviceListingProviders) {
     this.entityRegistry = entityRegistry;
-    this.servicesUri = servicesContext.getUri();
+    this.servicesContext = servicesContext;
     this.serviceContext = serviceContext;
     this.staticResourceHandler = staticResourceHandler;
     this.loginHandler = loginHandler;
@@ -142,7 +142,9 @@ public Response getServices(
       Optional<Principal> user =
           Optional.ofNullable(containerRequestContext.getSecurityContext().getUserPrincipal());
       URICustomizer uriCustomizer =
-          ForwardedUri.from(containerRequestContext).clearParameters().ensureNoTrailingSlash();
+          ForwardedUri.from(containerRequestContext, servicesContext)
+              .clearParameters()
+              .ensureNoTrailingSlash();
       Response serviceListing = provider.get().getServiceListing(services, uriCustomizer, user);
 
       return Response.ok().entity(serviceListing.getEntity()).type(mediaType).build();
@@ -194,7 +196,13 @@ public Response getLogin(
         .iterator()
         .next()
         .handle(
-            containerRequestContext, redirectUri, scopes, servicesUri.getPath(), false, null, null);
+            containerRequestContext,
+            redirectUri,
+            scopes,
+            servicesContext.getUri().getPath(),
+            false,
+            null,
+            null);
   }
 
   @GET
@@ -215,7 +223,13 @@ public Response getCallback(
         .iterator()
         .next()
         .handle(
-            containerRequestContext, redirectUri, null, servicesUri.getPath(), true, state, token);
+            containerRequestContext,
+            redirectUri,
+            null,
+            servicesContext.getUri().getPath(),
+            true,
+            state,
+            token);
   }
 
   @GET
@@ -304,7 +318,7 @@ private Service getService(String id, String callback) {
   }
 
   private Optional<URI> getExternalUri() {
-    return Optional.of(servicesUri);
+    return Optional.of(servicesContext.getUri());
   }
 
   private void openLoggingContext(ContainerRequestContext containerRequestContext) {

xtraplatform-services/src/main/java/de/ii/xtraplatform/services/domain/ServicesContext.java

@@ -7,11 +7,6 @@
  */
 package de.ii.xtraplatform.services.domain;
 
-import java.net.URI;
+import de.ii.xtraplatform.base.domain.WebContext;
 
-public interface ServicesContext {
-
-  String STATIC_PREFIX = "___static___";
-
-  URI getUri();
-}
+public interface ServicesContext extends WebContext {}

xtraplatform-web/src/main/java/de/ii/xtraplatform/web/domain/ForwardedUri.java

@@ -8,6 +8,7 @@
 package de.ii.xtraplatform.web.domain;
 
 import com.google.common.base.Splitter;
+import de.ii.xtraplatform.base.domain.WebContext;
 import java.util.List;
 import javax.ws.rs.container.ContainerRequestContext;
 
@@ -16,22 +17,22 @@ public interface ForwardedUri {
   String X_FORWARDED_PREFIX = "X-Forwarded-Prefix";
   Splitter PATH_SPLITTER = Splitter.on('/').trimResults().omitEmptyStrings();
 
-  static URICustomizer from(ContainerRequestContext requestContext) {
+  static URICustomizer from(ContainerRequestContext requestContext, WebContext webContext) {
     return new URICustomizer(requestContext.getUriInfo().getRequestUri())
-        .prependPathSegments(prefix(requestContext));
+        .prependPathSegments(prefix(requestContext, webContext));
   }
 
-  static URICustomizer base(ContainerRequestContext requestContext) {
+  static URICustomizer base(ContainerRequestContext requestContext, WebContext webContext) {
     return new URICustomizer(requestContext.getUriInfo().getRequestUri())
-        .setPathSegments(prefix(requestContext))
+        .setPathSegments(prefix(requestContext, webContext))
         .ensureNoTrailingSlash()
         .clearParameters();
   }
 
-  static List<String> prefix(ContainerRequestContext requestContext) {
+  static List<String> prefix(ContainerRequestContext requestContext, WebContext webContext) {
     if (requestContext.getHeaders().containsKey(X_FORWARDED_PREFIX)) {
       return PATH_SPLITTER.splitToList(requestContext.getHeaderString(X_FORWARDED_PREFIX));
     }
-    return List.of();
+    return webContext.getPathPrefix();
   }
 }