From 7f5f7510ea2cf0609e04bcbac48c409b54410aa5 Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <alexandr.skoblikov@jkiss.org>
Date: Tue, 31 May 2022 14:47:35 +0300
Subject: [PATCH] CB-1607 add empty hash to redirect url on autologin (#877)

---
 .../src/io/cloudbeaver/server/servlets/CBStaticServlet.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java
index 7415942bc9..1c0cd6311a 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java
@@ -102,6 +102,10 @@ public class CBStaticServlet extends DefaultServlet {
                         WebSession webSession = CBPlatform.getInstance().getSessionManager().getWebSession(request, response, false);
                         if (webSession.getUser() == null) {
                             String signInLink = ((SMWAuthProviderFederated) authProviderInstance).getSignInLink(configId, Collections.emptyMap());
+                            //ignore current routing if non-root page is open
+                            if (!signInLink.endsWith("#")) {
+                                signInLink += "#";
+                            }
                             if (!CommonUtils.isEmpty(signInLink)) {
                                 // Redirect to it
                                 request.getSession().setAttribute(DBWConstants.STATE_ATTR_SIGN_IN_STATE, DBWConstants.SignInState.GLOBAL);