@etsoo/appscript 1.4.33 → 1.4.35

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

@@ -10,6 +10,7 @@ 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
  */
@@ -219,6 +220,13 @@ 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

@@ -488,6 +488,21 @@ 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,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
@@ -153,6 +158,13 @@ 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/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/def/ListItem.d.ts

@@ -1,7 +1,7 @@
 /**
  * List item definition
  */
-export type ListItem<T> = {
+export type ListItem<T, E = any> = {
     /**
      * Label, '-' for divider
      */
@@ -13,5 +13,5 @@ export type ListItem<T> = {
     /**
      * Action, string for URL, any for state
      */
-    action?: string | [string, any] | (() => PromiseLike<void> | void);
+    action?: string | [string, any] | ((event: E) => PromiseLike<void> | void);
 };

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

@@ -10,6 +10,7 @@ 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
  */
@@ -219,6 +220,13 @@ 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

@@ -462,6 +462,21 @@ 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,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
@@ -153,6 +158,13 @@ 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/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/def/ListItem.d.ts

@@ -1,7 +1,7 @@
 /**
  * List item definition
  */
-export type ListItem<T> = {
+export type ListItem<T, E = any> = {
     /**
      * Label, '-' for divider
      */
@@ -13,5 +13,5 @@ export type ListItem<T> = {
     /**
      * Action, string for URL, any for state
      */
-    action?: string | [string, any] | (() => PromiseLike<void> | void);
+    action?: string | [string, any] | ((event: E) => PromiseLike<void> | void);
 };

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.33",
+    "version": "1.4.35",
     "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

@@ -39,6 +39,7 @@ import {
 } from './IApp';
 import { UserRole } from './UserRole';
 import type CryptoJS from 'crypto-js';
+import { IAppApi } from './IAppApi';
 
 type CJType = typeof CryptoJS;
 let CJ: CJType;
@@ -700,6 +701,26 @@ 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,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;
 }
 
 /**
@@ -208,6 +214,18 @@ 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/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/def/ListItem.ts

@@ -1,7 +1,7 @@
 /**
  * List item definition
  */
-export type ListItem<T> = {
+export type ListItem<T, E = any> = {
     /**
      * Label, '-' for divider
      */
@@ -15,5 +15,5 @@ export type ListItem<T> = {
     /**
      * Action, string for URL, any for state
      */
-    action?: string | [string, any] | (() => PromiseLike<void> | void);
+    action?: string | [string, any] | ((event: E) => PromiseLike<void> | void);
 };

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