HTM-1927: Fix styled legend requests for proxied layer are not using proxied urls

Author: mprins

src/main/java/org/tailormap/api/persistence/helper/ApplicationHelper.java

@@ -31,6 +31,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.util.UriComponentsBuilder;
 import org.tailormap.api.controller.GeoServiceProxyController;
 import org.tailormap.api.persistence.Application;
 import org.tailormap.api.persistence.Configuration;
@@ -48,6 +49,7 @@
 import org.tailormap.api.persistence.json.GeoServiceLayerSettings;
 import org.tailormap.api.persistence.json.ServicePublishingSettings;
 import org.tailormap.api.persistence.json.TileLayerHiDpiMode;
+import org.tailormap.api.persistence.json.WMSStyle;
 import org.tailormap.api.repository.ApplicationRepository;
 import org.tailormap.api.repository.ConfigurationRepository;
 import org.tailormap.api.repository.FeatureSourceRepository;
@@ -191,6 +193,23 @@ private String getLegendProxyUrl(Application application, AppTreeLayerNode appTr
         + "/" + LEGEND.getValue();
   }
 
+  private List<WMSStyle> getProxiedLegendStyles(
+      Application application, AppTreeLayerNode appTreeLayerNode, List<WMSStyle> legendStyles) {
+    String legendProxyUrl = getLegendProxyUrl(application, appTreeLayerNode);
+    return legendStyles.stream()
+        .map(style ->
+            // Create a copy of the style so we don't mutate configuration objects
+            new WMSStyle(
+                style.getName(),
+                style.getTitle(),
+                style.getAbstractText(),
+                UriComponentsBuilder.fromUriString(legendProxyUrl)
+                    .queryParam("STYLE", style.getName())
+                    .build(true)
+                    .toUri()))
+        .toList();
+  }
+
   private class MapResponseLayerBuilder {
     private final Application app;
     private final MapResponse mapResponse;
@@ -404,6 +423,13 @@ private boolean addAppLayerItem(AppTreeLayerNode layerRef) {
         }
       }
 
+      List<WMSStyle> legendStyles = appLayerSettings.getSelectedStyles();
+      if (proxied && legendStyles != null) {
+        // when proxied the urls must be passed through getProxiedLegendStyles to be accessible,
+        // so don't pass the original style URLs to the frontend
+        legendStyles = getProxiedLegendStyles(app, layerRef, legendStyles);
+      }
+
       SearchIndex searchIndex = null;
       if (appLayerSettings.getSearchIndexId() != null) {
         searchIndex = searchIndexRepository
@@ -450,7 +476,7 @@ private boolean addAppLayerItem(AppTreeLayerNode layerRef) {
           .webMercatorAvailable(webMercatorAvailable)
           .tileset3dStyle(appLayerSettings.getTileset3dStyle())
           .hiddenFunctionality(appLayerSettings.getHiddenFunctionality())
-          .styles(appLayerSettings.getSelectedStyles()));
+          .styles(legendStyles));
 
       return true;
     }

src/test/java/org/tailormap/api/controller/ViewerControllerIntegrationTest.java

@@ -6,6 +6,7 @@
 package org.tailormap.api.controller;
 
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
@@ -110,22 +111,13 @@ void should_contain_proxy_url() throws Exception {
                     contains(
                         endsWith(
                             "/app/default/layer/lyr%3Apdok-kadaster-bestuurlijkegebieden%3AProvinciegebied/proxy/wms"))))
-
-    // Backend does not save legendImageUrl from capabilities, and therefore also does not
-    // replace it with a proxied version. Frontend will use normal URL to create standard WMS
-    // GetLegendGraphic request, which usually works fine
-    // Old 10.0 code:
-    // https://github.com/Tailormap/tailormap-api/blob/tailormap-api-10.0.0/src/main/java/nl/b3p/tailormap/api/controller/MapController.java#L440
-    //        .andExpect(
-    //            jsonPath("$.appLayers[?(@.id ===
-    // 'lyr:pdok-kadaster-bestuurlijkegebieden:Provinciegebied')].legendImageUrl")
-    //                .value(
-    //                    contains(
-    //                        allOf(
-    //
-    // containsString("/app/default/layer/lyr%3Apdok-kadaster-bestuurlijkegebieden%3AProvinciegebied/proxy/wms"),
-    //                            containsString("request=GetLegendGraphic")))))
-    ;
+        .andExpect(
+            jsonPath(
+                    "$.appLayers[?(@.id === 'lyr:pdok-kadaster-bestuurlijkegebieden:Provinciegebied')].legendImageUrl")
+                .value(
+                    contains(
+                        containsString(
+                            "/app/default/layer/lyr%3Apdok-kadaster-bestuurlijkegebieden%3AProvinciegebied/proxy/legend"))));
   }
 
   @Test
@@ -156,7 +148,18 @@ void should_contain_proxied_secured_service_layer_with_styles() throws Exception
             .value("purple_polygon"))
         .andExpect(jsonPath(
                 "$.appLayers[?(@.id === 'lyr:snapshot-geoserver-proxied:postgis:begroeidterreindeel')].styles[0].name")
-            .value("purple_polygon"));
+            .value("purple_polygon"))
+        .andExpect(
+            jsonPath(
+                    "$.appLayers[?(@.id === 'lyr:snapshot-geoserver-proxied:postgis:begroeidterreindeel')].styles[0].legendUrl")
+                .value(
+                    // Need to use (extra) contains() because jsonPath() returns an array even when
+                    // the expression resolves to a single scalar property
+                    // see
+                    // https://github.com/authorjapps/zerocode/wiki/When-JSON-Path-Matching-returns-value-or-values-as-an-array
+                    contains(
+                        containsString(
+                            "/app/secured/layer/lyr%3Asnapshot-geoserver-proxied%3Apostgis%3Abegroeidterreindeel/proxy/legend?STYLE=purple_polygon"))));
   }
 
   @Test