Ensure request context path is added to client library URLs.

wcm-io · Sep 10, 2024 · c2aadf2 · c2aadf2
1 parent e9f8e40
commit c2aadf2
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/changes.xml b/changes.xml
@@ -24,6 +24,9 @@
   <body>
 
     <release version="1.3.2" date="not released">
+      <action type="update" dev="sseifert">
+        Ensure request context path is added to client library URLs.
+      </action>
       <action type="update" dev="sseifert">
         Switch to AEM 6.5.17 as minimum version.
       </action>

diff --git a/src/main/java/io/wcm/wcm/ui/clientlibs/components/CSSInclude.java b/src/main/java/io/wcm/wcm/ui/clientlibs/components/CSSInclude.java
@@ -51,6 +51,8 @@ public class CSSInclude {
   private static final Set<String> REL_ALLOWED_VALUES = Set.of(
       "prefetch", "preload");
 
+  @SlingObject
+  private SlingHttpServletRequest request;
   @SlingObject
   private ResourceResolver resourceResolver;
   @OSGiService
@@ -114,7 +116,7 @@ private void activate() {
       HtmlTagBuilder builder = new HtmlTagBuilder("link", false, xssApi);
       builder.setAttrs(attrs);
       builder.setAttrs(customAttrs);
-      builder.setAttr("href", libraryPath);
+      builder.setAttr("href", request.getContextPath() + libraryPath);
       markup.append(builder.build());
     }
     return markup.toString();

diff --git a/src/main/java/io/wcm/wcm/ui/clientlibs/components/IncludeUtil.java b/src/main/java/io/wcm/wcm/ui/clientlibs/components/IncludeUtil.java
@@ -97,7 +97,7 @@ else if (categories != null && categories.getClass().isArray()) {
       path = "/etc.clientlibs" + path.substring(5);
     }
     else if (resourceResolver.getResource(library.getPath()) == null) {
-      // current render resourcer resolver has no access to the client library - ignore it
+      // current render resource resolver has no access to the client library - ignore it
       path = null;
     }
     return path;

diff --git a/src/main/java/io/wcm/wcm/ui/clientlibs/components/JSInclude.java b/src/main/java/io/wcm/wcm/ui/clientlibs/components/JSInclude.java
@@ -57,6 +57,8 @@ public class JSInclude {
   private static final Set<String> TYPE_ALLOWED_VALUES = Set.of(
       "text/javascript", "module");
 
+  @SlingObject
+  private SlingHttpServletRequest request;
   @SlingObject
   private ResourceResolver resourceResolver;
   @OSGiService
@@ -150,7 +152,7 @@ private void activate() {
       HtmlTagBuilder builder = new HtmlTagBuilder("script", true, xssApi);
       builder.setAttrs(attrs);
       builder.setAttrs(customAttrs);
-      builder.setAttr("src", libraryPath);
+      builder.setAttr("src", request.getContextPath() + libraryPath);
       markup.append(builder.build());
     }
     return markup.toString();

diff --git a/src/test/java/io/wcm/wcm/ui/clientlibs/components/CSSIncludeTest.java b/src/test/java/io/wcm/wcm/ui/clientlibs/components/CSSIncludeTest.java
@@ -48,6 +48,15 @@ void testSingle() {
         underTest.getInclude());
   }
 
+  @Test
+  void testSingle_ContextPath() {
+    context.request().setContextPath("/mycontext");
+    context.request().setAttribute("categories", CATEGORY_SINGLE);
+    CSSInclude underTest = AdaptTo.notNull(context.request(), CSSInclude.class);
+    assertEquals("<link href=\"/mycontext/etc/clientlibs/app1/clientlib1.min.css\" rel=\"stylesheet\" type=\"text/css\">\n",
+        underTest.getInclude());
+  }
+
   @ParameterizedTest
   @ValueSource(strings = { "preload", "prefetch" })
   void testSingle_rel_valid(String validRelParameter) {

diff --git a/src/test/java/io/wcm/wcm/ui/clientlibs/components/JSIncludeTest.java b/src/test/java/io/wcm/wcm/ui/clientlibs/components/JSIncludeTest.java
@@ -45,6 +45,14 @@ void testSingleNoAttributes() {
     assertEquals("<script src=\"/etc/clientlibs/app1/clientlib1.min.js\"></script>\n", underTest.getInclude());
   }
 
+  @Test
+  void testSingleNoAttributes_ContextPath() {
+    context.request().setContextPath("/mycontext");
+    context.request().setAttribute("categories", CATEGORY_SINGLE);
+    JSInclude underTest = AdaptTo.notNull(context.request(), JSInclude.class);
+    assertEquals("<script src=\"/mycontext/etc/clientlibs/app1/clientlib1.min.js\"></script>\n", underTest.getInclude());
+  }
+
   @Test
   void testSingleNoAttributesUnminified() {
     when(htmlLibraryManager.isMinifyEnabled()).thenReturn(false);