@etsoo/materialui 1.3.90 → 1.3.92

package/lib/app/IServiceApp.d.ts

@@ -1,25 +1,15 @@
+import { IApi } from "@etsoo/appscript";
 import { ReactAppType } from "./ReactApp";
 /**
  * Service application interface
  */
 export interface IServiceApp extends ReactAppType {
     /**
-     * Load core system UI
-     */
-    loadCore(): void;
-    /**
-     * Service decrypt message
-     * @param messageEncrypted Encrypted message
-     * @param passphrase Secret passphrase
-     * @returns Pure text
+     * Core system API
      */
-    serviceDecrypt(messageEncrypted: string, passphrase?: string): string | undefined;
+    readonly coreApi: IApi;
     /**
-     * Service encrypt message
-     * @param message Message
-     * @param passphrase Secret passphrase
-     * @param iterations Iterations, 1000 times, 1 - 99
-     * @returns Result
+     * Load core system UI
      */
-    serviceEncrypt(message: string, passphrase?: string, iterations?: number): string | undefined;
+    loadCore(): void;
 }

package/lib/app/IServiceAppSettings.d.ts

@@ -1,11 +1,11 @@
 import { IAppSettings } from "@etsoo/appscript";
-import { IdType } from "@etsoo/shared";
 /**
  * Service app settings interface
  */
-export interface IServiceAppSettings<S extends IdType = number> extends IAppSettings {
+export interface IServiceAppSettings extends IAppSettings {
     /**
-     * Service application id
+     * Application id
+     * 程序编号
      */
-    readonly appId: S;
+    appId: number;
 }

package/lib/app/IServiceUser.d.ts

@@ -11,12 +11,14 @@ export interface IServiceUser extends IUser {
     readonly uid: string;
     /**
      * Organization name
+     * 机构名称
      */
     readonly organizationName: string;
     /**
      * Service (App) passphrase encrypted
+     * 服务（应用）加密密钥
      */
-    readonly servicePassphrase: string;
+    readonly passphrase?: string;
 }
 /**
  * Service user login result

package/lib/app/ServiceApp.d.ts

@@ -1,4 +1,4 @@
-import { ExternalEndpoint, IApi, InitCallDto, InitCallResult } from "@etsoo/appscript";
+import { ExternalEndpoint, IApi } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
@@ -19,10 +19,6 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * Core system API
      */
     readonly coreApi: IApi;
-    /**
-     * Service passphrase
-     */
-    protected servicePassphrase: string;
     /**
      * Constructor
      * @param settings Settings
@@ -34,12 +30,6 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * Load core system UI
      */
     loadCore(): void;
-    /**
-     * Api init call, for service application, call the core system API
-     * @param data Data
-     * @returns Result
-     */
-    apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
     /**
      * Go to the login page
      * @param tryLogin Try to login again
@@ -54,19 +44,4 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param dispatch User state dispatch
      */
     userLogin(user: U, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
-    /**
-     * Service decrypt message
-     * @param messageEncrypted Encrypted message
-     * @param passphrase Secret passphrase
-     * @returns Pure text
-     */
-    serviceDecrypt(messageEncrypted: string, passphrase?: string): string | undefined;
-    /**
-     * Service encrypt message
-     * @param message Message
-     * @param passphrase Secret passphrase
-     * @param iterations Iterations, 1000 times, 1 - 99
-     * @returns Result
-     */
-    serviceEncrypt(message: string, passphrase?: string, iterations?: number): string;
 }

package/lib/app/ServiceApp.js

@@ -16,14 +16,6 @@ export class ServiceApp extends ReactApp {
      */
     constructor(settings, name, debug = false) {
         super(settings, name, debug);
-        /**
-         * Service passphrase
-         */
-        this.servicePassphrase = "";
-        // Check
-        if (settings.appId == null) {
-            throw new Error("Service Application ID is required.");
-        }
         const coreEndpoint = settings.endpoints?.core;
         if (coreEndpoint == null) {
             throw new Error("Core API endpont is required.");
@@ -42,14 +34,6 @@ export class ServiceApp extends ReactApp {
             BridgeUtils.host.loadApp(coreName);
         }
     }
-    /**
-     * Api init call, for service application, call the core system API
-     * @param data Data
-     * @returns Result
-     */
-    async apiInitCall(data) {
-        return await this.coreApi.put(this.initCallApi, data);
-    }
     /**
      * Go to the login page
      * @param tryLogin Try to login again
@@ -88,27 +72,11 @@ export class ServiceApp extends ReactApp {
     userLogin(user, refreshToken, keep, dispatch) {
         // Super call, set token
         super.userLogin(user, refreshToken, keep, dispatch);
-        // Set service passphrase
-        this.servicePassphrase =
-            this.decrypt(user.servicePassphrase, `${user.uid}-${this.settings.appId}`) ?? "";
-    }
-    /**
-     * Service decrypt message
-     * @param messageEncrypted Encrypted message
-     * @param passphrase Secret passphrase
-     * @returns Pure text
-     */
-    serviceDecrypt(messageEncrypted, passphrase) {
-        return this.decrypt(messageEncrypted, passphrase ?? this.servicePassphrase);
-    }
-    /**
-     * Service encrypt message
-     * @param message Message
-     * @param passphrase Secret passphrase
-     * @param iterations Iterations, 1000 times, 1 - 99
-     * @returns Result
-     */
-    serviceEncrypt(message, passphrase, iterations) {
-        return this.encrypt(message, passphrase ?? this.servicePassphrase, iterations);
+        if (user.passphrase) {
+            // Save the passphrase
+            const passphrase = this.decrypt(user.passphrase, `${user.uid}-${this.settings.appId}`);
+            if (passphrase)
+                this.updatePassphrase(passphrase);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.90",
+  "version": "1.3.92",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.22",
+    "@etsoo/appscript": "^1.5.25",
     "@etsoo/notificationbase": "^1.1.48",
     "@etsoo/react": "^1.7.68",
     "@etsoo/shared": "^1.2.46",

package/src/app/IServiceApp.ts

@@ -1,3 +1,4 @@
+import { IApi } from "@etsoo/appscript";
 import { ReactAppType } from "./ReactApp";
 
 /**
@@ -5,31 +6,12 @@ import { ReactAppType } from "./ReactApp";
  */
 export interface IServiceApp extends ReactAppType {
   /**
-   * Load core system UI
+   * Core system API
    */
-  loadCore(): void;
+  readonly coreApi: IApi;
 
   /**
-   * Service decrypt message
-   * @param messageEncrypted Encrypted message
-   * @param passphrase Secret passphrase
-   * @returns Pure text
-   */
-  serviceDecrypt(
-    messageEncrypted: string,
-    passphrase?: string
-  ): string | undefined;
-
-  /**
-   * Service encrypt message
-   * @param message Message
-   * @param passphrase Secret passphrase
-   * @param iterations Iterations, 1000 times, 1 - 99
-   * @returns Result
+   * Load core system UI
    */
-  serviceEncrypt(
-    message: string,
-    passphrase?: string,
-    iterations?: number
-  ): string | undefined;
+  loadCore(): void;
 }

package/src/app/IServiceAppSettings.ts

@@ -1,13 +1,12 @@
 import { IAppSettings } from "@etsoo/appscript";
-import { IdType } from "@etsoo/shared";
 
 /**
  * Service app settings interface
  */
-export interface IServiceAppSettings<S extends IdType = number>
-  extends IAppSettings {
+export interface IServiceAppSettings extends IAppSettings {
   /**
-   * Service application id
+   * Application id
+   * 程序编号
    */
-  readonly appId: S;
+  appId: number;
 }

package/src/app/IServiceUser.ts

@@ -13,13 +13,15 @@ export interface IServiceUser extends IUser {
 
   /**
    * Organization name
+   * 机构名称
    */
   readonly organizationName: string;
 
   /**
    * Service (App) passphrase encrypted
+   * 服务（应用）加密密钥
    */
-  readonly servicePassphrase: string;
+  readonly passphrase?: string;
 }
 
 /**

package/src/app/ServiceApp.ts

@@ -1,10 +1,4 @@
-import {
-  BridgeUtils,
-  ExternalEndpoint,
-  IApi,
-  InitCallDto,
-  InitCallResult
-} from "@etsoo/appscript";
+import { BridgeUtils, ExternalEndpoint, IApi } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
@@ -37,11 +31,6 @@ export class ServiceApp<
    */
   readonly coreApi: IApi;
 
-  /**
-   * Service passphrase
-   */
-  protected servicePassphrase: string = "";
-
   /**
    * Constructor
    * @param settings Settings
@@ -51,11 +40,6 @@ export class ServiceApp<
   constructor(settings: S, name: string, debug: boolean = false) {
     super(settings, name, debug);
 
-    // Check
-    if (settings.appId == null) {
-      throw new Error("Service Application ID is required.");
-    }
-
     const coreEndpoint = settings.endpoints?.core;
     if (coreEndpoint == null) {
       throw new Error("Core API endpont is required.");
@@ -76,15 +60,6 @@ export class ServiceApp<
     }
   }
 
-  /**
-   * Api init call, for service application, call the core system API
-   * @param data Data
-   * @returns Result
-   */
-  override async apiInitCall(data: InitCallDto) {
-    return await this.coreApi.put<InitCallResult>(this.initCallApi, data);
-  }
-
   /**
    * Go to the login page
    * @param tryLogin Try to login again
@@ -132,36 +107,13 @@ export class ServiceApp<
     // Super call, set token
     super.userLogin(user, refreshToken, keep, dispatch);
 
-    // Set service passphrase
-    this.servicePassphrase =
-      this.decrypt(
-        user.servicePassphrase,
+    if (user.passphrase) {
+      // Save the passphrase
+      const passphrase = this.decrypt(
+        user.passphrase,
         `${user.uid}-${this.settings.appId}`
-      ) ?? "";
-  }
-
-  /**
-   * Service decrypt message
-   * @param messageEncrypted Encrypted message
-   * @param passphrase Secret passphrase
-   * @returns Pure text
-   */
-  serviceDecrypt(messageEncrypted: string, passphrase?: string) {
-    return this.decrypt(messageEncrypted, passphrase ?? this.servicePassphrase);
-  }
-
-  /**
-   * Service encrypt message
-   * @param message Message
-   * @param passphrase Secret passphrase
-   * @param iterations Iterations, 1000 times, 1 - 99
-   * @returns Result
-   */
-  serviceEncrypt(message: string, passphrase?: string, iterations?: number) {
-    return this.encrypt(
-      message,
-      passphrase ?? this.servicePassphrase,
-      iterations
-    );
+      );
+      if (passphrase) this.updatePassphrase(passphrase);
+    }
   }
 }