@etsoo/appscript 1.5.23 → 1.5.25

package/__tests__/app/CoreApp.ts

@@ -135,8 +135,6 @@ class CoreAppTest extends CoreApp<
             new WindowStorage(),
             'SmartERP'
         );
-
-        this.deviceId = 'abcd1234';
     }
 
     freshCountdownUI(callback?: () => PromiseLike<unknown>): void {

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

@@ -90,7 +90,6 @@ 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
      */
@@ -598,9 +597,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

@@ -39,14 +39,8 @@ class CoreApp {
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
-        if (this._deviceId === '') {
-            throw new Error('Device id is empty');
-        }
         return this._deviceId;
     }
-    set deviceId(value) {
-        this._deviceId = value;
-    }
     /**
      * Label delegate
      */
@@ -233,7 +227,7 @@ class CoreApp {
     async restore() {
         // Devices
         const devices = this.storage.getPersistedData(this.fields.devices, []);
-        if (this.deviceId === '') {
+        if (this._deviceId === '') {
             // First vist, restore and keep the source
             this.storage.copyFrom(this.persistedFields, false);
             // Reset device id
@@ -1439,12 +1433,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,7 +90,6 @@ 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
      */
@@ -598,9 +597,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

@@ -36,14 +36,8 @@ export class CoreApp {
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
-        if (this._deviceId === '') {
-            throw new Error('Device id is empty');
-        }
         return this._deviceId;
     }
-    set deviceId(value) {
-        this._deviceId = value;
-    }
     /**
      * Label delegate
      */
@@ -230,7 +224,7 @@ export class CoreApp {
     async restore() {
         // Devices
         const devices = this.storage.getPersistedData(this.fields.devices, []);
-        if (this.deviceId === '') {
+        if (this._deviceId === '') {
             // First vist, restore and keep the source
             this.storage.copyFrom(this.persistedFields, false);
             // Reset device id
@@ -1436,12 +1430,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.23",
+    "version": "1.5.25",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -170,14 +170,8 @@ export abstract class CoreApp<
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
-        if (this._deviceId === '') {
-            throw new Error('Device id is empty');
-        }
         return this._deviceId;
     }
-    protected set deviceId(value: string) {
-        this._deviceId = value;
-    }
 
     /**
      * Label delegate
@@ -433,7 +427,7 @@ export abstract class CoreApp<
             []
         );
 
-        if (this.deviceId === '') {
+        if (this._deviceId === '') {
             // First vist, restore and keep the source
             this.storage.copyFrom(this.persistedFields, false);
 
@@ -1992,12 +1986,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