@etsoo/appscript 1.4.35 → 1.4.37

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

@@ -10,7 +10,6 @@ import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
-import { IAppApi } from './IAppApi';
 /**
  * Core application interface
  */
@@ -180,6 +179,17 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param api Api
      */
     protected setApi(api: IApi): void;
+    /**
+     * Setup Api error handler
+     * @param api Api
+     * @param ignore401 Ignore 401 error try login
+     */
+    protected setApiErrorHandler(api: IApi, ignore401?: boolean): void;
+    /**
+     * Setup Api loading
+     * @param api Api
+     */
+    protected setApiLoading(api: IApi): void;
     /**
      * Api init call
      * @param data Data
@@ -220,13 +230,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param callback Callback
      */
     alertResult(result: IActionResult | string, callback?: NotificationReturn<void>): void;
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(appApi: IAppApi, relogin?: boolean, callback?: (result: RefreshTokenResult, successData?: string) => void): Promise<boolean>;
     /**
      * Authorize
      * @param token New token

package/lib/cjs/app/CoreApp.js

@@ -290,25 +290,22 @@ class CoreApp {
         // Base URL of the API
         api.baseUrl = this.settings.endpoint;
         // onRequest, show loading or not, rewrite the property to override default action
-        api.onRequest = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                this.notifier.showLoading();
-            }
-        };
-        // onComplete, hide loading, rewrite the property to override default action
-        api.onComplete = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                this.notifier.hideLoading();
-            }
-            this.lastCalled = true;
-        };
+        this.setApiLoading(api);
         // Global API error handler
+        this.setApiErrorHandler(api);
+    }
+    /**
+     * Setup Api error handler
+     * @param api Api
+     * @param ignore401 Ignore 401 error try login
+     */
+    setApiErrorHandler(api, ignore401 = false) {
         api.onError = (error) => {
             // Error code
             const status = error.response
                 ? api.transformResponse(error.response).status
                 : undefined;
-            if (status === 401) {
+            if (status === 401 && !ignore401) {
                 // When status is equal to 401, unauthorized, try login
                 this.tryLogin();
             }
@@ -318,6 +315,25 @@ class CoreApp {
             }
         };
     }
+    /**
+     * Setup Api loading
+     * @param api Api
+     */
+    setApiLoading(api) {
+        // onRequest, show loading or not, rewrite the property to override default action
+        api.onRequest = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.showLoading();
+            }
+        };
+        // onComplete, hide loading, rewrite the property to override default action
+        api.onComplete = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.hideLoading();
+            }
+            this.lastCalled = true;
+        };
+    }
     /**
      * Api init call
      * @param data Data
@@ -488,21 +504,6 @@ class CoreApp {
         const message = typeof result === 'string' ? result : this.formatResult(result);
         this.notifier.alert(message, callback);
     }
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(appApi, relogin = true, callback) {
-        return this.refreshToken({
-            callback,
-            data: appApi.getrefreshTokenData(),
-            relogin,
-            showLoading: false,
-            appApi
-        });
-    }
     /**
      * Authorize
      * @param token New token

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

@@ -7,7 +7,6 @@ import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 import { EntityStatus } from '../business/EntityStatus';
-import { IAppApi } from './IAppApi';
 /**
  * Detect IP callback interface
  */
@@ -47,10 +46,6 @@ export interface RefreshTokenProps<D extends object> {
      * Show loading bar or not
      */
     showLoading?: boolean;
-    /**
-     * Service application API
-     */
-    appApi?: IAppApi;
 }
 /**
  * App fields
@@ -158,13 +153,6 @@ export interface IApp {
      * @param callback Callback
      */
     alertResult(result: IActionResult | string, callback?: NotificationReturn<void>): void;
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(appApi: IAppApi, relogin?: boolean, callback?: (result: RefreshTokenResult, successData?: string) => void): Promise<boolean>;
     /**
      * Authorize
      * @param token New token

package/lib/cjs/index.d.ts

@@ -12,7 +12,6 @@ export * from './app/AppSettings';
 export * from './app/CoreApp';
 export * from './app/ExternalSettings';
 export * from './app/IApp';
-export * from './app/IAppApi';
 export * from './app/UserRole';
 export * from './bridges/BridgeUtils';
 export * from './bridges/IBridgeHost';

package/lib/cjs/index.js

@@ -31,7 +31,6 @@ __exportStar(require("./app/AppSettings"), exports);
 __exportStar(require("./app/CoreApp"), exports);
 __exportStar(require("./app/ExternalSettings"), exports);
 __exportStar(require("./app/IApp"), exports);
-__exportStar(require("./app/IAppApi"), exports);
 __exportStar(require("./app/UserRole"), exports);
 // bridges
 __exportStar(require("./bridges/BridgeUtils"), exports);

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

@@ -10,7 +10,6 @@ import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
-import { IAppApi } from './IAppApi';
 /**
  * Core application interface
  */
@@ -180,6 +179,17 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param api Api
      */
     protected setApi(api: IApi): void;
+    /**
+     * Setup Api error handler
+     * @param api Api
+     * @param ignore401 Ignore 401 error try login
+     */
+    protected setApiErrorHandler(api: IApi, ignore401?: boolean): void;
+    /**
+     * Setup Api loading
+     * @param api Api
+     */
+    protected setApiLoading(api: IApi): void;
     /**
      * Api init call
      * @param data Data
@@ -220,13 +230,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param callback Callback
      */
     alertResult(result: IActionResult | string, callback?: NotificationReturn<void>): void;
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(appApi: IAppApi, relogin?: boolean, callback?: (result: RefreshTokenResult, successData?: string) => void): Promise<boolean>;
     /**
      * Authorize
      * @param token New token

package/lib/mjs/app/CoreApp.js

@@ -264,25 +264,22 @@ export class CoreApp {
         // Base URL of the API
         api.baseUrl = this.settings.endpoint;
         // onRequest, show loading or not, rewrite the property to override default action
-        api.onRequest = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                this.notifier.showLoading();
-            }
-        };
-        // onComplete, hide loading, rewrite the property to override default action
-        api.onComplete = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                this.notifier.hideLoading();
-            }
-            this.lastCalled = true;
-        };
+        this.setApiLoading(api);
         // Global API error handler
+        this.setApiErrorHandler(api);
+    }
+    /**
+     * Setup Api error handler
+     * @param api Api
+     * @param ignore401 Ignore 401 error try login
+     */
+    setApiErrorHandler(api, ignore401 = false) {
         api.onError = (error) => {
             // Error code
             const status = error.response
                 ? api.transformResponse(error.response).status
                 : undefined;
-            if (status === 401) {
+            if (status === 401 && !ignore401) {
                 // When status is equal to 401, unauthorized, try login
                 this.tryLogin();
             }
@@ -292,6 +289,25 @@ export class CoreApp {
             }
         };
     }
+    /**
+     * Setup Api loading
+     * @param api Api
+     */
+    setApiLoading(api) {
+        // onRequest, show loading or not, rewrite the property to override default action
+        api.onRequest = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.showLoading();
+            }
+        };
+        // onComplete, hide loading, rewrite the property to override default action
+        api.onComplete = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.hideLoading();
+            }
+            this.lastCalled = true;
+        };
+    }
     /**
      * Api init call
      * @param data Data
@@ -462,21 +478,6 @@ export class CoreApp {
         const message = typeof result === 'string' ? result : this.formatResult(result);
         this.notifier.alert(message, callback);
     }
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(appApi, relogin = true, callback) {
-        return this.refreshToken({
-            callback,
-            data: appApi.getrefreshTokenData(),
-            relogin,
-            showLoading: false,
-            appApi
-        });
-    }
     /**
      * Authorize
      * @param token New token

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

@@ -7,7 +7,6 @@ import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 import { EntityStatus } from '../business/EntityStatus';
-import { IAppApi } from './IAppApi';
 /**
  * Detect IP callback interface
  */
@@ -47,10 +46,6 @@ export interface RefreshTokenProps<D extends object> {
      * Show loading bar or not
      */
     showLoading?: boolean;
-    /**
-     * Service application API
-     */
-    appApi?: IAppApi;
 }
 /**
  * App fields
@@ -158,13 +153,6 @@ export interface IApp {
      * @param callback Callback
      */
     alertResult(result: IActionResult | string, callback?: NotificationReturn<void>): void;
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(appApi: IAppApi, relogin?: boolean, callback?: (result: RefreshTokenResult, successData?: string) => void): Promise<boolean>;
     /**
      * Authorize
      * @param token New token

package/lib/mjs/index.d.ts

@@ -12,7 +12,6 @@ export * from './app/AppSettings';
 export * from './app/CoreApp';
 export * from './app/ExternalSettings';
 export * from './app/IApp';
-export * from './app/IAppApi';
 export * from './app/UserRole';
 export * from './bridges/BridgeUtils';
 export * from './bridges/IBridgeHost';

package/lib/mjs/index.js

@@ -14,7 +14,6 @@ export * from './app/AppSettings';
 export * from './app/CoreApp';
 export * from './app/ExternalSettings';
 export * from './app/IApp';
-export * from './app/IAppApi';
 export * from './app/UserRole';
 // bridges
 export * from './bridges/BridgeUtils';

package/package.json

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

package/src/app/CoreApp.ts

@@ -39,7 +39,6 @@ import {
 } from './IApp';
 import { UserRole } from './UserRole';
 import type CryptoJS from 'crypto-js';
-import { IAppApi } from './IAppApi';
 
 type CJType = typeof CryptoJS;
 let CJ: CJType;
@@ -447,28 +446,25 @@ export abstract class CoreApp<
         api.baseUrl = this.settings.endpoint;
 
         // onRequest, show loading or not, rewrite the property to override default action
-        api.onRequest = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                this.notifier.showLoading();
-            }
-        };
-
-        // onComplete, hide loading, rewrite the property to override default action
-        api.onComplete = (data) => {
-            if (data.showLoading == null || data.showLoading) {
-                this.notifier.hideLoading();
-            }
-            this.lastCalled = true;
-        };
+        this.setApiLoading(api);
 
         // Global API error handler
+        this.setApiErrorHandler(api);
+    }
+
+    /**
+     * Setup Api error handler
+     * @param api Api
+     * @param ignore401 Ignore 401 error try login
+     */
+    protected setApiErrorHandler(api: IApi, ignore401: boolean = false) {
         api.onError = (error: ApiDataError) => {
             // Error code
             const status = error.response
                 ? api.transformResponse(error.response).status
                 : undefined;
 
-            if (status === 401) {
+            if (status === 401 && !ignore401) {
                 // When status is equal to 401, unauthorized, try login
                 this.tryLogin();
             } else {
@@ -478,6 +474,27 @@ export abstract class CoreApp<
         };
     }
 
+    /**
+     * Setup Api loading
+     * @param api Api
+     */
+    protected setApiLoading(api: IApi) {
+        // onRequest, show loading or not, rewrite the property to override default action
+        api.onRequest = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.showLoading();
+            }
+        };
+
+        // onComplete, hide loading, rewrite the property to override default action
+        api.onComplete = (data) => {
+            if (data.showLoading == null || data.showLoading) {
+                this.notifier.hideLoading();
+            }
+            this.lastCalled = true;
+        };
+    }
+
     /**
      * Api init call
      * @param data Data
@@ -701,26 +718,6 @@ export abstract class CoreApp<
         this.notifier.alert(message, callback);
     }
 
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(
-        appApi: IAppApi,
-        relogin: boolean = true,
-        callback?: (result: RefreshTokenResult, successData?: string) => void
-    ) {
-        return this.refreshToken({
-            callback,
-            data: appApi.getrefreshTokenData(),
-            relogin,
-            showLoading: false,
-            appApi
-        });
-    }
-
     /**
      * Authorize
      * @param token New token

package/src/app/IApp.ts

@@ -19,7 +19,6 @@ import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 import { EntityStatus } from '../business/EntityStatus';
-import { IAppApi } from './IAppApi';
 
 /**
  * Detect IP callback interface
@@ -70,11 +69,6 @@ export interface RefreshTokenProps<D extends object> {
      * Show loading bar or not
      */
     showLoading?: boolean;
-
-    /**
-     * Service application API
-     */
-    appApi?: IAppApi;
 }
 
 /**
@@ -214,18 +208,6 @@ export interface IApp {
         callback?: NotificationReturn<void>
     ): void;
 
-    /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param relogin Relogin try
-     * @param callback Callback
-     */
-    apiLogin(
-        appApi: IAppApi,
-        relogin?: boolean,
-        callback?: (result: RefreshTokenResult, successData?: string) => void
-    ): Promise<boolean>;
-
     /**
      * Authorize
      * @param token New token

package/src/index.ts

@@ -15,7 +15,6 @@ export * from './app/AppSettings';
 export * from './app/CoreApp';
 export * from './app/ExternalSettings';
 export * from './app/IApp';
-export * from './app/IAppApi';
 export * from './app/UserRole';
 
 // bridges

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

@@ -1,24 +0,0 @@
-import { IApi } from '@etsoo/restclient';
-/**
- * Service application API, Implement interface calls between different services
- * 服务程序接口，实现不同服务之间的接口调用
- */
-export interface IAppApi {
-    /**
-     * API
-     */
-    readonly api: IApi<any>;
-    /**
-     * Service id
-     */
-    readonly serviceId: number;
-    /**
-     * Authorize the API
-     * @param token Access token
-     */
-    authorize(token: string): void;
-    /**
-     * Get refresh token data
-     */
-    getrefreshTokenData(): Object;
-}

package/lib/cjs/app/IAppApi.js

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

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

@@ -1,24 +0,0 @@
-import { IApi } from '@etsoo/restclient';
-/**
- * Service application API, Implement interface calls between different services
- * 服务程序接口，实现不同服务之间的接口调用
- */
-export interface IAppApi {
-    /**
-     * API
-     */
-    readonly api: IApi<any>;
-    /**
-     * Service id
-     */
-    readonly serviceId: number;
-    /**
-     * Authorize the API
-     * @param token Access token
-     */
-    authorize(token: string): void;
-    /**
-     * Get refresh token data
-     */
-    getrefreshTokenData(): Object;
-}

package/lib/mjs/app/IAppApi.js

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

package/src/app/IAppApi.ts

@@ -1,28 +0,0 @@
-import { IApi } from '@etsoo/restclient';
-
-/**
- * Service application API, Implement interface calls between different services
- * 服务程序接口，实现不同服务之间的接口调用
- */
-export interface IAppApi {
-    /**
-     * API
-     */
-    readonly api: IApi<any>;
-
-    /**
-     * Service id
-     */
-    readonly serviceId: number;
-
-    /**
-     * Authorize the API
-     * @param token Access token
-     */
-    authorize(token: string): void;
-
-    /**
-     * Get refresh token data
-     */
-    getrefreshTokenData(): Object;
-}