@etsoo/appscript 1.4.34 → 1.4.36

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

@@ -179,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

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

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

@@ -7,6 +7,7 @@ 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
  */
@@ -46,6 +47,10 @@ export interface RefreshTokenProps<D extends object> {
      * Show loading bar or not
      */
     showLoading?: boolean;
+    /**
+     * Service application API
+     */
+    appApi?: IAppApi;
 }
 /**
  * App fields

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

@@ -0,0 +1,24 @@
+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

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

package/lib/cjs/index.d.ts

@@ -12,6 +12,7 @@ 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,6 +31,7 @@ __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

@@ -179,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

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

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

@@ -7,6 +7,7 @@ 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
  */
@@ -46,6 +47,10 @@ export interface RefreshTokenProps<D extends object> {
      * Show loading bar or not
      */
     showLoading?: boolean;
+    /**
+     * Service application API
+     */
+    appApi?: IAppApi;
 }
 /**
  * App fields

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

@@ -0,0 +1,24 @@
+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

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

package/lib/mjs/index.d.ts

@@ -12,6 +12,7 @@ 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,6 +14,7 @@ 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.34",
+    "version": "1.4.36",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,7 +52,7 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.27",
+        "@etsoo/notificationbase": "^1.1.28",
         "@etsoo/restclient": "^1.0.89",
         "@etsoo/shared": "^1.2.10",
         "crypto-js": "^4.1.1"

package/src/app/CoreApp.ts

@@ -446,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 {
@@ -477,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

package/src/app/IApp.ts

@@ -19,6 +19,7 @@ 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
@@ -69,6 +70,11 @@ export interface RefreshTokenProps<D extends object> {
      * Show loading bar or not
      */
     showLoading?: boolean;
+
+    /**
+     * Service application API
+     */
+    appApi?: IAppApi;
 }
 
 /**

package/src/app/IAppApi.ts

@@ -0,0 +1,28 @@
+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/src/index.ts

@@ -15,6 +15,7 @@ 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