Merge pull request #2724 from codefori/fix/unique_connection_storage

Ensure unique connection storage per session

Author: worksofliam

src/api/configuration/storage/BaseStorage.ts

@@ -1,15 +1,20 @@
 export abstract class BaseStorage {
   protected readonly globalState: any;
 
+  private uniqueKeyPrefix: string|undefined;
   constructor(globalState: any) {  
-    this.globalState = globalState;  
+    this.globalState = globalState;
   }  
 
 
   keys(): readonly string[] {
     return Array.from(this.globalState.keys());
   }
 
+  setUniqueKeyPrefix(prefix: string) {
+    this.uniqueKeyPrefix = prefix;
+  }
+
   get<T>(key: string): T | undefined {
     return this.globalState.get(this.getStorageKey(key)) as T | undefined;
   }
@@ -19,7 +24,7 @@ export abstract class BaseStorage {
   }
 
   getStorageKey(key: string): string {
-    return key;
+    return `${this.uniqueKeyPrefix ? this.uniqueKeyPrefix + '.' : ''}${key}`;
   }
 }
 

src/api/configuration/storage/CodeForIStorage.ts

@@ -34,10 +34,6 @@ export type CachedServerSettings = {
 export class CodeForIStorage {
   constructor(private internalStorage: BaseStorage) {}
 
-  protected getStorageKey(key: string): string {
-    return key;
-  }
-
   getLastConnections() {
     return this.internalStorage.get<LastConnection[]>("lastConnections");
   }

src/api/configuration/storage/ConnectionStorage.ts

@@ -20,7 +20,8 @@ type AuthorisedExtension = {
 
 export class ConnectionStorage {
   private connectionName: string = "";
-  constructor(private internalStorage: BaseStorage) {}
+  constructor(private internalStorage: BaseStorage) {
+  }
 
   get ready(): boolean {
     if (this.connectionName) {
@@ -33,10 +34,7 @@ export class ConnectionStorage {
 
   setConnectionName(connectionName: string) {
     this.connectionName = connectionName;
-  }
-
-  protected getStorageKey(key: string): string {
-    return `${this.connectionName}.${key}`;
+    this.internalStorage.setUniqueKeyPrefix(`settings-${connectionName}`);
   }
 
   getSourceList() {