provide CHATRIX_LOCAL_STORAGE_KEY for storing sessions removing session cleanup responsibility outside of chatrix

Author: ashfame

src/main.ts

@@ -47,8 +47,8 @@ function getLoginToken(): string | null {
     return new URLSearchParams(window.location.search).get("loginToken");
 }
 
-function getBackendUserId(): string | null {
-    return new URLSearchParams(window.location.search).get("backendUserId");
+function getLocalStorageKey(): string | null {
+    return new URLSearchParams(window.location.search).get("localStorageKey");
 }
 
 async function main() {
@@ -60,8 +60,8 @@ async function main() {
     root.className = "hydrogen";
     const config = await fetchConfig();
 
-    const backendUserId = getBackendUserId();
-    const platform = new ChatrixPlatform({container: root, assetPaths, config: {}, options: { development: import.meta.env.DEV }}, config.instance_id, backendUserId);
+    const localStorageKey = getLocalStorageKey();
+    const platform = new ChatrixPlatform({container: root, assetPaths, config: {}, options: { development: import.meta.env.DEV }}, localStorageKey);
     attachLogExportToWindow(platform);
     const navigation = new Navigation(allowsChild);
     platform.setNavigation(navigation);

src/parent/load.ts

@@ -73,15 +73,15 @@ function loadIframe(minimized = false) {
         throw new Error("CHATRIX_CONFIG_LOCATION is not set");
     }
 
-    const backendUserId = (window as any).CHATRIX_BACKEND_USER_ID || null;
+    const localStorageKey = (window as any).CHATRIX_LOCAL_STORAGE_KEY || null;
 
     const urlParams = new URLSearchParams(window.location.search);
     const loginToken = urlParams.get("loginToken");
     urlParams.delete("loginToken");
     window.history.replaceState( null, '', (urlParams.entries.length ? '?' + urlParams : './' ) + location.hash );
 
     iframe.src = new URL(
-        `${htmlLocation}?config=${configLocation}${minimized? "&minimized=true": ""}${loginToken? "&loginToken="+encodeURIComponent(loginToken): ""}${backendUserId? "&backendUserId="+encodeURIComponent(backendUserId): ""}`,
+        `${htmlLocation}?config=${configLocation}${minimized? "&minimized=true": ""}${loginToken? "&loginToken="+encodeURIComponent(loginToken): ""}${localStorageKey? "&localStorageKey="+encodeURIComponent(localStorageKey): ""}`,
         hostRoot
     ).href;
     iframe.className = "chatrix-iframe";

src/platform/ChatrixPlatform.ts

@@ -18,40 +18,9 @@ import { Platform } from "hydrogen-view-sdk";
 import { SessionInfoStorage } from "./SessionInfoStorage";
 
 export class ChatrixPlatform extends Platform {
-    constructor(options, instanceId: string | null, backendUserId: string | null) {
+    constructor(options, localStorageKey: string) {
         super(options);
-        let sessionPrefix = "hydrogen_sessions_v1";
-        let sessionName = sessionPrefix;
-        if (instanceId && instanceId !== "") {
-            sessionName = `${sessionName}_${instanceId}`;
-        }
-        if (backendUserId && backendUserId !== "") {
-            sessionName = `${sessionName}_${backendUserId}`;
-            this.cleanupSessions(sessionPrefix,backendUserId);
-        }
-
-        this.sessionInfoStorage = new SessionInfoStorage(sessionName);
-    }
-
-    cleanupSessions(sessionPrefix: string, backendUserId: string) {
-        for (let i=0; i<localStorage.length; i++) {
-            let key = localStorage.key(i);
-            if (!key.startsWith(sessionPrefix) || key.endsWith(backendUserId)) {
-                continue;
-            }
-            this.invalidateSession(
-                JSON.parse(localStorage.getItem(key))[0]
-            );
-            localStorage.removeItem(key);
-        }
-    }
-
-    async invalidateSession(session: {[key: string]: string}) {
-        await fetch(session.homeserver + '/_matrix/client/v3/logout', {
-            method: 'POST',
-            headers: {
-                'Authorization': 'Bearer ' + session.accessToken,
-            },
-        });
+        localStorageKey = localStorageKey ?? "hydrogen_sessions_v1";
+        this.sessionInfoStorage = new SessionInfoStorage(localStorageKey);
     }
 }

wordpress/chatrix/src/plugin.php

@@ -2,6 +2,8 @@
 
 namespace Automattic\Chatrix;
 
+const LOCAL_STORAGE_KEY_PREFIX = 'hydrogen_sessions_v1';
+
 function asset_url( $asset_path ): string {
 	return plugins_url( "../frontend/$asset_path", __FILE__ );
 }
@@ -71,15 +73,16 @@ function () {
 			$config = chatrix_config();
 			if ( $config ) {
 				$current_user = wp_get_current_user();
+				if ( 0 === $current_user->ID ) {
+					$local_storage_key = LOCAL_STORAGE_KEY_PREFIX;
+				} else {
+					$local_storage_key = LOCAL_STORAGE_KEY_PREFIX . '_' . $current_user->user_login;
+				}
 				?>
 				<script type="text/javascript">
 					window.CHATRIX_HTML_LOCATION = "<?php echo esc_url( asset_url( 'chatrix.html' ) ); ?>";
 					window.CHATRIX_CONFIG_LOCATION = "<?php echo esc_url( $config['url'] ); ?>";
-					<?php if ( 0 === $current_user->ID ) { ?>
-						window.CHATRIX_BACKEND_USER_ID = null;
-					<?php } else { ?>
-						window.CHATRIX_BACKEND_USER_ID = "<?php echo esc_js( $current_user->user_login ); ?>";
-					<?php } ?>
+					window.CHATRIX_LOCAL_STORAGE_KEY = "<?php echo esc_js( $local_storage_key ); ?>";
 				</script>
 				<?php
 			}
@@ -103,10 +106,9 @@ function() {
 							});
 						}
 						(function() {
-							let sessionPrefix = "hydrogen_sessions_v1";
 							for (let i=0; i<localStorage.length; i++) {
 								let key = localStorage.key(i);
-								if (!key.startsWith(sessionPrefix)) {
+								if (!key.startsWith(LOCAL_STORAGE_KEY_PREFIX)) {
 									continue;
 								}
 								this.invalidateChatrixSession(