@etsoo/materialui 1.6.84 → 1.6.86

package/lib/cjs/app/ServiceApp.d.ts

@@ -64,12 +64,12 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, S extends
      * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, dispatch?: boolean): void;
+    userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, dispatch?: boolean): Promise<void>;
     /**
      * Save core system data
      * @param data Data
      */
-    protected saveCoreToken(data: ApiRefreshTokenDto): void;
+    protected saveCoreToken(data: ApiRefreshTokenDto): Promise<void>;
     /**
      * On switch organization handler
      * This method is called when the organization is switched successfully

package/lib/cjs/app/ServiceApp.js

@@ -120,14 +120,14 @@ class ServiceApp extends ReactApp_1.ReactApp {
      * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLoginEx(user, core, dispatch) {
+    async userLoginEx(user, core, dispatch) {
         if (user.clientDeviceId && user.passphrase) {
             // Save the passphrase
             // Interpolated string expressions are different between TypeScript and C# for the null value
-            const passphrase = this.decrypt(user.passphrase, `${user.uid ?? ""}-${this.settings.appId}`);
+            const passphrase = await this.decrypt(user.passphrase, `${user.uid ?? ""}-${this.settings.appId}`);
             if (passphrase) {
                 this.deviceId = user.clientDeviceId;
-                this.updatePassphrase(passphrase);
+                await this.updatePassphrase(passphrase);
             }
         }
         // User login
@@ -149,11 +149,11 @@ class ServiceApp extends ReactApp_1.ReactApp {
      * Save core system data
      * @param data Data
      */
-    saveCoreToken(data) {
+    async saveCoreToken(data) {
         // Hold the core system access token
         this.coreAccessToken = data.accessToken;
         // Cache the core system refresh token
-        this.storage.setData(coreTokenKey, this.encrypt(data.refreshToken));
+        this.storage.setData(coreTokenKey, await this.encrypt(data.refreshToken));
         // Exchange tokens
         this.exchangeTokenAll(data);
     }
@@ -203,7 +203,7 @@ class ServiceApp extends ReactApp_1.ReactApp {
             callback?.({ ok: false, type: "noData", title: "Core token is blank" });
             return;
         }
-        const coreTokenDecrypted = this.decrypt(coreToken);
+        const coreTokenDecrypted = await this.decrypt(coreToken);
         if (!coreTokenDecrypted) {
             callback?.({
                 ok: false,

package/lib/mjs/app/ServiceApp.d.ts

@@ -64,12 +64,12 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, S extends
      * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, dispatch?: boolean): void;
+    userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, dispatch?: boolean): Promise<void>;
     /**
      * Save core system data
      * @param data Data
      */
-    protected saveCoreToken(data: ApiRefreshTokenDto): void;
+    protected saveCoreToken(data: ApiRefreshTokenDto): Promise<void>;
     /**
      * On switch organization handler
      * This method is called when the organization is switched successfully

package/lib/mjs/app/ServiceApp.js

@@ -117,14 +117,14 @@ export class ServiceApp extends ReactApp {
      * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLoginEx(user, core, dispatch) {
+    async userLoginEx(user, core, dispatch) {
         if (user.clientDeviceId && user.passphrase) {
             // Save the passphrase
             // Interpolated string expressions are different between TypeScript and C# for the null value
-            const passphrase = this.decrypt(user.passphrase, `${user.uid ?? ""}-${this.settings.appId}`);
+            const passphrase = await this.decrypt(user.passphrase, `${user.uid ?? ""}-${this.settings.appId}`);
             if (passphrase) {
                 this.deviceId = user.clientDeviceId;
-                this.updatePassphrase(passphrase);
+                await this.updatePassphrase(passphrase);
             }
         }
         // User login
@@ -146,11 +146,11 @@ export class ServiceApp extends ReactApp {
      * Save core system data
      * @param data Data
      */
-    saveCoreToken(data) {
+    async saveCoreToken(data) {
         // Hold the core system access token
         this.coreAccessToken = data.accessToken;
         // Cache the core system refresh token
-        this.storage.setData(coreTokenKey, this.encrypt(data.refreshToken));
+        this.storage.setData(coreTokenKey, await this.encrypt(data.refreshToken));
         // Exchange tokens
         this.exchangeTokenAll(data);
     }
@@ -200,7 +200,7 @@ export class ServiceApp extends ReactApp {
             callback?.({ ok: false, type: "noData", title: "Core token is blank" });
             return;
         }
-        const coreTokenDecrypted = this.decrypt(coreToken);
+        const coreTokenDecrypted = await this.decrypt(coreToken);
         if (!coreTokenDecrypted) {
             callback?.({
                 ok: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.6.84",
+  "version": "1.6.86",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -36,17 +36,17 @@
   },
   "homepage": "https://github.com/ETSOO/ReactMU#readme",
   "dependencies": {
-    "@base-ui/react": "^1.7.0",
+    "@base-ui/react": "^1.8.0",
     "@dnd-kit/react": "^0.5.0",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@etsoo/appscript": "^1.6.74",
+    "@etsoo/appscript": "^1.6.77",
     "@etsoo/notificationbase": "^1.1.75",
-    "@etsoo/react": "^1.9.0",
+    "@etsoo/react": "^1.9.2",
     "@etsoo/shared": "^1.2.91",
-    "@mui/icons-material": "^9.3.1",
-    "@mui/material": "^9.3.1",
-    "@mui/x-data-grid": "^9.12.0",
+    "@mui/icons-material": "^9.4.0",
+    "@mui/material": "^9.4.0",
+    "@mui/x-data-grid": "^9.13.0",
     "chart.js": "^4.5.1",
     "chartjs-plugin-datalabels": "^2.2.0",
     "dompurify": "^3.4.14",
@@ -66,24 +66,18 @@
     "react-dom": "$react-dom"
   },
   "devDependencies": {
-    "@babel/core": "^8.0.1",
-    "@babel/plugin-transform-runtime": "^8.0.1",
-    "@babel/preset-env": "^8.0.2",
-    "@babel/preset-react": "^8.0.1",
-    "@babel/preset-typescript": "^8.0.1",
-    "@babel/runtime-corejs3": "^8.0.0",
     "@testing-library/jest-dom": "^7.0.1",
-    "@testing-library/react": "^16.3.2",
+    "@testing-library/react": "^16.3.3",
     "@types/pica": "^9.0.5",
     "@types/pulltorefreshjs": "^0.1.7",
     "@types/react": "^19.2.18",
     "@types/react-avatar-editor": "^13.0.4",
-    "@types/react-dom": "^19.2.5",
+    "@types/react-dom": "^19.2.7",
     "@types/react-input-mask": "^3.0.6",
-    "@vitejs/plugin-react": "^6.1.0",
+    "@vitejs/plugin-react": "^6.1.1",
     "jsdom": "^30.0.1",
     "typescript": "^7.0.2",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.0"
   },
   "allowScripts": {
     "core-js-pure@3.49.0": true

package/src/app/ServiceApp.ts

@@ -25,9 +25,9 @@ const tryLoginKey = "tryLogin";
  * Use the new acess token and refresh token to login
  */
 export class ServiceApp<
-    U extends IServiceUser = IServiceUser,
-    S extends IServiceAppSettings = IServiceAppSettings
-  >
+  U extends IServiceUser = IServiceUser,
+  S extends IServiceAppSettings = IServiceAppSettings
+>
   extends ReactApp<S, U>
   implements IServiceApp
 {
@@ -157,7 +157,7 @@ export class ServiceApp<
    * @param keep Keep in local storage or not
    * @param dispatch User state dispatch
    */
-  userLoginEx(
+  async userLoginEx(
     user: U & ServiceUserToken,
     core?: ApiRefreshTokenDto,
     dispatch?: boolean
@@ -165,13 +165,13 @@ export class ServiceApp<
     if (user.clientDeviceId && user.passphrase) {
       // Save the passphrase
       // Interpolated string expressions are different between TypeScript and C# for the null value
-      const passphrase = this.decrypt(
+      const passphrase = await this.decrypt(
         user.passphrase,
         `${user.uid ?? ""}-${this.settings.appId}`
       );
       if (passphrase) {
         this.deviceId = user.clientDeviceId;
-        this.updatePassphrase(passphrase);
+        await this.updatePassphrase(passphrase);
       }
     }
 
@@ -198,12 +198,12 @@ export class ServiceApp<
    * Save core system data
    * @param data Data
    */
-  protected saveCoreToken(data: ApiRefreshTokenDto) {
+  protected async saveCoreToken(data: ApiRefreshTokenDto) {
     // Hold the core system access token
     this.coreAccessToken = data.accessToken;
 
     // Cache the core system refresh token
-    this.storage.setData(coreTokenKey, this.encrypt(data.refreshToken));
+    this.storage.setData(coreTokenKey, await this.encrypt(data.refreshToken));
 
     // Exchange tokens
     this.exchangeTokenAll(data);
@@ -278,7 +278,7 @@ export class ServiceApp<
       return;
     }
 
-    const coreTokenDecrypted = this.decrypt(coreToken);
+    const coreTokenDecrypted = await this.decrypt(coreToken);
     if (!coreTokenDecrypted) {
       callback?.({
         ok: false,

package/babel.config.json

@@ -1,15 +0,0 @@
-{
-  "presets": [
-    ["@babel/env"],
-    "@babel/preset-typescript",
-    "@babel/preset-react"
-  ],
-  "plugins": [
-    [
-      "@babel/plugin-transform-runtime",
-      {
-        "corejs": 3
-      }
-    ]
-  ]
-}