@etsoo/appscript 1.5.24 → 1.5.26

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

@@ -90,6 +90,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId(): string;
+    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -597,9 +598,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected exchangeTokenUpdate(api: IApi, data: ApiRefreshTokenDto): void;
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
     /**
      * API refresh token
      * @param api Current API

package/lib/cjs/app/CoreApp.js

@@ -41,6 +41,9 @@ class CoreApp {
     get deviceId() {
         return this._deviceId;
     }
+    set deviceId(value) {
+        this._deviceId = value;
+    }
     /**
      * Label delegate
      */
@@ -1433,12 +1436,21 @@ class CoreApp {
     exchangeTokenUpdate(api, data) { }
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token) {
+    exchangeTokenAll(coreData, coreName) {
+        coreName ?? (coreName = 'core');
         for (const name in this.apis) {
             const api = this.apis[name];
-            this.exchangeToken(api[0], token);
+            // The core API
+            if (api[0].name === coreName) {
+                api[0].authorize(coreData.tokenType, coreData.accessToken);
+                this.updateApi(api, coreData.refreshToken, coreData.expiresIn);
+            }
+            else {
+                this.exchangeToken(api[0], coreData.refreshToken);
+            }
         }
     }
     /**

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

@@ -8,6 +8,7 @@ import { UserRole } from './UserRole';
 import { EntityStatus } from '../business/EntityStatus';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
+import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
 /**
  * Detect IP callback interface
  */
@@ -279,9 +280,10 @@ export interface IApp {
     exchangeToken(api: IApi, token: string): Promise<void>;
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
     /**
      * Format date to string
      * @param input Input date

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

@@ -90,6 +90,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId(): string;
+    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -597,9 +598,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected exchangeTokenUpdate(api: IApi, data: ApiRefreshTokenDto): void;
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
     /**
      * API refresh token
      * @param api Current API

package/lib/mjs/app/CoreApp.js

@@ -38,6 +38,9 @@ export class CoreApp {
     get deviceId() {
         return this._deviceId;
     }
+    set deviceId(value) {
+        this._deviceId = value;
+    }
     /**
      * Label delegate
      */
@@ -1430,12 +1433,21 @@ export class CoreApp {
     exchangeTokenUpdate(api, data) { }
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token) {
+    exchangeTokenAll(coreData, coreName) {
+        coreName ?? (coreName = 'core');
         for (const name in this.apis) {
             const api = this.apis[name];
-            this.exchangeToken(api[0], token);
+            // The core API
+            if (api[0].name === coreName) {
+                api[0].authorize(coreData.tokenType, coreData.accessToken);
+                this.updateApi(api, coreData.refreshToken, coreData.expiresIn);
+            }
+            else {
+                this.exchangeToken(api[0], coreData.refreshToken);
+            }
         }
     }
     /**

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

@@ -8,6 +8,7 @@ import { UserRole } from './UserRole';
 import { EntityStatus } from '../business/EntityStatus';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
+import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
 /**
  * Detect IP callback interface
  */
@@ -279,9 +280,10 @@ export interface IApp {
     exchangeToken(api: IApi, token: string): Promise<void>;
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
     /**
      * Format date to string
      * @param input Input date

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.24",
+    "version": "1.5.26",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -68,6 +68,6 @@
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.2.5",
-        "typescript": "^5.6.2"
+        "typescript": "^5.6.3"
     }
 }

package/src/app/CoreApp.ts

@@ -172,6 +172,9 @@ export abstract class CoreApp<
     get deviceId() {
         return this._deviceId;
     }
+    protected set deviceId(value: string) {
+        this._deviceId = value;
+    }
 
     /**
      * Label delegate
@@ -1986,12 +1989,22 @@ export abstract class CoreApp<
 
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token: string) {
+    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string) {
+        coreName ??= 'core';
+
         for (const name in this.apis) {
             const api = this.apis[name];
-            this.exchangeToken(api[0], token);
+
+            // The core API
+            if (api[0].name === coreName) {
+                api[0].authorize(coreData.tokenType, coreData.accessToken);
+                this.updateApi(api, coreData.refreshToken, coreData.expiresIn);
+            } else {
+                this.exchangeToken(api[0], coreData.refreshToken);
+            }
         }
     }
 

package/src/app/IApp.ts

@@ -23,6 +23,7 @@ import { UserRole } from './UserRole';
 import { EntityStatus } from '../business/EntityStatus';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
+import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
 
 /**
  * Detect IP callback interface
@@ -382,9 +383,10 @@ export interface IApp {
 
     /**
      * Exchange intergration tokens for all APIs
-     * @param token Core system's refresh token to exchange
+     * @param coreData Core system's token data to exchange
+     * @param coreName Core system's name, default is 'core'
      */
-    exchangeTokenAll(token: string): void;
+    exchangeTokenAll(coreData: ApiRefreshTokenDto, coreName?: string): void;
 
     /**
      * Format date to string