EPMRPP-90122 || It's not possible to configure any OAuth provider if …

…ReportPortal deployed under path (#317)
reportportal · Jul 5, 2024 · 7477c9d · 7477c9d
1 parent ea5e31b
commit 7477c9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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> 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
@@ -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