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);

src/main/resources/application-local.properties

@@ -1 +1 @@
-api.baseUrl=http://localhost:8080
+api.corsResolveUrl=http://localhost:8080

src/main/resources/application-prod.properties

@@ -1 +1 @@
-api.baseUrl=https://cftunnels.hithomelabs.com
+api.corsResolveUrl=https://cftunnels.hithomelabs.com

src/main/resources/application-test.properties

@@ -1 +1 @@
-api.baseUrl=https://testcf.hithomelabs.com
+api.corsResolveUrl=https://testcf.hithomelabs.com

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/