From 2ade063630c06c7b5b93c4ae224e4e7567f2a18a Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 7 Oct 2021 17:02:51 +0300
Subject: [PATCH] CB-960 Multiple auth providers logins in config mode must
 reset previous token

---
 .../io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
index a2edf29b96..745ad6a426 100644
--- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
+++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
@@ -108,6 +108,10 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
             String userId;
             DBASession authSession;
             if (configMode) {
+                if (webSession.getUser() != null) {
+                    // Already logged in - remove auth token
+                    webSession.removeAuthInfo(providerId);
+                }
                 if (authProviderExternal != null) {
                     userId = authProviderExternal.validateLocalAuth(
                         webSession.getProgressMonitor(),