fix: reverse proxy url fix

spring-cloud · Apr 3, 2024 · 7feba18 · 7feba18
1 parent 21825fa
commit 7feba18
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/ui/src/app/shared/api/task.service.ts b/ui/src/app/shared/api/task.service.ts
@@ -264,7 +264,7 @@ export class TaskService {
           `tasks/logs/${taskExecution.externalExecutionId}?platformName=${platformName}&schemaTarget=${taskExecution.schemaTarget}`;
     const params = new HttpParams({encoder: new DataflowEncoder()});
     return this.httpClient
-      .get<any>(url, {
+      .get<any>(UrlUtilities.fixReverseProxyUrl(url), {
         headers,
         params
       })

diff --git a/ui/src/app/url-utilities.service.ts b/ui/src/app/url-utilities.service.ts
@@ -24,4 +24,17 @@ export class UrlUtilities {
     path += path.endsWith('/') ? '' : '/';
     return path;
   }
+
+  public static fixReverseProxyUrl(url: string) {
+    try {
+      const urlToFix: URL = new URL(url);
+      const baseUrl: URL = new URL(window.location.href);
+      urlToFix.host = baseUrl.host;
+      urlToFix.protocol = baseUrl.protocol;
+      urlToFix.port = baseUrl.port;
+      return urlToFix.href;
+    } catch (_) {
+      return url;
+    }
+  }
 }