fixup! SONAR-7590 Redirect to requested page with identity provider

server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2ContextFactory.java

@@ -115,7 +115,7 @@ public class OAuth2ContextFactory {
     public void redirectToRequestedPage() {
       try {
         Optional<String> redirectTo = oAuthRedirection.getAndDelete(request, response);
-        getResponse().sendRedirect(server.getContextPath() + redirectTo.orElse("/"));
+        getResponse().sendRedirect(redirectTo.orElse(server.getContextPath() + "/"));
       } catch (IOException e) {
         throw new IllegalStateException("Fail to redirect to home", e);
       }

server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2Redirection.java

@@ -31,6 +31,11 @@ import static org.sonar.server.authentication.Cookies.newCookieBuilder;
 public class OAuth2Redirection {
 
   private static final String REDIRECT_TO_COOKIE = "REDIRECT_TO";
+
+  /**
+   * The HTTP parameter that contains the path where the user should be redirect to.
+   * Please note that the web context is included.
+   */
   private static final String RETURN_TO_PARAMETER = "return_to";
 
   public void create(HttpServletRequest request, HttpServletResponse response) {

server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java

@@ -179,9 +179,9 @@ public class OAuth2ContextFactoryTest {
   }
 
   @Test
-  public void redirect_to_requested_page_context() throws Exception {
-    when(oAuthRedirection.getAndDelete(request, response)).thenReturn(Optional.of("/settings"));
-    when(server.getContextPath()).thenReturn("/sonarqube");
+  public void redirect_to_requested_page_doesnt_need_context() throws Exception {
+    when(oAuthRedirection.getAndDelete(request, response)).thenReturn(Optional.of("/sonarqube/settings"));
+    when(server.getContextPath()).thenReturn("/other");
     OAuth2IdentityProvider.CallbackContext callback = newCallbackContext();
 
     callback.redirectToRequestedPage();