Fix doubled client basePath by SpringAddonsServerOAuth2AuthorizationR…

…equestResolver
ch4mpy · Jan 30, 2024 · 2cfd248 · 2cfd248
1 parent 02fded0
commit 2cfd248
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/...ty/oidc/starter/reactive/client/SpringAddonsServerOAuth2AuthorizationRequestResolver.java b/...ty/oidc/starter/reactive/client/SpringAddonsServerOAuth2AuthorizationRequestResolver.java
@@ -22,6 +22,7 @@
 import com.c4_soft.springaddons.security.oidc.starter.properties.SpringAddonsOidcClientProperties;
 import com.c4_soft.springaddons.security.oidc.starter.properties.SpringAddonsOidcClientProperties.RequestParam;
 
+import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
 /**
@@ -45,6 +46,7 @@
  * @see    SpringAddonsOauth2ServerAuthenticationSuccessHandler
  * @see    SpringAddonsOauth2ServerAuthenticationFailureHandler
  */
+@Slf4j
 public class SpringAddonsServerOAuth2AuthorizationRequestResolver extends DefaultServerOAuth2AuthorizationRequestResolver {
 
 	private static final Pattern authorizationRequestPattern = Pattern.compile("\\/oauth2\\/authorization\\/([^\\/]+)");
@@ -96,15 +98,10 @@ private OAuth2AuthorizationRequest postProcess(OAuth2AuthorizationRequest reques
 				UriComponentsBuilder.fromUri(clientUri).path(original.getPath()).query(original.getQuery()).fragment(original.getFragment()).build().toString();
 		modified.redirectUri(redirectUri);
 
+		log.debug("Changed OAuth2AuthorizationRequest redirectUri from {} to {}", original, redirectUri);
 		return modified.build();
 	}
 
-	@Override
-	public Mono<OAuth2AuthorizationRequest> resolve(ServerWebExchange exchange) {
-		setAuthorizationRequestCustomizer(authRequestCustomizer(exchange));
-		return savePostLoginUrisInSession(exchange).then(super.resolve(exchange).map(this::postProcess));
-	}
-
 	@Override
 	public Mono<OAuth2AuthorizationRequest> resolve(ServerWebExchange exchange, String clientRegistrationId) {
 		setAuthorizationRequestCustomizer(authRequestCustomizer(clientRegistrationId));