From 9b8940aeb7ecb9538049ae481e5f124ee015ab2d Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 4 Feb 2022 10:31:50 +0300
Subject: [PATCH] CB-1580 Federated auth redesign

---
 .../cloudbeaver/model/session/WebSession.java | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
index 0122945aba..a0abcd75e1 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
@@ -235,14 +235,6 @@ public class WebSession implements DBASession, DBAAuthCredentialsProvider, IAdap
         refreshSessionAuth();
 
         initNavigatorModel();
-
-        for (WebSessionHandlerDescriptor hd : WebHandlerRegistry.getInstance().getSessionHandlers()) {
-            try {
-                hd.getInstance().handleSessionAuth(this);
-            } catch (Exception e) {
-                log.error("Error calling session handler '" + hd.getId() + "'", e);
-            }
-        }
     }
 
     private void initNavigatorModel() {
@@ -767,6 +759,19 @@ public class WebSession implements DBASession, DBAAuthCredentialsProvider, IAdap
         synchronized (authTokens) {
             Collections.addAll(authTokens, tokens);
         }
+
+        notifySessionAuthChange();
+    }
+
+    public void notifySessionAuthChange() {
+        // Notify handlers about auth change
+        for (WebSessionHandlerDescriptor hd : WebHandlerRegistry.getInstance().getSessionHandlers()) {
+            try {
+                hd.getInstance().handleSessionAuth(this);
+            } catch (Exception e) {
+                log.error("Error calling session handler '" + hd.getId() + "'", e);
+            }
+        }
     }
 
     private void removeAuthInfo(WebAuthInfo oldAuthInfo) {