From 143f8217ddebc80d90769b002eddc25006c0c2af Mon Sep 17 00:00:00 2001
From: Dimitris ZARRAS <138439389+dzarras@users.noreply.github.com>
Date: Mon, 20 Nov 2023 12:33:45 +0200
Subject: [PATCH] Consider spring.webflux.base-path in default value for
 issuer.publicUrl (#32)

---
 src/main/resources/application-prod.properties | 3 ++-
 src/main/resources/application.properties      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 8cd61ecf..b0831157 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -5,12 +5,13 @@ logging.level.org.springframework.boot.actuate.endpoint.web=DEBUG
 management.endpoints.enabled-by-default=true
 server.error.includeStacktrace=ALWAYS
 server.port=8080
+spring.webflux.base-path=/
 
 #
 # Issuer options
 #
 issuer.clientId=pid-issuer
-issuer.publicUrl=http://localhost:${server.port}
+issuer.publicUrl=http://localhost:${server.port}${spring.webflux.base-path}
 issuer.authorizationServer=https://keycloak-eudi.netcompany-intrasoft.com/realms/pid-issuer-realm
 issuer.authorizationServer.introspection=${issuer.authorizationServer}/protocol/openid-connect/token/introspect
 issuer.authorizationServer.userinfo=${issuer.authorizationServer}/protocol/openid-connect/userinfo
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a6abdf33..bfa5111c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,12 +5,13 @@ logging.level.org.springframework.boot.actuate.endpoint.web=DEBUG
 management.endpoints.enabled-by-default=true
 server.error.includeStacktrace=ALWAYS
 server.port=8080
+spring.webflux.base-path=/
 
 #
 # Issuer options
 #
 issuer.clientId=pid-issuer
-issuer.publicUrl=http://localhost:${server.port}
+issuer.publicUrl=http://localhost:${server.port}${spring.webflux.base-path}
 issuer.authorizationServer=https://localhost/idp/realms/pid-issuer-realm
 issuer.authorizationServer.introspection=${issuer.authorizationServer}/protocol/openid-connect/token/introspect
 issuer.authorizationServer.userinfo=${issuer.authorizationServer}/protocol/openid-connect/userinfo