@etsoo/appscript 1.5.57 → 1.5.58

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

@@ -11,7 +11,8 @@ import { AppLoginParams, AppTryLoginParams, FormatResultCustomCallback, IApp, IA
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
-type ApiRefreshTokenFunction = (api: IApi, token: string) => Promise<[string, number] | undefined>;
+import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
+type ApiRefreshTokenFunction = (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>;
 type ApiTaskData = [IApi, number, number, ApiRefreshTokenFunction, string?];
 /**
  * Core application interface
@@ -217,7 +218,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param item External endpoint item
      * @returns Result
      */
-    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, token: string) => Promise<[string, number] | undefined>): IApi<any>;
+    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>): IApi<any>;
     /**
      * Update API token and expires
      * @param name Api name
@@ -613,17 +614,17 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * API refresh token data
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    protected apiRefreshTokenData(api: IApi, token: string): Promise<ApiRefreshTokenDto | undefined>;
+    protected apiRefreshTokenData(api: IApi, rq: ApiRefreshTokenRQ): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * API refresh token
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    protected apiRefreshToken(api: IApi, token: string): Promise<[string, number] | undefined>;
+    protected apiRefreshToken(api: IApi, rq: ApiRefreshTokenRQ): Promise<[string, number] | undefined>;
     /**
      * Setup tasks
      */

package/lib/cjs/app/CoreApp.js

@@ -183,10 +183,10 @@ class CoreApp {
         }
         this.defaultRegion = region;
         // Current system refresh token
-        const refresh = async (api, token) => {
+        const refresh = async (api, rq) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                await this.refreshToken({ token, showLoading: false }, (result) => {
+                await this.refreshToken({ token: rq.token, showLoading: false }, (result) => {
                     if (result === true)
                         return;
                     console.log(`CoreApp.${this.name}.RefreshToken`, result);
@@ -1522,12 +1522,14 @@ class CoreApp {
     /**
      * API refresh token data
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    async apiRefreshTokenData(api, token) {
+    async apiRefreshTokenData(api, rq) {
+        // Default appId
+        rq.appId ?? (rq.appId = this.settings.appId);
         // Call the API quietly, no loading bar and no error popup
-        return new AuthApi_1.AuthApi(this, api).apiRefreshToken({ token }, {
+        return new AuthApi_1.AuthApi(this, api).apiRefreshToken(rq, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
@@ -1539,12 +1541,12 @@ class CoreApp {
     /**
      * API refresh token
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    async apiRefreshToken(api, token) {
+    async apiRefreshToken(api, rq) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await this.apiRefreshTokenData(api, token);
+        const data = await this.apiRefreshTokenData(api, rq);
         if (data == null)
             return undefined;
         // Update the access token
@@ -1572,7 +1574,7 @@ class CoreApp {
                 // Ready to trigger
                 if (api[2] === 0) {
                     // Refresh token
-                    api[3](api[0], api[4]).then((data) => {
+                    api[3](api[0], { token: api[4] }).then((data) => {
                         if (data == null) {
                             // Failed, try it again in 2 seconds
                             api[2] = 2;

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

@@ -23,6 +23,11 @@ export interface IExternalSettings extends ExternalEndpoint {
      * App root url
      */
     readonly homepage: string;
+    /**
+     * Application id
+     * 程序编号
+     */
+    readonly appId: number;
     /**
      * Endpoints to other services
      */

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

@@ -9,6 +9,7 @@ import { EntityStatus } from '../business/EntityStatus';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
+import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
 /**
  * Detect IP callback interface
  */
@@ -282,7 +283,7 @@ export interface IApp {
      * @param item External endpoint item
      * @returns Result
      */
-    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, token: string) => Promise<[string, number] | undefined>): IApi;
+    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>): IApi;
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message

package/lib/cjs/erp/rq/ApiRefreshTokenRQ.d.ts

@@ -0,0 +1,13 @@
+/**
+ * API Refresh Token Request data
+ */
+export type ApiRefreshTokenRQ = {
+    /**
+     * Refresh token
+     */
+    token: string;
+    /**
+     * Application ID, 0 for core system
+     */
+    appId?: number;
+};

package/lib/cjs/erp/rq/ApiRefreshTokenRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/index.d.ts

@@ -43,6 +43,7 @@ export * from './erp/dto/PinDto';
 export * from './erp/dto/PlaceParsedDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/ApiRefreshTokenRQ';
 export * from './erp/rq/AuthRequest';
 export * from './erp/rq/GetLogInUrlRQ';
 export * from './erp/rq/LoginIdRQ';

package/lib/cjs/index.js

@@ -68,6 +68,7 @@ __exportStar(require("./erp/dto/PlaceParsedDto"), exports);
 __exportStar(require("./erp/dto/ResponseActionMessageDto"), exports);
 __exportStar(require("./erp/dto/ResultPayload"), exports);
 // erp rq
+__exportStar(require("./erp/rq/ApiRefreshTokenRQ"), exports);
 __exportStar(require("./erp/rq/AuthRequest"), exports);
 __exportStar(require("./erp/rq/GetLogInUrlRQ"), exports);
 __exportStar(require("./erp/rq/LoginIdRQ"), exports);

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

@@ -11,7 +11,8 @@ import { AppLoginParams, AppTryLoginParams, FormatResultCustomCallback, IApp, IA
 import { UserRole } from './UserRole';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
-type ApiRefreshTokenFunction = (api: IApi, token: string) => Promise<[string, number] | undefined>;
+import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
+type ApiRefreshTokenFunction = (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>;
 type ApiTaskData = [IApi, number, number, ApiRefreshTokenFunction, string?];
 /**
  * Core application interface
@@ -217,7 +218,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param item External endpoint item
      * @returns Result
      */
-    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, token: string) => Promise<[string, number] | undefined>): IApi<any>;
+    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>): IApi<any>;
     /**
      * Update API token and expires
      * @param name Api name
@@ -613,17 +614,17 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * API refresh token data
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    protected apiRefreshTokenData(api: IApi, token: string): Promise<ApiRefreshTokenDto | undefined>;
+    protected apiRefreshTokenData(api: IApi, rq: ApiRefreshTokenRQ): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * API refresh token
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    protected apiRefreshToken(api: IApi, token: string): Promise<[string, number] | undefined>;
+    protected apiRefreshToken(api: IApi, rq: ApiRefreshTokenRQ): Promise<[string, number] | undefined>;
     /**
      * Setup tasks
      */

package/lib/mjs/app/CoreApp.js

@@ -180,10 +180,10 @@ export class CoreApp {
         }
         this.defaultRegion = region;
         // Current system refresh token
-        const refresh = async (api, token) => {
+        const refresh = async (api, rq) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
-                await this.refreshToken({ token, showLoading: false }, (result) => {
+                await this.refreshToken({ token: rq.token, showLoading: false }, (result) => {
                     if (result === true)
                         return;
                     console.log(`CoreApp.${this.name}.RefreshToken`, result);
@@ -1519,12 +1519,14 @@ export class CoreApp {
     /**
      * API refresh token data
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    async apiRefreshTokenData(api, token) {
+    async apiRefreshTokenData(api, rq) {
+        // Default appId
+        rq.appId ?? (rq.appId = this.settings.appId);
         // Call the API quietly, no loading bar and no error popup
-        return new AuthApi(this, api).apiRefreshToken({ token }, {
+        return new AuthApi(this, api).apiRefreshToken(rq, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
@@ -1536,12 +1538,12 @@ export class CoreApp {
     /**
      * API refresh token
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
-    async apiRefreshToken(api, token) {
+    async apiRefreshToken(api, rq) {
         // Call the API quietly, no loading bar and no error popup
-        const data = await this.apiRefreshTokenData(api, token);
+        const data = await this.apiRefreshTokenData(api, rq);
         if (data == null)
             return undefined;
         // Update the access token
@@ -1569,7 +1571,7 @@ export class CoreApp {
                 // Ready to trigger
                 if (api[2] === 0) {
                     // Refresh token
-                    api[3](api[0], api[4]).then((data) => {
+                    api[3](api[0], { token: api[4] }).then((data) => {
                         if (data == null) {
                             // Failed, try it again in 2 seconds
                             api[2] = 2;

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

@@ -23,6 +23,11 @@ export interface IExternalSettings extends ExternalEndpoint {
      * App root url
      */
     readonly homepage: string;
+    /**
+     * Application id
+     * 程序编号
+     */
+    readonly appId: number;
     /**
      * Endpoints to other services
      */

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

@@ -9,6 +9,7 @@ import { EntityStatus } from '../business/EntityStatus';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
+import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
 /**
  * Detect IP callback interface
  */
@@ -282,7 +283,7 @@ export interface IApp {
      * @param item External endpoint item
      * @returns Result
      */
-    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, token: string) => Promise<[string, number] | undefined>): IApi;
+    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>): IApi;
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message

package/lib/mjs/erp/rq/ApiRefreshTokenRQ.d.ts

@@ -0,0 +1,13 @@
+/**
+ * API Refresh Token Request data
+ */
+export type ApiRefreshTokenRQ = {
+    /**
+     * Refresh token
+     */
+    token: string;
+    /**
+     * Application ID, 0 for core system
+     */
+    appId?: number;
+};

package/lib/mjs/erp/rq/ApiRefreshTokenRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/index.d.ts

@@ -43,6 +43,7 @@ export * from './erp/dto/PinDto';
 export * from './erp/dto/PlaceParsedDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/ApiRefreshTokenRQ';
 export * from './erp/rq/AuthRequest';
 export * from './erp/rq/GetLogInUrlRQ';
 export * from './erp/rq/LoginIdRQ';

package/lib/mjs/index.js

@@ -51,6 +51,7 @@ export * from './erp/dto/PlaceParsedDto';
 export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
 // erp rq
+export * from './erp/rq/ApiRefreshTokenRQ';
 export * from './erp/rq/AuthRequest';
 export * from './erp/rq/GetLogInUrlRQ';
 export * from './erp/rq/LoginIdRQ';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.57",
+    "version": "1.5.58",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -48,6 +48,7 @@ import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
 import { AuthApi } from '../erp/AuthApi';
+import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
 
 type CJType = typeof CryptoJS;
 let CJ: CJType;
@@ -57,7 +58,7 @@ const loadCrypto = () => import('crypto-js');
 // API refresh token function interface
 type ApiRefreshTokenFunction = (
     api: IApi,
-    token: string
+    rq: ApiRefreshTokenRQ
 ) => Promise<[string, number] | undefined>;
 
 // API task data
@@ -351,11 +352,11 @@ export abstract class CoreApp<
         this.defaultRegion = region;
 
         // Current system refresh token
-        const refresh: ApiRefreshTokenFunction = async (api, token) => {
+        const refresh: ApiRefreshTokenFunction = async (api, rq) => {
             if (this.lastCalled) {
                 // Call refreshToken to update access token
                 await this.refreshToken(
-                    { token, showLoading: false },
+                    { token: rq.token, showLoading: false },
                     (result) => {
                         if (result === true) return;
                         console.log(
@@ -602,7 +603,7 @@ export abstract class CoreApp<
         item: ExternalEndpoint,
         refresh?: (
             api: IApi,
-            token: string
+            rq: ApiRefreshTokenRQ
         ) => Promise<[string, number] | undefined>
     ) {
         if (this.apis[name] != null) {
@@ -2085,43 +2086,43 @@ export abstract class CoreApp<
     /**
      * API refresh token data
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
     protected async apiRefreshTokenData(
         api: IApi,
-        token: string
+        rq: ApiRefreshTokenRQ
     ): Promise<ApiRefreshTokenDto | undefined> {
+        // Default appId
+        rq.appId ??= this.settings.appId;
+
         // Call the API quietly, no loading bar and no error popup
-        return new AuthApi(this, api).apiRefreshToken(
-            { token },
-            {
-                showLoading: false,
-                onError: (error) => {
-                    console.error(
-                        `CoreApp.${api.name}.apiRefreshToken error`,
-                        error
-                    );
+        return new AuthApi(this, api).apiRefreshToken(rq, {
+            showLoading: false,
+            onError: (error) => {
+                console.error(
+                    `CoreApp.${api.name}.apiRefreshToken error`,
+                    error
+                );
 
-                    // Prevent further processing
-                    return false;
-                }
+                // Prevent further processing
+                return false;
             }
-        );
+        });
     }
 
     /**
      * API refresh token
      * @param api Current API
-     * @param token Refresh token
+     * @param rq Request data
      * @returns Result
      */
     protected async apiRefreshToken(
         api: IApi,
-        token: string
+        rq: ApiRefreshTokenRQ
     ): Promise<[string, number] | undefined> {
         // Call the API quietly, no loading bar and no error popup
-        const data = await this.apiRefreshTokenData(api, token);
+        const data = await this.apiRefreshTokenData(api, rq);
         if (data == null) return undefined;
 
         // Update the access token
@@ -2153,7 +2154,7 @@ export abstract class CoreApp<
                 // Ready to trigger
                 if (api[2] === 0) {
                     // Refresh token
-                    api[3](api[0], api[4]).then((data) => {
+                    api[3](api[0], { token: api[4] }).then((data) => {
                         if (data == null) {
                             // Failed, try it again in 2 seconds
                             api[2] = 2;

package/src/app/ExternalSettings.ts

@@ -27,6 +27,12 @@ export interface IExternalSettings extends ExternalEndpoint {
      */
     readonly homepage: string;
 
+    /**
+     * Application id
+     * 程序编号
+     */
+    readonly appId: number;
+
     /**
      * Endpoints to other services
      */

package/src/app/IApp.ts

@@ -24,6 +24,7 @@ import { EntityStatus } from '../business/EntityStatus';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
 import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
+import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
 
 /**
  * Detect IP callback interface
@@ -371,7 +372,7 @@ export interface IApp {
         item: ExternalEndpoint,
         refresh?: (
             api: IApi,
-            token: string
+            rq: ApiRefreshTokenRQ
         ) => Promise<[string, number] | undefined>
     ): IApi;
 

package/src/erp/rq/ApiRefreshTokenRQ.ts

@@ -0,0 +1,14 @@
+/**
+ * API Refresh Token Request data
+ */
+export type ApiRefreshTokenRQ = {
+    /**
+     * Refresh token
+     */
+    token: string;
+
+    /**
+     * Application ID, 0 for core system
+     */
+    appId?: number;
+};

package/src/index.ts

@@ -58,6 +58,7 @@ export * from './erp/dto/ResponseActionMessageDto';
 export * from './erp/dto/ResultPayload';
 
 // erp rq
+export * from './erp/rq/ApiRefreshTokenRQ';
 export * from './erp/rq/AuthRequest';
 export * from './erp/rq/GetLogInUrlRQ';
 export * from './erp/rq/LoginIdRQ';