@yomotech/view-toolkit 0.0.27 → 0.0.29

package/fesm2022/yomotech-view-toolkit.mjs

@@ -2635,6 +2635,7 @@ class Couchdb {
     async buildTenantHeaders() {
         const tenantKey = await this.utilityService.getStorage('tenantKey');
         const tenantName = await this.utilityService.getStorage('tenantName');
+        const selectedTenant = await this.utilityService.getLocalStorage('selectedTenant');
         if (tenantKey) {
             if (typeof tenantKey !== 'string' || !tenantKey.trim()) {
                 throw new Error('Missing tenantKey');
@@ -2644,11 +2645,11 @@ class Couchdb {
             };
         }
         else {
-            if (typeof tenantName !== 'string' || !tenantName.trim()) {
+            if (typeof tenantName !== 'string' || !tenantName.trim() || !tenantName.trim()) {
                 throw new Error('Missing tenantName');
             }
             return {
-                'X-Tenant': tenantName.trim(),
+                'X-Tenant': tenantName ? tenantName.trim() : selectedTenant.trim(),
             };
         }
     }
@@ -2696,19 +2697,22 @@ class ConfigService {
     }
     async loadOktaConfig(projectName) {
         try {
+            let tenantKey = "";
             let tenantName = "";
-            let selectedTenant = "";
             if (this.platform.ANDROID || this.platform.IOS) {
+                tenantKey = await this.utilityService.getLocalStorage('tenantKey');
                 tenantName = await this.utilityService.getLocalStorage('tenantName');
-                selectedTenant = await this.utilityService.getLocalStorage('selectedTenant');
             }
             else {
+                tenantKey = await this.utilityService.getStorage('tenantKey');
                 tenantName = await this.utilityService.getStorage('tenantName');
-                selectedTenant = await this.utilityService.getLocalStorage('selectedTenant');
             }
-            let tenant = tenantName ? tenantName : selectedTenant;
-            console.log('tenant2: ', tenant);
-            this.config = await this.couchdbService.getFileContentFromCouchDb(`${tenant}_${projectName}`, 'environments/environment.json');
+            if (tenantName) {
+                this.config = await this.couchdbService.getFileContentFromCouchDb(`${tenantName}_${projectName}`, 'environments/environment.json');
+            }
+            else {
+                this.config = await this.couchdbService.getFileContentFromCouchDb(`${projectName}`, 'environments/environment.json');
+            }
             if (this.platform.ANDROID || this.platform.IOS) {
                 if (this.config.environment.login.mobile) {
                     this.setConfiguration(this.config.environment.login.mobile);
@@ -2753,19 +2757,23 @@ class ConfigService {
         return this.config;
     }
     async loadKeycloakConfig(projectName) {
+        let tenantKey = "";
         let tenantName = "";
-        let selectedTenant = "";
         if (this.platform.ANDROID || this.platform.IOS) {
+            tenantKey = await this.utilityService.getLocalStorage('tenantKey');
             tenantName = await this.utilityService.getLocalStorage('tenantName');
-            selectedTenant = await this.utilityService.getLocalStorage('selectedTenant');
         }
         else {
+            tenantKey = await this.utilityService.getStorage('tenantKey');
             tenantName = await this.utilityService.getStorage('tenantName');
-            selectedTenant = await this.utilityService.getLocalStorage('selectedTenant');
         }
-        let tenant = tenantName ? tenantName : selectedTenant;
-        console.log('tenant1: ', tenant);
-        const env = await this.couchdbService.getFileContentFromCouchDb(`${tenant}_${projectName}`, 'environments/environment.json');
+        let env = {};
+        if (tenantName) {
+            env = await this.couchdbService.getFileContentFromCouchDb(`${tenantName}_${projectName}`, 'environments/environment.json');
+        }
+        else {
+            env = await this.couchdbService.getFileContentFromCouchDb(`${projectName}`, 'environments/environment.json');
+        }
         if (env?.environment?.login.type === "keycloak") {
             if (this.platform.ANDROID || this.platform.IOS) {
                 this.keycloakConfig = {