From 0fc79ff9ba3c524ab93380562e90d0d6b0f1377a Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Tue, 29 Jul 2025 12:12:16 +0100
Subject: [PATCH] change configs

---
 .github/workflows/PR-Auto-Deploy-V2.yml          |  1 +
 .github/workflows/deploy-on-v2-commit.yml        |  1 +
 .../software/SPDF/config/OpenApiConfig.java      | 16 +++++++++++++---
 docker/frontend/nginx.conf                       |  6 +++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/PR-Auto-Deploy-V2.yml b/.github/workflows/PR-Auto-Deploy-V2.yml
index a8f971d53..c8fabfd59 100644
--- a/.github/workflows/PR-Auto-Deploy-V2.yml
+++ b/.github/workflows/PR-Auto-Deploy-V2.yml
@@ -317,6 +317,7 @@ jobs:
                 SYSTEM_MAXFILESIZE: "100"
                 METRICS_ENABLED: "true"
                 SYSTEM_GOOGLEVISIBILITY: "false"
+                SWAGGER_SERVER_URL: "http://${{ secrets.VPS_HOST }}:${V2_PORT}"
               restart: on-failure:5
               
             stirling-pdf-v2-frontend:
diff --git a/.github/workflows/deploy-on-v2-commit.yml b/.github/workflows/deploy-on-v2-commit.yml
index eb12d5cd9..d5e3a7b16 100644
--- a/.github/workflows/deploy-on-v2-commit.yml
+++ b/.github/workflows/deploy-on-v2-commit.yml
@@ -147,6 +147,7 @@ jobs:
                 SYSTEM_MAXFILESIZE: "100"
                 METRICS_ENABLED: "true"
                 SYSTEM_GOOGLEVISIBILITY: "false"
+                SWAGGER_SERVER_URL: "http://${{ secrets.VPS_HOST }}:3000"
               restart: on-failure:5
       
             frontend:
diff --git a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
index 78d2a3d2b..1a5635baa 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
@@ -10,6 +10,7 @@ import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
 
 import lombok.RequiredArgsConstructor;
 
@@ -50,17 +51,26 @@ public class OpenApiConfig {
                                         .url("https://www.stirlingpdf.com")
                                         .email("contact@stirlingpdf.com"))
                         .description(DEFAULT_DESCRIPTION);
+
+        OpenAPI openAPI = new OpenAPI().info(info);
+        
+        // Add server configuration from environment variable
+        String swaggerServerUrl = System.getenv("SWAGGER_SERVER_URL");
+        if (swaggerServerUrl != null && !swaggerServerUrl.trim().isEmpty()) {
+            Server server = new Server().url(swaggerServerUrl).description("API Server");
+            openAPI.addServersItem(server);
+        }
+        
         if (!applicationProperties.getSecurity().getEnableLogin()) {
-            return new OpenAPI().components(new Components()).info(info);
+            return openAPI.components(new Components());
         } else {
             SecurityScheme apiKeyScheme =
                     new SecurityScheme()
                             .type(SecurityScheme.Type.APIKEY)
                             .in(SecurityScheme.In.HEADER)
                             .name("X-API-KEY");
-            return new OpenAPI()
+            return openAPI
                     .components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
-                    .info(info)
                     .addSecurityItem(new SecurityRequirement().addList("apiKey"));
         }
     }
diff --git a/docker/frontend/nginx.conf b/docker/frontend/nginx.conf
index b1e5966fd..af4ca85f2 100644
--- a/docker/frontend/nginx.conf
+++ b/docker/frontend/nginx.conf
@@ -26,9 +26,9 @@ http {
             try_files $uri $uri/ /index.html;
         }
 
-        # Proxy API calls to backend (with query parameters and sub-paths)
-        location ~ ^/api(.*)$ {
-            proxy_pass ${VITE_API_BASE_URL}/api$1;
+        # Proxy API calls to backend
+        location /api/ {
+            proxy_pass ${VITE_API_BASE_URL}/api/;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;