@etsoo/materialui 1.3.93 → 1.3.95

package/lib/app/IServiceApp.d.ts

@@ -1,5 +1,6 @@
-import { IApi } from "@etsoo/appscript";
+import { ApiRefreshTokenDto, IApi } from "@etsoo/appscript";
 import { ReactAppType } from "./ReactApp";
+import { IServiceUser, ServiceUserToken } from "./IServiceUser";
 /**
  * Service application interface
  */
@@ -12,4 +13,12 @@ export interface IServiceApp extends ReactAppType {
      * Load core system UI
      */
     loadCore(): void;
+    /**
+     *
+     * @param user Current user
+     * @param core Core system API token data
+     * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
+     */
+    userLoginEx(user: IServiceUser & ServiceUserToken, core?: ApiRefreshTokenDto, keep?: boolean, dispatch?: boolean): void;
 }

package/lib/app/IServiceUser.d.ts

@@ -20,11 +20,22 @@ export interface IServiceUser extends IUser {
      */
     readonly passphrase?: string;
     /**
-     * Device id
-     * 设备编号
+     * Client device id
+     * 客户端设备编号
      */
-    readonly deviceId?: string;
+    readonly clientDeviceId?: string;
 }
+/**
+ * Service user token return type
+ * 服务用户令牌返回类型
+ */
+export type ServiceUserToken = {
+    /**
+     * Refresh token
+     * 刷新令牌
+     */
+    readonly refreshToken: string;
+};
 /**
  * Service user login result
  */

package/lib/app/ServiceApp.d.ts

@@ -1,8 +1,8 @@
-import { ExternalEndpoint, IApi } from "@etsoo/appscript";
+import { ApiRefreshTokenDto, ExternalEndpoint, IApi } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
-import { IServiceUser } from "./IServiceUser";
+import { IServiceUser, ServiceUserToken } from "./IServiceUser";
 import { ReactApp } from "./ReactApp";
 /**
  * Core Service App
@@ -44,4 +44,12 @@ 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;
+    /**
+     *
+     * @param user Current user
+     * @param core Core system API token data
+     * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
+     */
+    userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, keep?: boolean, dispatch?: boolean): void;
 }

package/lib/app/ServiceApp.js

@@ -42,8 +42,6 @@ export class ServiceApp extends ReactApp {
     toLoginPage(tryLogin, removeUrl) {
         // Cache current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
-        // Make sure apply new device id for new login
-        this.clearDeviceId();
         //  Get the redirect URL
         this.api
             .get("Auth/GetLogInUrl", {
@@ -53,7 +51,8 @@ export class ServiceApp extends ReactApp {
             .then((url) => {
             if (!url)
                 return;
-            url += `?tryLogin=${tryLogin ?? false}`;
+            // Add try login flag
+            url = url.addUrlParam("tryLogin", tryLogin ?? false);
             if (BridgeUtils.host == null) {
                 globalThis.location.href = url;
             }
@@ -61,6 +60,8 @@ export class ServiceApp extends ReactApp {
                 BridgeUtils.host.loadApp(coreName, url);
             }
         });
+        // Make sure apply new device id for new login
+        this.clearDeviceId();
     }
     /**
      * User login extended
@@ -72,13 +73,33 @@ export class ServiceApp extends ReactApp {
     userLogin(user, refreshToken, keep, dispatch) {
         // Super call, set token
         super.userLogin(user, refreshToken, keep, dispatch);
-        if (user.deviceId && user.passphrase) {
+        if (user.clientDeviceId && user.passphrase) {
             // Save the passphrase
             const passphrase = this.decrypt(user.passphrase, `${user.uid}-${this.settings.appId}`);
             if (passphrase) {
-                this.deviceId = user.deviceId;
+                this.deviceId = user.clientDeviceId;
                 this.updatePassphrase(passphrase);
             }
         }
     }
+    /**
+     *
+     * @param user Current user
+     * @param core Core system API token data
+     * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
+     */
+    userLoginEx(user, core, keep, dispatch) {
+        // User login
+        const { refreshToken } = user;
+        this.userLogin(user, refreshToken, keep, dispatch);
+        // Core system login
+        core ?? (core = {
+            refreshToken,
+            accessToken: user.token,
+            tokenType: user.tokenScheme ?? "Bearer",
+            expiresIn: user.seconds
+        });
+        this.exchangeTokenAll(core, coreName);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.93",
+  "version": "1.3.95",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,12 +50,12 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.26",
-    "@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",
+    "@etsoo/appscript": "^1.5.28",
+    "@etsoo/notificationbase": "^1.1.49",
+    "@etsoo/react": "^1.7.69",
+    "@etsoo/shared": "^1.2.48",
+    "@mui/icons-material": "^6.1.3",
+    "@mui/material": "^6.1.3",
     "@mui/x-data-grid": "^7.19.0",
     "chart.js": "^4.4.4",
     "chartjs-plugin-datalabels": "^2.2.0",

package/src/app/IServiceApp.ts

@@ -1,5 +1,6 @@
-import { IApi } from "@etsoo/appscript";
+import { ApiRefreshTokenDto, IApi } from "@etsoo/appscript";
 import { ReactAppType } from "./ReactApp";
+import { IServiceUser, ServiceUserToken } from "./IServiceUser";
 
 /**
  * Service application interface
@@ -14,4 +15,18 @@ export interface IServiceApp extends ReactAppType {
    * Load core system UI
    */
   loadCore(): void;
+
+  /**
+   *
+   * @param user Current user
+   * @param core Core system API token data
+   * @param keep Keep in local storage or not
+   * @param dispatch User state dispatch
+   */
+  userLoginEx(
+    user: IServiceUser & ServiceUserToken,
+    core?: ApiRefreshTokenDto,
+    keep?: boolean,
+    dispatch?: boolean
+  ): void;
 }

package/src/app/IServiceUser.ts

@@ -24,12 +24,24 @@ export interface IServiceUser extends IUser {
   readonly passphrase?: string;
 
   /**
-   * Device id
-   * 设备编号
+   * Client device id
+   * 客户端设备编号
    */
-  readonly deviceId?: string;
+  readonly clientDeviceId?: string;
 }
 
+/**
+ * Service user token return type
+ * 服务用户令牌返回类型
+ */
+export type ServiceUserToken = {
+  /**
+   * Refresh token
+   * 刷新令牌
+   */
+  readonly refreshToken: string;
+};
+
 /**
  * Service user login result
  */

package/src/app/ServiceApp.ts

@@ -1,8 +1,13 @@
-import { BridgeUtils, ExternalEndpoint, IApi } from "@etsoo/appscript";
+import {
+  ApiRefreshTokenDto,
+  BridgeUtils,
+  ExternalEndpoint,
+  IApi
+} from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
-import { IServiceUser } from "./IServiceUser";
+import { IServiceUser, ServiceUserToken } from "./IServiceUser";
 import { ReactApp } from "./ReactApp";
 
 const coreName = "core";
@@ -69,9 +74,6 @@ export class ServiceApp<
     // Cache current URL
     this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
 
-    // Make sure apply new device id for new login
-    this.clearDeviceId();
-
     //  Get the redirect URL
     this.api
       .get<string>("Auth/GetLogInUrl", {
@@ -81,7 +83,8 @@ export class ServiceApp<
       .then((url) => {
         if (!url) return;
 
-        url += `?tryLogin=${tryLogin ?? false}`;
+        // Add try login flag
+        url = url.addUrlParam("tryLogin", tryLogin ?? false);
 
         if (BridgeUtils.host == null) {
           globalThis.location.href = url;
@@ -89,6 +92,9 @@ export class ServiceApp<
           BridgeUtils.host.loadApp(coreName, url);
         }
       });
+
+    // Make sure apply new device id for new login
+    this.clearDeviceId();
   }
 
   /**
@@ -107,16 +113,44 @@ export class ServiceApp<
     // Super call, set token
     super.userLogin(user, refreshToken, keep, dispatch);
 
-    if (user.deviceId && user.passphrase) {
+    if (user.clientDeviceId && user.passphrase) {
       // Save the passphrase
       const passphrase = this.decrypt(
         user.passphrase,
         `${user.uid}-${this.settings.appId}`
       );
       if (passphrase) {
-        this.deviceId = user.deviceId;
+        this.deviceId = user.clientDeviceId;
         this.updatePassphrase(passphrase);
       }
     }
   }
+
+  /**
+   *
+   * @param user Current user
+   * @param core Core system API token data
+   * @param keep Keep in local storage or not
+   * @param dispatch User state dispatch
+   */
+  userLoginEx(
+    user: U & ServiceUserToken,
+    core?: ApiRefreshTokenDto,
+    keep?: boolean,
+    dispatch?: boolean
+  ) {
+    // User login
+    const { refreshToken } = user;
+    this.userLogin(user, refreshToken, keep, dispatch);
+
+    // Core system login
+    core ??= {
+      refreshToken,
+      accessToken: user.token,
+      tokenType: user.tokenScheme ?? "Bearer",
+      expiresIn: user.seconds
+    };
+
+    this.exchangeTokenAll(core, coreName);
+  }
 }