From e46974870a00aa41022ade71a76811636186bd39 Mon Sep 17 00:00:00 2001
From: hitanshu310 <hitanshu98@gmail.com>
Date: Mon, 15 Sep 2025 01:57:34 +0530
Subject: [PATCH] Trying to avoid clash with baseUrl variable

---
 .../com/hithomelabs/CFTunnels/Config/OpenApiConfig.java     | 6 +++---
 src/main/resources/application-local.properties             | 2 +-
 src/main/resources/application-prod.properties              | 2 +-
 src/main/resources/application-test.properties              | 2 +-
 src/main/resources/application.properties                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java b/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java
index e24e6f5..ef3b098 100644
--- a/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java
+++ b/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java
@@ -11,12 +11,12 @@ import java.util.ArrayList;
 @Configuration
 public class OpenApiConfig {
 
-    @Value("${api.baseUrl}")
-    private String baseUrl;
+    @Value("${api.corsResolveUrl}")
+    private String corsResolveUrl;
 
     @Bean
     public OpenAPI openAPI(){
-        Server httpsServer = new Server().url(baseUrl);
+        Server httpsServer = new Server().url(corsResolveUrl);
         OpenAPI openApi = new OpenAPI();
         ArrayList<Server> servers = new ArrayList<>();
         servers.add(httpsServer);
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index fdb25ce..9001ed2 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -1 +1 @@
-api.baseUrl=http://localhost:8080
\ No newline at end of file
+api.corsResolveUrl=http://localhost:8080
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index dec0f4b..5126249 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -1 +1 @@
-api.baseUrl=https://cftunnels.hithomelabs.com
\ No newline at end of file
+api.corsResolveUrl=https://cftunnels.hithomelabs.com
\ No newline at end of file
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index e5c014b..1ea328b 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -1 +1 @@
-api.baseUrl=https://testcf.hithomelabs.com
\ No newline at end of file
+api.corsResolveUrl=https://testcf.hithomelabs.com
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1b13697..3ba3827 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -7,7 +7,7 @@ spring.profiles.active=${ENV}
 spring.security.oauth2.client.registration.cftunnels.client-id=${OAUTH_CLIENT_ID}
 spring.security.oauth2.client.registration.cftunnels.client-secret=${OAUTH_CLIENT_SECRET}
 spring.security.oauth2.client.registration.cftunnels.authorization-grant-type=authorization_code
-spring.security.oauth2.client.registration.cftunnels.redirect-uri=http://localhost:8080/login/oauth2/code/cftunnels
+spring.security.oauth2.client.registration.cftunnels.redirect-uri={baseUrl}/login/oauth2/code/cftunnels
 spring.security.oauth2.client.registration.cftunnels.scope=openid,profile,email,offline_access,cftunnels
 
 spring.security.oauth2.client.provider.cftunnels.authorization-uri=https://auth.hithomelabs.com/application/o/authorize/