asma-helpers 0.6.16 → 0.6.18

package/lib/helpers/initAppVitals.d.ts

@@ -5,16 +5,20 @@
  * mst_stores_toPersisit - array of mst stores that should be persisted in indexedDB
  * data_for_registered_subdomain_check - data needed to check if subdomain is registered to an exiting tenant in the db
  */
-export declare function initAppVitals({ 
+export declare function initASMAAppVitals({ 
 /**
  * //TODO invesigate how to internalyze this variable
  * add qiankunWindow.__POWERED_BY_QIANKUN__ there where qiankunWindow is awailable
  */
-is_child_app, data_for_registered_subdomain_check, mst_stores_toPersisit, setLoadMicroApp, }: {
+authenticated, is_child_app, subdomain_check, mst_stores_to_persisit, setLoadMicroApp, }: {
     setLoadMicroApp(dev_mode: boolean): Promise<void>;
     is_child_app?: boolean;
-    mst_stores_toPersisit: Object[];
-    data_for_registered_subdomain_check: {
+    mst_stores_to_persisit: Object[];
+    /**
+     * whenether user is authenticated or not
+     */
+    authenticated: () => boolean;
+    subdomain_check: {
         /**
          * redirects to domain if subdomain is not registered
          * ex: https://non-existent.adopus.no -> https://www.adopus.no
@@ -28,10 +32,6 @@ is_child_app, data_for_registered_subdomain_check, mst_stores_toPersisit, setLoa
             fretexLogo: string;
             carasentLogo: string;
         };
-        /**
-         * whenether user is authenticated or not
-         */
-        authenticated: () => boolean;
         /**
          * temporary solution need to be removed after theming will be implemented in all app-shells (app-shell, app-advoca, advoca-portal)
          */

package/lib/helpers/initAppVitals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initAppVitals.d.ts","sourceRoot":"","sources":["../../src/helpers/initAppVitals.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC;AAChC;;;GAGG;AACH,YAAoB,EACpB,mCAAmC,EACnC,qBAAqB,EACrB,eAAe,GAClB,EAAE;IACC,eAAe,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,mCAAmC,EAAE;QACjC;;;WAGG;QACH,sBAAsB,CAAC,EAAE,OAAO,CAAA;QAChC,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;QACnD;;WAEG;QACH,KAAK,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,MAAM,CAAA;SAAE,CAAA;QACnD;;WAEG;QACH,aAAa,EAAE,MAAM,OAAO,CAAA;QAC5B;;WAEG;QACH,OAAO,EAAE,WAAW,GAAG,YAAY,GAAG,eAAe,CAAA;KACxD,CAAA;CACJ,2CAsBA"}
+{"version":3,"file":"initAppVitals.d.ts","sourceRoot":"","sources":["../../src/helpers/initAppVitals.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC;AACpC;;;GAGG;AACH,aAAa,EACb,YAAoB,EACpB,eAAe,EACf,sBAAsB,EACtB,eAAe,GAClB,EAAE;IACC,eAAe,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjD,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,sBAAsB,EAAE,MAAM,EAAE,CAAA;IAChC;;OAEG;IACH,aAAa,EAAE,MAAM,OAAO,CAAA;IAC5B,eAAe,EAAE;QACb;;;WAGG;QACH,sBAAsB,CAAC,EAAE,OAAO,CAAA;QAChC,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;QACnD;;WAEG;QACH,KAAK,EAAE;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,MAAM,CAAA;SAAE,CAAA;QACnD;;WAEG;QACH,OAAO,EAAE,WAAW,GAAG,YAAY,GAAG,eAAe,CAAA;KACxD,CAAA;CACJ,2CAsBA"}

package/lib/helpers/initAppVitals.js

@@ -10,23 +10,23 @@ import { initiatieIDBListenersOnMstSnaphsots } from './InitializeIDBListenersOnM
  * mst_stores_toPersisit - array of mst stores that should be persisted in indexedDB
  * data_for_registered_subdomain_check - data needed to check if subdomain is registered to an exiting tenant in the db
  */
-export async function initAppVitals({ 
+export async function initASMAAppVitals({ 
 /**
  * //TODO invesigate how to internalyze this variable
  * add qiankunWindow.__POWERED_BY_QIANKUN__ there where qiankunWindow is awailable
  */
-is_child_app = false, data_for_registered_subdomain_check, mst_stores_toPersisit, setLoadMicroApp, }) {
+authenticated, is_child_app = false, subdomain_check, mst_stores_to_persisit, setLoadMicroApp, }) {
     await fetchConfigsInternal();
     await clearCacheData(EnvConfigsFnInternal().CACHE_VERSION);
     await setLoadMicroApp(EnvConfigsFnInternal().DEVELOPMENT);
-    const promises = mst_stores_toPersisit.map((store) => initiatieIDBListenersOnMstSnaphsots(store));
+    const promises = mst_stores_to_persisit.map((store) => initiatieIDBListenersOnMstSnaphsots(store));
     await Promise.allSettled(promises);
-    let registeredSubdomain = false;
+    let registeredSubdomain = true;
     if (!is_child_app) {
-        const [registeredSubdomain1] = await checkForRegisteredSubdomain(data_for_registered_subdomain_check);
+        const [registeredSubdomain1] = await checkForRegisteredSubdomain({ ...subdomain_check, authenticated });
         registeredSubdomain = registeredSubdomain1;
+        authenticated() && (await getCachedJwtInternal());
     }
-    data_for_registered_subdomain_check.authenticated() && (await getCachedJwtInternal());
     return [registeredSubdomain];
 }
 //# sourceMappingURL=initAppVitals.js.map

package/lib/helpers/initAppVitals.js.map

@@ -1 +1 @@
-{"version":3,"file":"initAppVitals.js","sourceRoot":"","sources":["../../src/helpers/initAppVitals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAA;AAE5F;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC;AAChC;;;GAGG;AACH,YAAY,GAAG,KAAK,EACpB,mCAAmC,EACnC,qBAAqB,EACrB,eAAe,GAyBlB;IACG,MAAM,oBAAoB,EAAE,CAAA;IAE5B,MAAM,cAAc,CAAC,oBAAoB,EAAE,CAAC,aAAa,CAAC,CAAA;IAE1D,MAAM,eAAe,CAAC,oBAAoB,EAAE,CAAC,WAAW,CAAC,CAAA;IAEzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mCAAmC,CAAC,KAAK,CAAC,CAAC,CAAA;IAEjG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAElC,IAAI,mBAAmB,GAAG,KAAK,CAAA;IAE/B,IAAI,CAAC,YAAY,EAAE;QACf,MAAM,CAAC,oBAAoB,CAAC,GAAG,MAAM,2BAA2B,CAAC,mCAAmC,CAAC,CAAA;QAErG,mBAAmB,GAAG,oBAAoB,CAAA;KAC7C;IAED,mCAAmC,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,oBAAoB,EAAE,CAAC,CAAA;IAErF,OAAO,CAAC,mBAAmB,CAAmC,CAAA;AAClE,CAAC"}
+{"version":3,"file":"initAppVitals.js","sourceRoot":"","sources":["../../src/helpers/initAppVitals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAA;AAE5F;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC;AACpC;;;GAGG;AACH,aAAa,EACb,YAAY,GAAG,KAAK,EACpB,eAAe,EACf,sBAAsB,EACtB,eAAe,GAyBlB;IACG,MAAM,oBAAoB,EAAE,CAAA;IAE5B,MAAM,cAAc,CAAC,oBAAoB,EAAE,CAAC,aAAa,CAAC,CAAA;IAE1D,MAAM,eAAe,CAAC,oBAAoB,EAAE,CAAC,WAAW,CAAC,CAAA;IAEzD,MAAM,QAAQ,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mCAAmC,CAAC,KAAK,CAAC,CAAC,CAAA;IAElG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAElC,IAAI,mBAAmB,GAAG,IAAI,CAAA;IAE9B,IAAI,CAAC,YAAY,EAAE;QACf,MAAM,CAAC,oBAAoB,CAAC,GAAG,MAAM,2BAA2B,CAAC,EAAE,GAAG,eAAe,EAAE,aAAa,EAAE,CAAC,CAAA;QAEvG,mBAAmB,GAAG,oBAAoB,CAAA;QAE1C,aAAa,EAAE,IAAI,CAAC,MAAM,oBAAoB,EAAE,CAAC,CAAA;KACpD;IAED,OAAO,CAAC,mBAAmB,CAAmC,CAAA;AAClE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "asma-helpers",
-    "version": "0.6.16",
+    "version": "0.6.18",
     "description": "helpers methods for asma",
     "main": "lib/index.js",
     "types": "lib",

package/src/helpers/initAppVitals.ts

@@ -11,20 +11,25 @@ import { initiatieIDBListenersOnMstSnaphsots } from './InitializeIDBListenersOnM
  * mst_stores_toPersisit - array of mst stores that should be persisted in indexedDB
  * data_for_registered_subdomain_check - data needed to check if subdomain is registered to an exiting tenant in the db
  */
-export async function initAppVitals({
+export async function initASMAAppVitals({
     /**
      * //TODO invesigate how to internalyze this variable
      * add qiankunWindow.__POWERED_BY_QIANKUN__ there where qiankunWindow is awailable
      */
+    authenticated,
     is_child_app = false,
-    data_for_registered_subdomain_check,
-    mst_stores_toPersisit,
+    subdomain_check,
+    mst_stores_to_persisit,
     setLoadMicroApp,
 }: {
     setLoadMicroApp(dev_mode: boolean): Promise<void>
     is_child_app?: boolean
-    mst_stores_toPersisit: Object[]
-    data_for_registered_subdomain_check: {
+    mst_stores_to_persisit: Object[]
+    /**
+     * whenether user is authenticated or not
+     */
+    authenticated: () => boolean
+    subdomain_check: {
         /**
          * redirects to domain if subdomain is not registered
          * ex: https://non-existent.adopus.no -> https://www.adopus.no
@@ -35,10 +40,6 @@ export async function initAppVitals({
          * //TODO temporary solution need to be fetched logos dynamically from srv-auth (origin service is srv-storage or srv-directory)
          */
         logos: { fretexLogo: string; carasentLogo: string }
-        /**
-         * whenether user is authenticated or not
-         */
-        authenticated: () => boolean
         /**
          * temporary solution need to be removed after theming will be implemented in all app-shells (app-shell, app-advoca, advoca-portal)
          */
@@ -51,19 +52,19 @@ export async function initAppVitals({
 
     await setLoadMicroApp(EnvConfigsFnInternal().DEVELOPMENT)
 
-    const promises = mst_stores_toPersisit.map((store) => initiatieIDBListenersOnMstSnaphsots(store))
+    const promises = mst_stores_to_persisit.map((store) => initiatieIDBListenersOnMstSnaphsots(store))
 
     await Promise.allSettled(promises)
 
-    let registeredSubdomain = false
+    let registeredSubdomain = true
 
     if (!is_child_app) {
-        const [registeredSubdomain1] = await checkForRegisteredSubdomain(data_for_registered_subdomain_check)
+        const [registeredSubdomain1] = await checkForRegisteredSubdomain({ ...subdomain_check, authenticated })
 
         registeredSubdomain = registeredSubdomain1
-    }
 
-    data_for_registered_subdomain_check.authenticated() && (await getCachedJwtInternal())
+        authenticated() && (await getCachedJwtInternal())
+    }
 
     return [registeredSubdomain] as [registeredSubdomain: boolean]
 }