@etsoo/materialui 1.3.88 → 1.3.89

package/lib/app/CommonApp.d.ts

@@ -1,4 +1,4 @@
-import { IAppSettings, IUser, RefreshTokenProps, RefreshTokenRQ } from "@etsoo/appscript";
+import { IAppSettings, IUser, RefreshTokenProps } from "@etsoo/appscript";
 import { IPageData } from "@etsoo/react";
 import { ReactApp } from "./ReactApp";
 /**
@@ -27,12 +27,11 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends object = Partial<RefreshTokenRQ>>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
     /**
      * Try login
-     * @param data Additional data
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    tryLogin<D extends object = RefreshTokenRQ>(data?: D, showLoading?: boolean): Promise<boolean>;
+    tryLogin(showLoading?: boolean): Promise<boolean>;
 }

package/lib/app/CommonApp.js

@@ -37,7 +37,7 @@ export class CommonApp extends ReactApp {
      */
     async refreshToken(props) {
         // Destruct
-        const { callback, data, relogin = false, showLoading = false } = props ?? {};
+        const { callback, showLoading = false } = props ?? {};
         // Token
         const token = this.getCacheToken();
         if (token == null || token === "") {
@@ -47,10 +47,7 @@ export class CommonApp extends ReactApp {
         }
         // Reqest data
         const rq = {
-            deviceId: this.deviceId,
-            region: this.region,
-            timezone: this.getTimeZone(),
-            ...data
+            deviceId: this.deviceId
         };
         // Payload
         const payload = {
@@ -89,41 +86,7 @@ export class CommonApp extends ReactApp {
         if (!result.ok) {
             // Remove the wrong token
             this.clearCacheToken();
-            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("Auth/RefreshToken", rq, payload);
-                    if (result == null)
-                        return;
-                    if (result.ok) {
-                        success(result, (loginResult) => {
-                            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;
-            }
+            // Callback
             if (callback)
                 callback(result);
             return false;
@@ -132,21 +95,18 @@ export class CommonApp extends ReactApp {
     }
     /**
      * Try login
-     * @param data Additional data
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    async tryLogin(data, showLoading) {
+    async tryLogin(showLoading) {
         // 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/lib/app/IServiceApp.d.ts

@@ -1,29 +1,12 @@
-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
      * @param messageEncrypted Encrypted message

package/lib/app/IServiceAppSettings.d.ts

@@ -5,7 +5,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/lib/app/IServiceUser.d.ts

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

package/lib/app/ReactApp.js

@@ -1,4 +1,4 @@
-import { BridgeUtils, CoreApp, createClient } from "@etsoo/appscript";
+import { BridgeUtils, CoreApp } from "@etsoo/appscript";
 import { NotificationMessageType } from "@etsoo/notificationbase";
 import { WindowStorage } from "@etsoo/shared";
 import React from "react";
@@ -69,7 +69,7 @@ export class ReactApp extends CoreApp {
      * @param debug Debug mode
      */
     constructor(settings, name, debug = false) {
-        super(settings, createClient(), ReactApp.createNotifier(debug), new WindowStorage(), name, debug);
+        super(settings, null, ReactApp.createNotifier(debug), new WindowStorage(), name, debug);
         /**
          * User state
          */

package/lib/app/ServiceApp.d.ts

@@ -1,34 +1,24 @@
-import { IApi, RefreshTokenProps, RefreshTokenResult, RefreshTokenRQ } from "@etsoo/appscript";
+import { ExternalEndpoint, IApi } 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
  * Use the acess token to the service api, get a service access token
  * Use the new acess token and refresh token to login
  */
-export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends IServicePageData = IServicePageData, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, ISmartERPUser, P> implements IServiceApp {
+export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends IServicePageData = IServicePageData, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, U, P> implements IServiceApp {
     /**
-     * Service API
+     * Core endpoint
      */
-    readonly serviceApi: IApi;
-    private _serviceUser?;
+    protected coreEndpoint: ExternalEndpoint;
     /**
-     * Service user
+     * Core system API
      */
-    get serviceUser(): U | undefined;
-    protected set serviceUser(value: U | undefined);
+    readonly coreApi: IApi;
     /**
      * Service passphrase
      */
@@ -41,15 +31,9 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      */
     constructor(settings: S, name: string, debug?: boolean);
     /**
-     * Service application API login
-     * @param appApi Service application API
-     * @param callback Callback
+     * Load core system UI
      */
-    apiLogin(appApi: IAppApi, callback?: (result: RefreshTokenResult, successData?: string) => void): Promise<boolean>;
-    /**
-     * Load SmartERP core
-     */
-    loadSmartERP(): void;
+    loadCore(): void;
     /**
      * Go to the login page
      * @param tryLogin Try to login again
@@ -57,10 +41,13 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      */
     toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
-     * 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
      */
-    refreshToken(props?: ServiceRefreshTokenProps): Promise<boolean>;
+    userLogin(user: U, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
     /**
      * Service decrypt message
      * @param messageEncrypted Encrypted message
@@ -76,18 +63,4 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @returns Result
      */
     serviceEncrypt(message: string, passphrase?: string, iterations?: number): string;
-    /**
-     * Try login
-     * @param data Additional data
-     * @param showLoading Show loading bar or not
-     * @returns Result
-     */
-    tryLogin<D extends object = {}>(data?: D, showLoading?: boolean): Promise<boolean>;
-    /**
-     * User login extended
-     * @param user Core system user
-     * @param refreshToken Refresh token
-     * @param serviceUser Service user
-     */
-    userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: U): void;
 }

package/lib/app/ServiceApp.js

@@ -1,7 +1,6 @@
-import { BridgeUtils, createClient } from "@etsoo/appscript";
-import { CoreConstants } from "@etsoo/react";
-import { DomUtils } from "@etsoo/shared";
+import { BridgeUtils } from "@etsoo/appscript";
 import { ReactApp } from "./ReactApp";
+const coreName = "core";
 /**
  * Core Service App
  * Service login to core system, get the refesh token and access token
@@ -9,15 +8,6 @@ import { ReactApp } from "./ReactApp";
  * Use the new acess token and refresh token to login
  */
 export class ServiceApp extends ReactApp {
-    /**
-     * Service user
-     */
-    get serviceUser() {
-        return this._serviceUser;
-    }
-    set serviceUser(value) {
-        this._serviceUser = value;
-    }
     /**
      * Constructor
      * @param settings Settings
@@ -31,39 +21,25 @@ export class ServiceApp extends ReactApp {
          */
         this.servicePassphrase = "";
         // 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;
-    }
-    /**
-     * 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
-        });
+        const coreEndpoint = settings.endpoints?.core;
+        if (coreEndpoint == null) {
+            throw new Error("Core API endpont is required.");
+        }
+        this.coreEndpoint = coreEndpoint;
+        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);
         }
     }
     /**
@@ -72,145 +48,41 @@ export class ServiceApp extends ReactApp {
      * @param removeUrl Remove current URL for reuse
      */
     toLoginPage(tryLogin, removeUrl) {
-        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);
-        }
-    }
-    /**
-     * Refresh token
-     * @param props Props
-     */
-    async refreshToken(props) {
-        // 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 = {
-            deviceId: this.deviceId,
+        //  Get the redirect URL
+        this.api
+            .get("Auth/GetLogInUrl", {
             region: this.region,
-            timezone: this.getTimeZone(),
-            ...data
-        };
-        // Payload
-        const payload = {
-            showLoading,
-            config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
-            onError: (error) => {
-                if (callback)
-                    callback(error);
-                // Prevent further processing
-                return false;
-            }
-        };
-        // Success callback
-        const success = async (result, failCallback) => {
-            // 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("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);
+            device: this.deviceId
+        })
+            .then((url) => {
+            if (!url)
+                return;
+            url += `?tryLogin=${tryLogin ?? false}`;
+            if (BridgeUtils.host == null) {
+                globalThis.location.href = url;
             }
             else {
-                // Authorize local service
-                this.userLoginEx(userData, refreshToken, serviceResult.data);
+                BridgeUtils.host.loadApp(coreName, url);
             }
-            // Success callback
-            if (failCallback)
-                failCallback(true);
-            return true;
-        };
-        // Call API
-        const result = await this.api.put("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("Auth/RefreshToken", rq, payload);
-                    if (result == null)
-                        return;
-                    if (result.ok) {
-                        await success(result, (loginResult) => {
-                            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);
+        });
+    }
+    /**
+     * User login extended
+     * @param user New user
+     * @param refreshToken Refresh token
+     * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
+     */
+    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
@@ -231,41 +103,4 @@ export class ServiceApp extends ReactApp {
     serviceEncrypt(message, passphrase, iterations) {
         return this.encrypt(message, passphrase ?? this.servicePassphrase, iterations);
     }
-    /**
-     * Try login
-     * @param data Additional data
-     * @param showLoading Show loading bar or not
-     * @returns Result
-     */
-    async tryLogin(data, showLoading) {
-        // 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, refreshToken, serviceUser) {
-        // 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/lib/index.d.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/index.js

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.88",
+  "version": "1.3.89",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -47,16 +47,16 @@
   "dependencies": {
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^8.0.0",
-    "@emotion/css": "^11.13.0",
+    "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.16",
-    "@etsoo/notificationbase": "^1.1.47",
-    "@etsoo/react": "^1.7.66",
-    "@etsoo/shared": "^1.2.44",
-    "@mui/icons-material": "^6.1.1",
-    "@mui/material": "^6.1.1",
-    "@mui/x-data-grid": "^7.18.0",
+    "@etsoo/appscript": "^1.5.22",
+    "@etsoo/notificationbase": "^1.1.48",
+    "@etsoo/react": "^1.7.68",
+    "@etsoo/shared": "^1.2.46",
+    "@mui/icons-material": "^6.1.2",
+    "@mui/material": "^6.1.2",
+    "@mui/x-data-grid": "^7.19.0",
     "chart.js": "^4.4.4",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",
@@ -70,25 +70,25 @@
     "react-imask": "7.6.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.6",
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-transform-runtime": "^7.25.4",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
-    "@babel/runtime-corejs3": "^7.25.6",
+    "@babel/cli": "^7.25.7",
+    "@babel/core": "^7.25.7",
+    "@babel/plugin-transform-runtime": "^7.25.7",
+    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-react": "^7.25.7",
+    "@babel/preset-typescript": "^7.25.7",
+    "@babel/runtime-corejs3": "^7.25.7",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
     "@types/jest": "^29.5.13",
     "@types/pica": "^9.0.4",
     "@types/pulltorefreshjs": "^0.1.7",
-    "@types/react": "^18.3.8",
+    "@types/react": "^18.3.11",
     "@types/react-avatar-editor": "^13.0.3",
     "@types/react-dom": "^18.3.0",
     "@types/react-input-mask": "^3.0.5",
     "@types/react-window": "^1.8.8",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
-    "@typescript-eslint/parser": "^8.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.8.0",
+    "@typescript-eslint/parser": "^8.8.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "typescript": "^5.6.2"

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
@@ -135,56 +125,9 @@ export abstract class CommonApp<
       // Remove the wrong token
       this.clearCacheToken();
 
-      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;
-      }
-
+      // Callback
       if (callback) callback(result);
+
       return false;
     }
 
@@ -193,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>;
-}