@etsoo/appscript 1.6.0 → 1.6.2

package/__tests__/app/CoreApp.ts

@@ -22,10 +22,10 @@ const app = new appClass();
 await app.changeCulture(app.settings.cultures[0]);
 
 test("Test for domain substitution", () => {
-  expect(app.settings.endpoint).toBe("http://localhost:9000/api/");
+  expect(app.settings.endpoint).toBe("http://admin.etsoo.com:9000/api/");
 
   expect(app.settings.endpoints?.core.endpoint).toBe(
-    "https://localhost:9001/api/"
+    "https://core.etsoo.com:9001/api/"
   );
 });
 

package/__tests__/app/TestApp.ts

@@ -11,7 +11,6 @@ import {
   CoreApp,
   createClient,
   Culture,
-  ExternalSettings,
   IAppSettings,
   InitCallResultData,
   IUser
@@ -87,6 +86,8 @@ export class TestApp extends CoreApp<
           }
         },
 
+        hostname: "admin.etsoo.com",
+
         /**
          * App root url
          */
@@ -126,19 +127,6 @@ export class TestApp extends CoreApp<
     );
   }
 
-  // Example of local format settings
-  protected override formatSettings(settings: IAppSettings): IAppSettings {
-    const { endpoint, endpoints, ...rest } = settings;
-    return {
-      ...rest,
-      endpoint: ExternalSettings.formatHost(endpoint, "localhost"),
-      endpoints:
-        endpoints == null
-          ? undefined
-          : ExternalSettings.formatHost(endpoints, "localhost")
-    };
-  }
-
   freshCountdownUI(callback?: () => PromiseLike<unknown>): void {
     throw new Error("Method not implemented.");
   }

package/lib/cjs/app/CoreApp.d.ts

@@ -147,6 +147,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get isTryingLogin(): boolean;
     protected set isTryingLogin(value: boolean);
+    /**
+     * Get core API name
+     */
+    protected get coreName(): string;
     /**
      * Last called with token refresh
      */
@@ -645,9 +649,8 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Exchange intergration tokens for all APIs
      * @param coreData Core system's token data to exchange
-     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto): void;
     /**
      * API refresh token data
      * @param api Current API

package/lib/cjs/app/CoreApp.js

@@ -134,6 +134,12 @@ class CoreApp {
     set isTryingLogin(value) {
         this._isTryingLogin = value;
     }
+    /**
+     * Get core API name
+     */
+    get coreName() {
+        return "core";
+    }
     /**
      * Protected constructor
      * @param settings Settings
@@ -189,17 +195,19 @@ class CoreApp {
             }
             return undefined;
         };
+        // Destruct the settings
+        const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
         if (api) {
             // Base URL of the API
-            api.baseUrl = this.settings.endpoint;
+            api.baseUrl = endpoint;
             api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
             this.api = this.createApi(systemApi, {
-                endpoint: settings.endpoint,
-                webUrl: settings.webUrl
+                endpoint,
+                webUrl
             }, refresh);
         }
         this.notifier = notifier;
@@ -220,7 +228,6 @@ class CoreApp {
         // Embedded
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
-        const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
             CJ = cj.default;
@@ -1562,10 +1569,8 @@ class CoreApp {
     /**
      * Exchange intergration tokens for all APIs
      * @param coreData Core system's token data to exchange
-     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(coreData, coreName) {
-        coreName ?? (coreName = "core");
+    exchangeTokenAll(coreData) {
         for (const name in this.apis) {
             // Ignore the system API as it has its own logic with refreshToken
             if (name === systemApi)
@@ -1573,7 +1578,7 @@ class CoreApp {
             const data = this.apis[name];
             const api = data[0];
             // The core API
-            if (name === coreName) {
+            if (name === this.coreName) {
                 api.authorize(coreData.tokenType, coreData.accessToken);
                 this.updateApi(data, coreData.refreshToken, coreData.expiresIn);
             }

package/lib/cjs/app/ExternalSettings.d.ts

@@ -36,7 +36,7 @@ export interface IExternalSettings extends ExternalEndpoint {
     /**
      * Endpoints to other services
      */
-    readonly endpoints?: Record<"core" | "admin" | "finance" | "crm" | "oa" | "agile" | string, ExternalEndpoint>;
+    readonly endpoints?: Record<"platform" | "core" | "admin" | "finance" | "crm" | "oa" | "agile" | string, ExternalEndpoint>;
 }
 /**
  * External settings namespace

package/lib/cjs/app/IApp.d.ts

@@ -342,9 +342,8 @@ export interface IApp {
     /**
      * Exchange intergration tokens for all APIs
      * @param coreData Core system's token data to exchange
-     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto): void;
     /**
      * Format date to string
      * @param input Input date

package/lib/mjs/app/CoreApp.d.ts

@@ -147,6 +147,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get isTryingLogin(): boolean;
     protected set isTryingLogin(value: boolean);
+    /**
+     * Get core API name
+     */
+    protected get coreName(): string;
     /**
      * Last called with token refresh
      */
@@ -645,9 +649,8 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Exchange intergration tokens for all APIs
      * @param coreData Core system's token data to exchange
-     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto): void;
     /**
      * API refresh token data
      * @param api Current API

package/lib/mjs/app/CoreApp.js

@@ -131,6 +131,12 @@ export class CoreApp {
     set isTryingLogin(value) {
         this._isTryingLogin = value;
     }
+    /**
+     * Get core API name
+     */
+    get coreName() {
+        return "core";
+    }
     /**
      * Protected constructor
      * @param settings Settings
@@ -186,17 +192,19 @@ export class CoreApp {
             }
             return undefined;
         };
+        // Destruct the settings
+        const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
         if (api) {
             // Base URL of the API
-            api.baseUrl = this.settings.endpoint;
+            api.baseUrl = endpoint;
             api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
             this.api = this.createApi(systemApi, {
-                endpoint: settings.endpoint,
-                webUrl: settings.webUrl
+                endpoint,
+                webUrl
             }, refresh);
         }
         this.notifier = notifier;
@@ -217,7 +225,6 @@ export class CoreApp {
         // Embedded
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
-        const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
             CJ = cj.default;
@@ -1559,10 +1566,8 @@ export class CoreApp {
     /**
      * Exchange intergration tokens for all APIs
      * @param coreData Core system's token data to exchange
-     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(coreData, coreName) {
-        coreName ?? (coreName = "core");
+    exchangeTokenAll(coreData) {
         for (const name in this.apis) {
             // Ignore the system API as it has its own logic with refreshToken
             if (name === systemApi)
@@ -1570,7 +1575,7 @@ export class CoreApp {
             const data = this.apis[name];
             const api = data[0];
             // The core API
-            if (name === coreName) {
+            if (name === this.coreName) {
                 api.authorize(coreData.tokenType, coreData.accessToken);
                 this.updateApi(data, coreData.refreshToken, coreData.expiresIn);
             }

package/lib/mjs/app/ExternalSettings.d.ts

@@ -36,7 +36,7 @@ export interface IExternalSettings extends ExternalEndpoint {
     /**
      * Endpoints to other services
      */
-    readonly endpoints?: Record<"core" | "admin" | "finance" | "crm" | "oa" | "agile" | string, ExternalEndpoint>;
+    readonly endpoints?: Record<"platform" | "core" | "admin" | "finance" | "crm" | "oa" | "agile" | string, ExternalEndpoint>;
 }
 /**
  * External settings namespace

package/lib/mjs/app/IApp.d.ts

@@ -342,9 +342,8 @@ export interface IApp {
     /**
      * Exchange intergration tokens for all APIs
      * @param coreData Core system's token data to exchange
-     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto): void;
     /**
      * Format date to string
      * @param input Input date

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -42,10 +42,10 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.8",
-    "@babel/plugin-transform-runtime": "^7.26.8",
-    "@babel/preset-env": "^7.26.8",
-    "@babel/runtime-corejs3": "^7.26.7",
+    "@babel/core": "^7.26.9",
+    "@babel/plugin-transform-runtime": "^7.26.9",
+    "@babel/preset-env": "^7.26.9",
+    "@babel/runtime-corejs3": "^7.26.9",
     "@types/crypto-js": "^4.2.2",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",

package/src/app/CoreApp.ts

@@ -293,6 +293,13 @@ export abstract class CoreApp<
     this._isTryingLogin = value;
   }
 
+  /**
+   * Get core API name
+   */
+  protected get coreName() {
+    return "core";
+  }
+
   /**
    * Last called with token refresh
    */
@@ -365,9 +372,12 @@ export abstract class CoreApp<
       return undefined;
     };
 
+    // Destruct the settings
+    const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
+
     if (api) {
       // Base URL of the API
-      api.baseUrl = this.settings.endpoint;
+      api.baseUrl = endpoint;
       api.name = systemApi;
       this.setApi(api, refresh);
       this.api = api;
@@ -375,8 +385,8 @@ export abstract class CoreApp<
       this.api = this.createApi(
         systemApi,
         {
-          endpoint: settings.endpoint,
-          webUrl: settings.webUrl
+          endpoint,
+          webUrl
         },
         refresh
       );
@@ -408,8 +418,6 @@ export abstract class CoreApp<
     this._embedded =
       this.storage.getData<boolean>(this.fields.embedded) ?? false;
 
-    const { currentCulture, currentRegion } = settings;
-
     // Load resources
     Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(
       ([cj, _resources]) => {
@@ -2111,11 +2119,8 @@ export abstract class CoreApp<
   /**
    * Exchange intergration tokens for all APIs
    * @param coreData Core system's token data to exchange
-   * @param coreName Core system's name, default is 'core'
    */
-  exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string) {
-    coreName ??= "core";
-
+  exchangeTokenAll(coreData: ApiRefreshTokenDto) {
     for (const name in this.apis) {
       // Ignore the system API as it has its own logic with refreshToken
       if (name === systemApi) continue;
@@ -2124,7 +2129,7 @@ export abstract class CoreApp<
       const api = data[0];
 
       // The core API
-      if (name === coreName) {
+      if (name === this.coreName) {
         api.authorize(coreData.tokenType, coreData.accessToken);
         this.updateApi(data, coreData.refreshToken, coreData.expiresIn);
       } else {

package/src/app/ExternalSettings.ts

@@ -43,7 +43,7 @@ export interface IExternalSettings extends ExternalEndpoint {
    * Endpoints to other services
    */
   readonly endpoints?: Record<
-    "core" | "admin" | "finance" | "crm" | "oa" | "agile" | string,
+    "platform" | "core" | "admin" | "finance" | "crm" | "oa" | "agile" | string,
     ExternalEndpoint
   >;
 }

package/src/app/IApp.ts

@@ -454,9 +454,8 @@ export interface IApp {
   /**
    * Exchange intergration tokens for all APIs
    * @param coreData Core system's token data to exchange
-   * @param coreName Core system's name, default is 'core'
    */
-  exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
+  exchangeTokenAll(coreData: ApiRefreshTokenDto): void;
 
   /**
    * Format date to string