Hithomelabs/CFTunnels
5
0
Fork 3
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to avoid clash with baseUrl variable #61

Merged
hitanshu merged 1 commits from hitanshu/CFTunnels:oidc into test 2025-09-14 20:32:04 +00:00
Conversation 0 Commits 1 Files Changed 5 +7 -7
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e46974870a - Show all commits

6
src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java
View File

@ -11,12 +11,12 @@ import java.util.ArrayList;
@Configuration @Configuration
public class OpenApiConfig { public class OpenApiConfig {
@Value("${api.baseUrl}") @Value("${api.corsResolveUrl}")
private String baseUrl; private String corsResolveUrl;
@Bean @Bean
public OpenAPI openAPI(){ public OpenAPI openAPI(){
Server httpsServer = new Server().url(baseUrl); Server httpsServer = new Server().url(corsResolveUrl);
OpenAPI openApi = new OpenAPI(); OpenAPI openApi = new OpenAPI();
ArrayList<Server> servers = new ArrayList<>(); ArrayList<Server> servers = new ArrayList<>();
servers.add(httpsServer); servers.add(httpsServer);

2
src/main/resources/application-local.properties
View File

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

2
src/main/resources/application-prod.properties
View File

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

2
src/main/resources/application-test.properties
View File

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

2
src/main/resources/application.properties
View File

@ -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-id=${OAUTH_CLIENT_ID}
spring.security.oauth2.client.registration.cftunnels.client-secret=${OAUTH_CLIENT_SECRET} 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.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.registration.cftunnels.scope=openid,profile,email,offline_access,cftunnels
spring.security.oauth2.client.provider.cftunnels.authorization-uri=https://auth.hithomelabs.com/application/o/authorize/ spring.security.oauth2.client.provider.cftunnels.authorization-uri=https://auth.hithomelabs.com/application/o/authorize/