From c4c0cab8caa7fd66569edd056a97a390a2564b24 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 23 Sep 2020 21:01:17 +0300
Subject: [PATCH] Session permissions refresh after server reconfig

---
 .../src/io/cloudbeaver/model/session/WebSession.java         | 5 +++++
 .../io/cloudbeaver/service/admin/impl/WebServiceAdmin.java   | 2 ++
 2 files changed, 7 insertions(+)

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 1a6d8130f6..a4698bc0ac 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
@@ -171,6 +171,11 @@ public class WebSession implements DBASession {
         if (CommonUtils.equalObjects(this.user, user)) {
             return;
         }
+        forceUserRefresh(user);
+    }
+
+    // Note: for admin use only
+    public void forceUserRefresh(WebUser user) {
         this.user = user;
 
         refreshSessionAuth();
diff --git a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
index c9a0c04fd2..e6c90310f9 100644
--- a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+++ b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
@@ -308,6 +308,8 @@ public class WebServiceAdmin implements DBWServiceAdmin {
                 config.getAdminName(),
                 config.getAdminPassword(),
                 appConfig);
+            // Refresh active session
+            webSession.forceUserRefresh(null);
         } catch (Throwable e) {
             throw new DBWebException("Error configuring server", e);
         }