[openmeetings] branch master updated: [OPENMEETINGS-2509] web session is invalidated on exit

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new db7be4b  [OPENMEETINGS-2509] web session is invalidated on exit
db7be4b is described below

commit db7be4b39a50a48908799c830ae7d42af34e0457
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Nov 9 21:33:45 2020 +0700

    [OPENMEETINGS-2509] web session is invalidated on exit
---
 .../src/main/java/org/apache/openmeetings/web/app/WebSession.java       | 2 +-
 .../main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java  | 1 +
 .../src/main/java/org/apache/openmeetings/web/room/raw-settings.js      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 9197201..0228a2a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -149,7 +149,7 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
                cm.invalidate(userId, getId());
                super.invalidate();
                userId = null;
-               rights = 
Collections.unmodifiableSet(Collections.<Right>emptySet());
+               rights = Set.of();
                iso8601Format = null;
                sdf = null;
                languageId = -1;
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 87cc23d..e242717 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -260,6 +260,7 @@ public class RoomMenuPanel extends Panel {
                                
room.getMainPanel().updateContents(ROOMS_PUBLIC, handler);
                        }
                } else {
+                       WebSession.get().invalidate();
                        String url = 
cfgDao.getString(CONFIG_REDIRECT_URL_FOR_EXTERNAL, "");
                        throw new RedirectToUrlException(Strings.isEmpty(url) ? 
getBaseUrl() : url);
                }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 3ff9a23..dfd5420 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -205,7 +205,7 @@ var VideoSettings = (function() {
                        _close();
                        vs.modal("hide");
                });
-               vs.off().on('hidden.bs.modal', function (e) {
+               vs.off().on('hidden.bs.modal', function () {
                        _close();
                });
                o.width = 300;