Merge pull request #1073 from geoadmin/bugfix-PB-1017-unproxify-print…

…-jobs

PB-1017: un-proxy external graphics in print specs

src/api/file-proxy.api.js

@@ -56,3 +56,15 @@ export function proxifyUrl(url) {
     }
     return `${getServiceProxyBaseUrl()}${fileAsPath}`
 }
+
+export function unProxifyUrl(proxified_url) {
+    if (
+        (typeof proxified_url === 'string' || proxified_url instanceof String) &&
+        proxified_url.startsWith(getServiceProxyBaseUrl())
+    ) {
+        let url = proxified_url.replace(getServiceProxyBaseUrl(), '')
+        return `${url.split('/')[0]}://${decodeURIComponent(url.split('/')[1])}`
+    }
+
+    return proxified_url
+}

src/api/print.api.js

@@ -8,6 +8,7 @@ import {
 import axios from 'axios'
 import { Circle } from 'ol/style'
 
+import { unProxifyUrl } from '@/api/file-proxy.api'
 import {
     getApi3BaseUrl,
     getViewerDedicatedServicesBaseUrl,
@@ -116,6 +117,9 @@ class GeoAdminCustomizer extends BaseCustomizer {
         if (symbolizer.externalGraphic) {
             size = image.getSize()
             anchor = image.getAnchor()
+            // service print can't handle a proxied url, so we ensure we're
+            // giving the original url for the print job.
+            symbolizer.externalGraphic = unProxifyUrl(symbolizer.externalGraphic)
         } else if (image instanceof Circle) {
             const radius = image.getRadius()
             const width = adjustWidth(2 * radius, this.printResolution)