@etsoo/materialui 1.2.98 → 1.3.0

package/lib/app/CommonApp.d.ts

@@ -27,7 +27,7 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken<D extends object = Partial<RefreshTokenRQ>>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Try login
      * @param data Additional data

package/lib/app/IAppApi.d.ts

@@ -0,0 +1,32 @@
+import { IApi } from "@etsoo/restclient";
+import { ISmartERPUser } from "./ISmartERPUser";
+import { RefreshTokenRQ } from "@etsoo/appscript";
+/**
+ * Service application API, Implement interface calls between different services
+ * 服务程序接口，实现不同服务之间的接口调用
+ */
+export interface IAppApi {
+    /**
+     * API
+     */
+    readonly api: IApi<any>;
+    /**
+     * Service id
+     */
+    readonly serviceId: number;
+    /**
+     * Is once authorized
+     */
+    get onceAuthorized(): boolean;
+    /**
+     * Authorize the API
+     * @param user SmartERP user
+     * @param refreshToken SmartERP user refresh token
+     * @param token Access token
+     */
+    authorize(user: ISmartERPUser, refreshToken: string, token: string): void;
+    /**
+     * Get refresh token data
+     */
+    getrefreshTokenData(): Partial<RefreshTokenRQ>;
+}

package/lib/app/IAppApi.js

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

package/lib/app/IServiceApp.d.ts

@@ -1,6 +1,7 @@
-import { IApi } from "@etsoo/appscript";
+import { IApi, RefreshTokenResult } from "@etsoo/appscript";
 import { IServiceUser } from "./IServiceUser";
 import { ReactAppType } from "./ReactApp";
+import { IAppApi } from "./IAppApi";
 /**
  * Service application interface
  */
@@ -13,6 +14,12 @@ export interface IServiceApp extends ReactAppType {
      * Service user
      */
     readonly serviceUser?: IServiceUser;
+    /**
+     * Service application API login
+     * @param appApi Service application API
+     * @param callback Callback
+     */
+    apiLogin(appApi: IAppApi, callback?: (result: RefreshTokenResult, successData?: string) => void): Promise<boolean>;
     /**
      * Load SmartERP core
      */

package/lib/app/ServiceApp.d.ts

@@ -1,10 +1,17 @@
-import { IApi, RefreshTokenProps, RefreshTokenRQ } from "@etsoo/appscript";
+import { IApi, RefreshTokenProps, RefreshTokenResult, RefreshTokenRQ } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
 import { IServiceUser } from "./IServiceUser";
 import { ISmartERPUser } from "./ISmartERPUser";
 import { ReactApp } from "./ReactApp";
+import { IAppApi } from "./IAppApi";
+/**
+ * Service application refresh token properties
+ */
+export interface ServiceRefreshTokenProps extends RefreshTokenProps<Partial<RefreshTokenRQ>> {
+    appApi?: IAppApi;
+}
 /**
  * Core Service App
  * Service login to core system, get the refesh token and access token
@@ -32,6 +39,12 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param name Application name
      */
     constructor(settings: S, name: string);
+    /**
+     * Service application API login
+     * @param appApi Service application API
+     * @param callback Callback
+     */
+    apiLogin(appApi: IAppApi, callback?: (result: RefreshTokenResult, successData?: string) => void): Promise<boolean>;
     /**
      * Load SmartERP core
      */
@@ -46,7 +59,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken(props?: ServiceRefreshTokenProps): Promise<boolean>;
     /**
      * Service decrypt message
      * @param messageEncrypted Encrypted message

package/lib/app/ServiceApp.js

@@ -40,6 +40,20 @@ export class ServiceApp extends ReactApp {
         api.baseUrl = settings.serviceEndpoint;
         this.serviceApi = api;
     }
+    /**
+     * Service application API login
+     * @param appApi Service application API
+     * @param callback Callback
+     */
+    apiLogin(appApi, callback) {
+        return this.refreshToken({
+            callback,
+            data: appApi.getrefreshTokenData(),
+            relogin: false,
+            showLoading: false,
+            appApi
+        });
+    }
     /**
      * Load SmartERP core
      */
@@ -138,10 +152,13 @@ export class ServiceApp extends ReactApp {
             }
             // Login
             if (appApi) {
+                if (!appApi.onceAuthorized) {
+                    // API handling
+                    this.setApiLoading(appApi.api);
+                    this.setApiErrorHandler(appApi.api, true);
+                }
                 // Authorize external service application API
-                appApi.authorize(serviceResult.data.token);
-                // Update core system token, otherwise will be failed for upcoming calls
-                this.userLogin(userData, refreshToken, true);
+                appApi.authorize(userData, refreshToken, serviceResult.data.token);
             }
             else {
                 // Authorize local service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.98",
+  "version": "1.3.0",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.35",
+    "@etsoo/appscript": "^1.4.37",
     "@etsoo/notificationbase": "^1.1.28",
     "@etsoo/react": "^1.7.7",
     "@etsoo/shared": "^1.2.10",

package/src/app/CommonApp.ts

@@ -56,7 +56,7 @@ export abstract class CommonApp<
    * Refresh token
    * @param props Props
    */
-  override async refreshToken<D extends object = RefreshTokenRQ>(
+  override async refreshToken<D extends object = Partial<RefreshTokenRQ>>(
     props?: RefreshTokenProps<D>
   ) {
     // Destruct

package/src/app/IAppApi.ts

@@ -0,0 +1,37 @@
+import { IApi } from "@etsoo/restclient";
+import { ISmartERPUser } from "./ISmartERPUser";
+import { RefreshTokenRQ } from "@etsoo/appscript";
+
+/**
+ * Service application API, Implement interface calls between different services
+ * 服务程序接口，实现不同服务之间的接口调用
+ */
+export interface IAppApi {
+  /**
+   * API
+   */
+  readonly api: IApi<any>;
+
+  /**
+   * Service id
+   */
+  readonly serviceId: number;
+
+  /**
+   * Is once authorized
+   */
+  get onceAuthorized(): boolean;
+
+  /**
+   * Authorize the API
+   * @param user SmartERP user
+   * @param refreshToken SmartERP user refresh token
+   * @param token Access token
+   */
+  authorize(user: ISmartERPUser, refreshToken: string, token: string): void;
+
+  /**
+   * Get refresh token data
+   */
+  getrefreshTokenData(): Partial<RefreshTokenRQ>;
+}

package/src/app/IServiceApp.ts

@@ -1,6 +1,7 @@
-import { IApi } from "@etsoo/appscript";
+import { IApi, RefreshTokenResult } from "@etsoo/appscript";
 import { IServiceUser } from "./IServiceUser";
 import { ReactAppType } from "./ReactApp";
+import { IAppApi } from "./IAppApi";
 
 /**
  * Service application interface
@@ -16,6 +17,16 @@ export interface IServiceApp extends ReactAppType {
    */
   readonly serviceUser?: IServiceUser;
 
+  /**
+   * Service application API login
+   * @param appApi Service application API
+   * @param callback Callback
+   */
+  apiLogin(
+    appApi: IAppApi,
+    callback?: (result: RefreshTokenResult, successData?: string) => void
+  ): Promise<boolean>;
+
   /**
    * Load SmartERP core
    */

package/src/app/ServiceApp.ts

@@ -16,6 +16,15 @@ import { IServicePageData } from "./IServicePage";
 import { IServiceUser, ServiceLoginResult } from "./IServiceUser";
 import { ISmartERPUser } from "./ISmartERPUser";
 import { ReactApp } from "./ReactApp";
+import { IAppApi } from "./IAppApi";
+
+/**
+ * Service application refresh token properties
+ */
+export interface ServiceRefreshTokenProps
+  extends RefreshTokenProps<Partial<RefreshTokenRQ>> {
+  appApi?: IAppApi;
+}
 
 /**
  * Core Service App
@@ -75,6 +84,24 @@ export class ServiceApp<
     this.serviceApi = api;
   }
 
+  /**
+   * Service application API login
+   * @param appApi Service application API
+   * @param callback Callback
+   */
+  apiLogin(
+    appApi: IAppApi,
+    callback?: (result: RefreshTokenResult, successData?: string) => void
+  ) {
+    return this.refreshToken({
+      callback,
+      data: appApi.getrefreshTokenData(),
+      relogin: false,
+      showLoading: false,
+      appApi
+    });
+  }
+
   /**
    * Load SmartERP core
    */
@@ -112,9 +139,7 @@ export class ServiceApp<
    * Refresh token
    * @param props Props
    */
-  override async refreshToken<D extends object = RefreshTokenRQ>(
-    props?: RefreshTokenProps<D>
-  ) {
+  override async refreshToken(props?: ServiceRefreshTokenProps) {
     // Destruct
     const {
       appApi,
@@ -204,11 +229,14 @@ export class ServiceApp<
 
       // Login
       if (appApi) {
-        // Authorize external service application API
-        appApi.authorize(serviceResult.data.token);
+        if (!appApi.onceAuthorized) {
+          // API handling
+          this.setApiLoading(appApi.api);
+          this.setApiErrorHandler(appApi.api, true);
+        }
 
-        // Update core system token, otherwise will be failed for upcoming calls
-        this.userLogin(userData, refreshToken, true);
+        // Authorize external service application API
+        appApi.authorize(userData, refreshToken, serviceResult.data.token);
       } else {
         // Authorize local service
         this.userLoginEx(userData, refreshToken, serviceResult.data);