mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

use correct prefix to remove local storage value

Browse source
This commit is contained in:
Bruno Windels 2021-09-30 09:25:35 +02:00
parent ae68264db4
commit 42f1603d81
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/matrix/storage/idb/stores/SessionStore.ts
View file

@ -33,6 +33,10 @@ export class SessionStore {
this._localStorage = localStorage; this._localStorage = localStorage;
} }
private get _localStorageKeyPrefix(): string {
return `${this._sessionStore.databaseName}.session.`;
}
async get(key: string): Promise<any> { async get(key: string): Promise<any> {
const entry = await this._sessionStore.get(key); const entry = await this._sessionStore.get(key);
if (entry) { if (entry) {
@ -43,7 +47,7 @@ export class SessionStore {
_writeKeyToLocalStorage(key: string, value: any) { _writeKeyToLocalStorage(key: string, value: any) {
// we backup to localStorage so when idb gets cleared for some reason, we don't lose our e2ee identity // we backup to localStorage so when idb gets cleared for some reason, we don't lose our e2ee identity
try { try {
const lsKey = `${this._sessionStore.databaseName}.session.${key}`; const lsKey = this._localStorageKeyPrefix + key;
const lsValue = stringify(value); const lsValue = stringify(value);
this._localStorage.setItem(lsKey, lsValue); this._localStorage.setItem(lsKey, lsValue);
} catch (err) { } catch (err) {
@ -62,8 +66,8 @@ export class SessionStore {
async tryRestoreE2EEIdentityFromLocalStorage(log: LogItem): Promise<boolean> { async tryRestoreE2EEIdentityFromLocalStorage(log: LogItem): Promise<boolean> {
let success = false; let success = false;
const lsPrefix = `${this._sessionStore.databaseName}.session.`; const lsPrefix = this._localStorageKeyPrefix;
const prefix = `${lsPrefix}${SESSION_E2EE_KEY_PREFIX}`; const prefix = lsPrefix + SESSION_E2EE_KEY_PREFIX;
for(let i = 0; i < this._localStorage.length; i += 1) { for(let i = 0; i < this._localStorage.length; i += 1) {
const lsKey = this._localStorage.key(i)!; const lsKey = this._localStorage.key(i)!;
if (lsKey.startsWith(prefix)) { if (lsKey.startsWith(prefix)) {
@ -97,7 +101,7 @@ export class SessionStore {
remove(key: string): void { remove(key: string): void {
if (key.startsWith(SESSION_E2EE_KEY_PREFIX)) { if (key.startsWith(SESSION_E2EE_KEY_PREFIX)) {
this._localStorage.removeItem(this._sessionStore.databaseName + key); this._localStorage.removeItem(this._localStorageKeyPrefix + key);
} }
this._sessionStore.delete(key); this._sessionStore.delete(key);
} }