@etsoo/materialui 1.3.87 → 1.3.89

package/src/app/CommonApp.ts

@@ -56,16 +56,9 @@ export abstract class CommonApp<
    * Refresh token
    * @param props Props
    */
-  override async refreshToken<D extends object = Partial<RefreshTokenRQ>>(
-    props?: RefreshTokenProps<D>
-  ) {
+  override async refreshToken(props?: RefreshTokenProps) {
     // Destruct
-    const {
-      callback,
-      data,
-      relogin = false,
-      showLoading = false
-    } = props ?? {};
+    const { callback, showLoading = false } = props ?? {};
 
     // Token
     const token = this.getCacheToken();
@@ -76,10 +69,7 @@ export abstract class CommonApp<
 
     // Reqest data
     const rq: RefreshTokenRQ = {
-      deviceId: this.deviceId,
-      region: this.region,
-      timezone: this.getTimeZone(),
-      ...data
+      deviceId: this.deviceId
     };
 
     // Login result type
@@ -132,56 +122,12 @@ export abstract class CommonApp<
     if (result == null) return false;
 
     if (!result.ok) {
-      if (result.type === "TokenExpired" && relogin) {
-        // Try login
-        // Dialog to receive password
-        var labels = this.getLabels("reloginTip", "login");
-        this.notifier.prompt(
-          labels.reloginTip,
-          async (pwd) => {
-            if (pwd == null) {
-              this.toLoginPage();
-              return;
-            }
-
-            // Set password for the action
-            rq.pwd = this.encrypt(this.hash(pwd));
-
-            // Submit again
-            const result = await this.api.put<LoginResult>(
-              "Auth/RefreshToken",
-              rq,
-              payload
-            );
-
-            if (result == null) return;
-
-            if (result.ok) {
-              success(result, (loginResult: RefreshTokenResult) => {
-                if (loginResult === true) {
-                  if (callback) callback(true);
-                  return;
-                }
-
-                const message = this.formatRefreshTokenResult(loginResult);
-                if (message) this.notifier.alert(message);
-              });
-              return;
-            }
-
-            // Popup message
-            this.alertResult(result);
-            return false;
-          },
-          labels.login,
-          { type: "password" }
-        );
-
-        // Fake truth to avoid reloading
-        return true;
-      }
+      // Remove the wrong token
+      this.clearCacheToken();
 
+      // Callback
       if (callback) callback(result);
+
       return false;
     }
 
@@ -190,24 +136,18 @@ export abstract class CommonApp<
 
   /**
    * Try login
-   * @param data Additional data
    * @param showLoading Show loading bar or not
    * @returns Result
    */
-  override async tryLogin<D extends object = RefreshTokenRQ>(
-    data?: D,
-    showLoading?: boolean
-  ) {
+  override async tryLogin(showLoading?: boolean) {
     // Reset user state
-    const result = await super.tryLogin(data);
+    const result = await super.tryLogin(showLoading);
     if (!result) return false;
 
     // Refresh token
     return await this.refreshToken({
       callback: (result) => this.doRefreshTokenResult(result),
-      data,
-      showLoading,
-      relogin: true
+      showLoading
     });
   }
 }

package/src/app/IServiceApp.ts

@@ -1,36 +1,13 @@
-import { IApi, RefreshTokenResult } from "@etsoo/appscript";
-import { IServiceUser } from "./IServiceUser";
 import { ReactAppType } from "./ReactApp";
-import { IAppApi } from "./IAppApi";
 
 /**
  * Service application interface
  */
 export interface IServiceApp extends ReactAppType {
   /**
-   * Service API
+   * Load core system UI
    */
-  readonly serviceApi: IApi;
-
-  /**
-   * 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
-   */
-  loadSmartERP(): void;
+  loadCore(): void;
 
   /**
    * Service decrypt message

package/src/app/IServiceAppSettings.ts

@@ -7,7 +7,7 @@ import { IdType } from "@etsoo/shared";
 export interface IServiceAppSettings<S extends IdType = number>
   extends IAppSettings {
   /**
-   * Service id
+   * Service application id
    */
-  readonly serviceId: S;
+  readonly appId: S;
 }

package/src/app/IServiceUser.ts

@@ -16,11 +16,6 @@ export interface IServiceUser extends IUser {
    */
   readonly organizationName: string;
 
-  /**
-   * Service (App) device id
-   */
-  readonly serviceDeviceId: string;
-
   /**
    * Service (App) passphrase encrypted
    */

package/src/app/ReactApp.ts

@@ -1,7 +1,6 @@
 import {
   BridgeUtils,
   CoreApp,
-  createClient,
   FormatResultCustomCallback,
   IApp,
   IAppSettings,
@@ -253,7 +252,7 @@ export class ReactApp<
   constructor(settings: S, name: string, debug: boolean = false) {
     super(
       settings,
-      createClient(),
+      null,
       ReactApp.createNotifier(debug),
       new WindowStorage(),
       name,

package/src/app/ServiceApp.ts

@@ -1,29 +1,11 @@
-import {
-  BridgeUtils,
-  createClient,
-  IApi,
-  IApiPayload,
-  RefreshTokenProps,
-  RefreshTokenResult,
-  RefreshTokenRQ
-} from "@etsoo/appscript";
-import { CoreConstants } from "@etsoo/react";
-import { DomUtils, IActionResult } from "@etsoo/shared";
+import { BridgeUtils, ExternalEndpoint, IApi } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
-import { IServiceUser, ServiceLoginResult } from "./IServiceUser";
-import { ISmartERPUser } from "./ISmartERPUser";
+import { IServiceUser } from "./IServiceUser";
 import { ReactApp } from "./ReactApp";
-import { IAppApi } from "./IAppApi";
 
-/**
- * Service application refresh token properties
- */
-export interface ServiceRefreshTokenProps
-  extends RefreshTokenProps<Partial<RefreshTokenRQ>> {
-  appApi?: IAppApi;
-}
+const coreName = "core";
 
 /**
  * Core Service App
@@ -36,24 +18,18 @@ export class ServiceApp<
     P extends IServicePageData = IServicePageData,
     S extends IServiceAppSettings = IServiceAppSettings
   >
-  extends ReactApp<S, ISmartERPUser, P>
+  extends ReactApp<S, U, P>
   implements IServiceApp
 {
   /**
-   * Service API
+   * Core endpoint
    */
-  readonly serviceApi: IApi;
+  protected coreEndpoint: ExternalEndpoint;
 
-  private _serviceUser?: U;
   /**
-   * Service user
+   * Core system API
    */
-  get serviceUser() {
-    return this._serviceUser;
-  }
-  protected set serviceUser(value: U | undefined) {
-    this._serviceUser = value;
-  }
+  readonly coreApi: IApi;
 
   /**
    * Service passphrase
@@ -70,46 +46,27 @@ export class ServiceApp<
     super(settings, name, debug);
 
     // Check
-    if (settings.serviceId == null || settings.serviceEndpoint == null) {
-      throw new Error("No service settings");
+    if (settings.appId == null) {
+      throw new Error("Service Application ID is required.");
     }
 
-    // Service API
-    const api = createClient();
-    this.setApi(api);
-
-    // Fix the baseUrl done by setupApi (Default is the settings.endpoint)
-    api.baseUrl = settings.serviceEndpoint;
-
-    this.serviceApi = api;
-  }
+    const coreEndpoint = settings.endpoints?.core;
+    if (coreEndpoint == null) {
+      throw new Error("Core API endpont is required.");
+    }
+    this.coreEndpoint = coreEndpoint;
 
-  /**
-   * 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
-    });
+    this.coreApi = this.createApi(coreName, coreEndpoint);
   }
 
   /**
-   * Load SmartERP core
+   * Load core system UI
    */
-  loadSmartERP() {
+  loadCore() {
     if (BridgeUtils.host == null) {
-      window.location.href = this.settings.webUrl;
+      globalThis.location.href = this.coreEndpoint.webUrl;
     } else {
-      BridgeUtils.host.loadApp("core");
+      BridgeUtils.host.loadApp(coreName);
     }
   }
 
@@ -119,193 +76,53 @@ export class ServiceApp<
    * @param removeUrl Remove current URL for reuse
    */
   override toLoginPage(tryLogin?: boolean, removeUrl?: boolean) {
-    const parameters = `?serviceId=${this.settings.serviceId}&${
-      DomUtils.CultureField
-    }=${this.culture}${tryLogin ? "" : "&tryLogin=false"}${
-      removeUrl ? "" : "&url=" + encodeURIComponent(location.href)
-    }`;
+    // Cache current URL
+    this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
+
     // Make sure apply new device id for new login
     this.clearDeviceId();
 
-    if (BridgeUtils.host == null) {
-      const coreUrl = this.settings.webUrl;
-      window.location.href = coreUrl + parameters;
-    } else {
-      BridgeUtils.host.loadApp("core", parameters);
-    }
+    //  Get the redirect URL
+    this.api
+      .get<string>("Auth/GetLogInUrl", {
+        region: this.region,
+        device: this.deviceId
+      })
+      .then((url) => {
+        if (!url) return;
+
+        url += `?tryLogin=${tryLogin ?? false}`;
+
+        if (BridgeUtils.host == null) {
+          globalThis.location.href = url;
+        } else {
+          BridgeUtils.host.loadApp(coreName, url);
+        }
+      });
   }
 
   /**
-   * Refresh token
-   * @param props Props
+   * User login extended
+   * @param user New user
+   * @param refreshToken Refresh token
+   * @param keep Keep in local storage or not
+   * @param dispatch User state dispatch
    */
-  override async refreshToken(props?: ServiceRefreshTokenProps) {
-    // Destruct
-    const {
-      appApi,
-      callback,
-      data,
-      relogin = false,
-      showLoading = false
-    } = props ?? {};
-
-    // Token
-    const token = this.getCacheToken();
-    if (token == null || token === "") {
-      if (callback) callback(false);
-      return false;
-    }
-
-    // Reqest data
-    // Merge additional data passed
-    const rq: RefreshTokenRQ = {
-      deviceId: this.deviceId,
-      region: this.region,
-      timezone: this.getTimeZone(),
-      ...data
-    };
-
-    // Login result type
-    type LoginResult = IActionResult<U>;
-
-    // Payload
-    const payload: IApiPayload<LoginResult, any> = {
-      showLoading,
-      config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
-      onError: (error) => {
-        if (callback) callback(error);
-
-        // Prevent further processing
-        return false;
-      }
-    };
-
-    // Success callback
-    const success = async (
-      result: LoginResult,
-      failCallback?: (result: RefreshTokenResult) => void
-    ) => {
-      // Token
-      const refreshToken = this.getResponseToken(payload.response);
-      if (refreshToken == null || result.data == null) {
-        if (failCallback) failCallback(this.get("noData")!);
-        return false;
-      }
-
-      // User data
-      const userData = result.data;
-
-      // Use core system access token to service api to exchange service access token
-      const api = appApi ? appApi.api : this.serviceApi;
-      const serviceResult = await api.put<ServiceLoginResult<U>>(
-        "Auth/ExchangeToken",
-        {
-          token: this.encryptEnhanced(
-            userData.token,
-            (appApi?.serviceId ?? this.settings.serviceId).toString()
-          )
-        },
-        {
-          showLoading,
-          onError: (error) => {
-            if (failCallback) failCallback(error);
-
-            // Prevent further processing
-            return false;
-          }
-        }
-      );
-
-      if (serviceResult == null) return false;
-
-      if (!serviceResult.ok) {
-        if (failCallback) failCallback(serviceResult);
-        return false;
-      }
-
-      if (serviceResult.data == null) {
-        if (failCallback) failCallback(this.get("noData")!);
-        return false;
-      }
-
-      // Login
-      if (appApi) {
-        // Authorize external service application API
-        appApi.authorize(userData, refreshToken, serviceResult.data);
-      } else {
-        // Authorize local service
-        this.userLoginEx(userData, refreshToken, serviceResult.data);
-      }
-
-      // Success callback
-      if (failCallback) failCallback(true);
-
-      return true;
-    };
-
-    // Call API
-    const result = await this.api.put<LoginResult>(
-      "Auth/RefreshToken",
-      rq,
-      payload
-    );
-    if (result == null) return false;
-
-    if (!result.ok) {
-      if (result.type === "TokenExpired" && relogin) {
-        // Try login
-        // Dialog to receive password
-        var labels = this.getLabels("reloginTip", "login");
-        this.notifier.prompt(
-          labels.reloginTip,
-          async (pwd) => {
-            if (pwd == null) {
-              this.toLoginPage();
-              return;
-            }
-
-            // Set password for the action
-            rq.pwd = this.encrypt(this.hash(pwd));
-
-            // Submit again
-            const result = await this.api.put<LoginResult>(
-              "Auth/RefreshToken",
-              rq,
-              payload
-            );
-
-            if (result == null) return;
-
-            if (result.ok) {
-              await success(result, (loginResult: RefreshTokenResult) => {
-                if (loginResult === true) {
-                  if (callback) callback(true);
-                  return;
-                }
-
-                const message = this.formatRefreshTokenResult(loginResult);
-                if (message) this.notifier.alert(message);
-              });
-              return;
-            }
-
-            // Popup message
-            this.alertResult(result);
-            return false;
-          },
-          labels.login,
-          { type: "password" }
-        );
-
-        // Fake truth to avoid reloading
-        return true;
-      }
-
-      if (callback) callback(result);
-      return false;
-    }
-
-    return await success(result, callback);
+  override userLogin(
+    user: U,
+    refreshToken: string,
+    keep?: boolean,
+    dispatch?: boolean
+  ): void {
+    // Super call, set token
+    super.userLogin(user, refreshToken, keep, dispatch);
+
+    // Set service passphrase
+    this.servicePassphrase =
+      this.decrypt(
+        user.servicePassphrase,
+        `${user.uid}-${this.settings.appId}`
+      ) ?? "";
   }
 
   /**
@@ -332,55 +149,4 @@ export class ServiceApp<
       iterations
     );
   }
-
-  /**
-   * Try login
-   * @param data Additional data
-   * @param showLoading Show loading bar or not
-   * @returns Result
-   */
-  override async tryLogin<D extends object = {}>(
-    data?: D,
-    showLoading?: boolean
-  ) {
-    // Reset user state
-    const result = await super.tryLogin(data, showLoading);
-    if (!result) return false;
-
-    // Refresh token
-    return await this.refreshToken({
-      callback: (result) => this.doRefreshTokenResult(result),
-      data,
-      showLoading,
-      relogin: true
-    });
-  }
-
-  /**
-   * User login extended
-   * @param user Core system user
-   * @param refreshToken Refresh token
-   * @param serviceUser Service user
-   */
-  userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: U) {
-    // Service user login
-    this.servicePassphrase =
-      this.decrypt(
-        serviceUser.servicePassphrase,
-        this.settings.serviceId.toString()
-      ) ?? "";
-
-    // Service user
-    this.serviceUser = serviceUser;
-
-    // Service API token
-    this.serviceApi.authorize(
-      serviceUser.tokenScheme ?? "Bearer",
-      serviceUser.token
-    );
-
-    // Keep = true, means service could hold the refresh token for long access
-    // Trigger Context change and serviceUser is ready then
-    super.userLogin(user, refreshToken, true);
-  }
 }

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from "./app/CommonApp";
-export * from "./app/IAppApi";
 export * from "./app/IServiceApp";
 export * from "./app/IServiceAppSettings";
 export * from "./app/IServicePage";

package/lib/app/IAppApi.d.ts

@@ -1,29 +0,0 @@
-import { IApi } from "@etsoo/restclient";
-import { ISmartERPUser } from "./ISmartERPUser";
-import { RefreshTokenRQ } from "@etsoo/appscript";
-import { IServiceUser } from "./IServiceUser";
-/**
- * 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 user SmartERP user
-     * @param refreshToken SmartERP user refresh token
-     * @param serviceUser Service user
-     */
-    authorize(user: ISmartERPUser, refreshToken: string, serviceUser: IServiceUser): void;
-    /**
-     * Get refresh token data
-     */
-    getRefreshTokenData(): Partial<RefreshTokenRQ>;
-}

package/lib/app/IAppApi.js

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

package/src/app/IAppApi.ts

@@ -1,37 +0,0 @@
-import { IApi } from "@etsoo/restclient";
-import { ISmartERPUser } from "./ISmartERPUser";
-import { RefreshTokenRQ } from "@etsoo/appscript";
-import { IServiceUser } from "./IServiceUser";
-
-/**
- * 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 user SmartERP user
-   * @param refreshToken SmartERP user refresh token
-   * @param serviceUser Service user
-   */
-  authorize(
-    user: ISmartERPUser,
-    refreshToken: string,
-    serviceUser: IServiceUser
-  ): void;
-
-  /**
-   * Get refresh token data
-   */
-  getRefreshTokenData(): Partial<RefreshTokenRQ>;
-}