reverted swagger backend baseURL change and instead fix frontend swag…

…ger client
max-bytes · May 21, 2024 · 6ae619d · 6ae619d
1 parent 0bbcf48
commit 6ae619d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/backend/Omnikeeper/Startup/Startup.cs b/backend/Omnikeeper/Startup/Startup.cs
@@ -418,7 +418,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IHostApp
 
             app.UseSwagger(c =>
             {
-                c.RouteTemplate = $"{Configuration["BaseURL"]}/swagger/{{documentName}}/swagger.json";
+                c.RouteTemplate = "swagger/{documentName}/swagger.json";
                 // TODO: still needed? breaks swagger behind (certain) revery proxies, if commented in
                 //c.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
                 //{

diff --git a/frontend/core/src/utils/useSwaggerClient.js b/frontend/core/src/utils/useSwaggerClient.js
@@ -19,6 +19,14 @@ export default function useSwaggerClient() {
                     oauth2: { token: { access_token: token } },
                 }
             }).then(d => {
+
+                // NOTE: we set the servers array explicitly, because - depending on the backend config and overall config (proxy, ...) - we cannot rely on the default set by swagger.json
+                d.spec.servers = [
+                    {
+                        "url": `${env('BACKEND_URL')}`
+                    }
+                ]
+
                 setSwaggerClient(d);
                 setLoading(false);
             }).catch(e => {