Merge pull request #4418 from yakyouk/f/dialog-token-update

fix permission token update, use dialog adapter token for kick
Hubs-Foundation · Sep 28, 2021 · 2077c3f · 2077c3f
2 parents bd61583 + db11e3a
commit 2077c3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/naf-dialog-adapter.js b/src/naf-dialog-adapter.js
@@ -944,12 +944,12 @@ export class DialogAdapter extends EventEmitter {
     }
   }
 
-  kick(clientId, permsToken) {
+  kick(clientId) {
     return this._protoo
       .request("kick", {
         room_id: this.room,
         user_id: clientId,
-        token: permsToken
+        token: this._joinToken
       })
       .then(() => {
         document.body.dispatchEvent(new CustomEvent("kicked", { detail: { clientId: clientId } }));

diff --git a/src/utils/hub-channel.js b/src/utils/hub-channel.js
@@ -150,10 +150,7 @@ export default class HubChannel extends EventTarget {
     if (this.fetchPermissionsTimeout) {
       clearTimeout(this.fetchPermissionsTimeout);
     }
-    this.fetchPermissionsTimeout = setTimeout(async () => {
-      const result = await this.fetchPermissions();
-      this.dispatchEvent(new CustomEvent("permissions-refreshed", { detail: result }));
-    }, nextRefresh);
+    this.fetchPermissionsTimeout = setTimeout(this.fetchPermissions, nextRefresh);
   };
 
   sendEnteringEvent = async () => {
@@ -430,8 +427,7 @@ export default class HubChannel extends EventTarget {
   isHidden = sessionId => this._blockedSessionIds.has(sessionId);
 
   kick = async sessionId => {
-    const permsToken = await this.fetchPermissions();
-    APP.dialog.kick(sessionId, permsToken);
+    APP.dialog.kick(sessionId);
     this.channel.push("kick", { session_id: sessionId });
   };