add instance index to config and option to update the config service

Author: chriskapp

projects/fusio-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-fusio-sdk",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "SDK to integrate Fusio into an Angular app",
   "keywords": [
     "Fusio",

projects/fusio-sdk/src/lib/config/config.ts

@@ -3,6 +3,7 @@ import {CommonMessage, ConsumerPlan, ConsumerUserAccount} from "fusio-sdk";
 import {GroupItem, Items} from "../service/navigation.service";
 
 export interface Config {
+  instance?: number,
   baseUrl: string,
   title?: string,
   version?: string,

projects/fusio-sdk/src/lib/service/api.service.ts

@@ -13,7 +13,7 @@ export abstract class ApiService<T extends ClientAbstract> {
   constructor(private config: ConfigService) {
     this.baseUrl = '';
     this.store = new SessionTokenStore();
-    this.setBaseUrl(this.config.getBaseUrl());
+    this.reload();
   }
 
   public getClientWithCredentials(clientId: string, clientSecret: string): T {
@@ -53,15 +53,24 @@ export abstract class ApiService<T extends ClientAbstract> {
     return this.baseUrl;
   }
 
-  public setBaseUrl(baseUrl: string) {
-    this.baseUrl = ApiService.normalizeBaseUrl(baseUrl);
-    this.store = new SessionTokenStore('fusio_access_token_' + this.config.getInstanceCode());
-  }
-
   public getTokenStore(): TokenStoreInterface {
     return this.store;
   }
 
+  /**
+   * Reloads all values from the config
+   */
+  public reload() {
+    this.baseUrl = ApiService.normalizeBaseUrl(this.config.getBaseUrl());
+
+    const instance = this.config.getInstance();
+    if (instance !== undefined) {
+      this.store = new SessionTokenStore('fusio_access_token_' + instance);
+    } else {
+      this.store = new SessionTokenStore('fusio_access_token');
+    }
+  }
+
   public hasValidToken(): boolean {
     const token = this.store.get();
     if (!token) {

projects/fusio-sdk/src/lib/service/config.service.ts

@@ -13,6 +13,10 @@ export class ConfigService {
 
   constructor(@Inject(FUSIO_CONFIG) private config: Config) { }
 
+  public getInstance(): number|undefined {
+    return this.config.instance;
+  }
+
   public getBaseUrl(): string {
     return this.config.baseUrl;
   }
@@ -146,20 +150,7 @@ export class ConfigService {
     }
   }
 
-  /**
-   * @see https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
-   */
-  public getInstanceCode(): number {
-    let hash = 0;
-    if (this.config.baseUrl.length === 0) {
-      return hash;
-    }
-
-    for (let i = 0; i < this.config.baseUrl.length; i++) {
-      hash = ((hash << 5) - hash) + this.config.baseUrl.charCodeAt(i);
-      hash |= 0;
-    }
-
-    return hash;
+  public update(config: Config): void {
+    this.config = config;
   }
 }

projects/fusio-sdk/src/lib/service/user.service.ts

@@ -46,6 +46,11 @@ export class UserService {
   }
 
   private getKey(): string {
-    return 'fusio_user_' + this.config.getInstanceCode();
+    const instance = this.config.getInstance();
+    if (instance !== undefined) {
+      return 'fusio_user_' + instance;
+    } else {
+      return 'fusio_user';
+    }
   }
 }