From 7477c9dc2daa7245645990ee0a7b43078dbd1caf Mon Sep 17 00:00:00 2001 From: APiankouski <109206864+APiankouski@users.noreply.github.com> Date: Fri, 5 Jul 2024 09:39:55 +0300 Subject: [PATCH] EPMRPP-90122 || It's not possible to configure any OAuth provider if ReportPortal deployed under path (#317) --- .../java/com/epam/reportportal/auth/AuthSuccessHandler.java | 6 +++++- .../reportportal/auth/config/SpringDocConfiguration.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/epam/reportportal/auth/AuthSuccessHandler.java b/src/main/java/com/epam/reportportal/auth/AuthSuccessHandler.java index 862f90b5..4005704b 100644 --- a/src/main/java/com/epam/reportportal/auth/AuthSuccessHandler.java +++ b/src/main/java/com/epam/reportportal/auth/AuthSuccessHandler.java @@ -22,6 +22,7 @@ import javax.inject.Provider; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.security.core.Authentication; @@ -42,6 +43,9 @@ public abstract class AuthSuccessHandler extends SimpleUrlAuthenticationSuccessH private ApplicationEventPublisher eventPublisher; + @Value("${server.servlet.context-path:/uat}") + private String pathValue; + public AuthSuccessHandler(Provider tokenServicesFacade, ApplicationEventPublisher eventPublisher) { super("/"); @@ -58,7 +62,7 @@ protected void handle(HttpServletRequest request, HttpServletResponse response, query.add("token", token.getValue()); query.add("token_type", token.getTokenType()); URI rqUrl = UriComponentsBuilder.fromHttpRequest(new ServletServerHttpRequest(request)) - .replacePath("/ui/authSuccess") + .replacePath(pathValue.replaceFirst("/uat", "") + "/ui/authSuccess") .replaceQueryParams(query) .build() .toUri(); diff --git a/src/main/java/com/epam/reportportal/auth/config/SpringDocConfiguration.java b/src/main/java/com/epam/reportportal/auth/config/SpringDocConfiguration.java index e04302a6..5ef75079 100644 --- a/src/main/java/com/epam/reportportal/auth/config/SpringDocConfiguration.java +++ b/src/main/java/com/epam/reportportal/auth/config/SpringDocConfiguration.java @@ -66,7 +66,7 @@ public class SpringDocConfiguration { @Value("${info.build.version}") private String buildVersion; - @Value("${server.servlet.context-path:/api}") + @Value("${server.servlet.context-path:/uat}") private String pathValue; @Bean