@etsoo/materialui 1.3.96 → 1.3.98

package/lib/app/CommonApp.d.ts

@@ -15,14 +15,6 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * @returns Fields
      */
     protected initCallEncryptedUpdateFields(): string[];
-    /**
-     * Do user login
-     * @param data User data
-     * @param refreshToken Refresh token
-     * @param keep Keep login
-     * @returns Success data
-     */
-    protected doUserLogin(data: U, refreshToken: string, keep: boolean): string | undefined;
     /**
      * Refresh token
      * @param props Props

package/lib/app/CommonApp.js

@@ -20,17 +20,6 @@ export class CommonApp extends ReactApp {
         fields.push(CoreConstants.FieldUserIdSaved);
         return fields;
     }
-    /**
-     * Do user login
-     * @param data User data
-     * @param refreshToken Refresh token
-     * @param keep Keep login
-     * @returns Success data
-     */
-    doUserLogin(data, refreshToken, keep) {
-        this.userLogin(data, refreshToken, keep);
-        return undefined;
-    }
     /**
      * Refresh token
      * @param props Props
@@ -73,10 +62,10 @@ export class CommonApp extends ReactApp {
             // Keep
             const keep = this.storage.getData(CoreConstants.FieldLoginKeep, false);
             // User login
-            var successData = this.doUserLogin(result.data, refreshToken, keep);
+            this.userLogin(result.data, refreshToken, keep);
             // Callback
             if (failCallback)
-                failCallback(true, successData);
+                failCallback(true);
             return true;
         };
         // Call API

package/lib/app/IServiceApp.d.ts

@@ -9,6 +9,10 @@ export interface IServiceApp extends ReactAppType {
      * Core system API
      */
     readonly coreApi: IApi;
+    /**
+     * Core system origin
+     */
+    readonly coreOrigin: string;
     /**
      * Load core system UI
      */

package/lib/app/ServiceApp.d.ts

@@ -19,6 +19,10 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * Core system API
      */
     readonly coreApi: IApi;
+    /**
+     * Core system origin
+     */
+    readonly coreOrigin: string;
     /**
      * Constructor
      * @param settings Settings

package/lib/app/ServiceApp.js

@@ -21,6 +21,7 @@ export class ServiceApp extends ReactApp {
             throw new Error("Core API endpont is required.");
         }
         this.coreEndpoint = coreEndpoint;
+        this.coreOrigin = new URL(coreEndpoint.webUrl).origin;
         this.coreApi = this.createApi(coreName, coreEndpoint);
     }
     /**
@@ -53,11 +54,17 @@ export class ServiceApp extends ReactApp {
                 return;
             // Add try login flag
             url = url.addUrlParam("tryLogin", tryLogin ?? false);
-            if (BridgeUtils.host == null) {
-                globalThis.location.href = url;
+            // Is it inside an iframe?
+            if (globalThis.self !== globalThis.parent) {
+                globalThis.parent.postMessage(["login", url], this.coreOrigin);
             }
             else {
-                BridgeUtils.host.loadApp(coreName, url);
+                if (BridgeUtils.host == null) {
+                    globalThis.location.href = url;
+                }
+                else {
+                    BridgeUtils.host.loadApp(coreName, url);
+                }
             }
         });
         // Make sure apply new device id for new login

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.96",
+  "version": "1.3.98",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,13 +50,13 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.28",
+    "@etsoo/appscript": "^1.5.30",
     "@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",
+    "@mui/x-data-grid": "^7.20.0",
     "chart.js": "^4.4.4",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",
@@ -71,9 +71,9 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",
-    "@babel/core": "^7.25.7",
+    "@babel/core": "^7.25.8",
     "@babel/plugin-transform-runtime": "^7.25.7",
-    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-env": "^7.25.8",
     "@babel/preset-react": "^7.25.7",
     "@babel/preset-typescript": "^7.25.7",
     "@babel/runtime-corejs3": "^7.25.7",

package/src/app/CommonApp.ts

@@ -36,22 +36,6 @@ export abstract class CommonApp<
     return fields;
   }
 
-  /**
-   * Do user login
-   * @param data User data
-   * @param refreshToken Refresh token
-   * @param keep Keep login
-   * @returns Success data
-   */
-  protected doUserLogin(
-    data: U,
-    refreshToken: string,
-    keep: boolean
-  ): string | undefined {
-    this.userLogin(data, refreshToken, keep);
-    return undefined;
-  }
-
   /**
    * Refresh token
    * @param props Props
@@ -91,7 +75,7 @@ export abstract class CommonApp<
     // Success callback
     const success = (
       result: LoginResult,
-      failCallback?: (result: RefreshTokenResult, serviceToken?: string) => void
+      failCallback?: (result: RefreshTokenResult) => void
     ) => {
       // Token
       const refreshToken = this.getResponseToken(payload.response);
@@ -104,10 +88,10 @@ export abstract class CommonApp<
       const keep = this.storage.getData(CoreConstants.FieldLoginKeep, false);
 
       // User login
-      var successData = this.doUserLogin(result.data, refreshToken, keep);
+      this.userLogin(result.data, refreshToken, keep);
 
       // Callback
-      if (failCallback) failCallback(true, successData);
+      if (failCallback) failCallback(true);
 
       return true;
     };

package/src/app/IServiceApp.ts

@@ -11,6 +11,11 @@ export interface IServiceApp extends ReactAppType {
    */
   readonly coreApi: IApi;
 
+  /**
+   * Core system origin
+   */
+  readonly coreOrigin: string;
+
   /**
    * Load core system UI
    */

package/src/app/ServiceApp.ts

@@ -36,6 +36,11 @@ export class ServiceApp<
    */
   readonly coreApi: IApi;
 
+  /**
+   * Core system origin
+   */
+  readonly coreOrigin: string;
+
   /**
    * Constructor
    * @param settings Settings
@@ -50,7 +55,7 @@ export class ServiceApp<
       throw new Error("Core API endpont is required.");
     }
     this.coreEndpoint = coreEndpoint;
-
+    this.coreOrigin = new URL(coreEndpoint.webUrl).origin;
     this.coreApi = this.createApi(coreName, coreEndpoint);
   }
 
@@ -86,10 +91,15 @@ export class ServiceApp<
         // Add try login flag
         url = url.addUrlParam("tryLogin", tryLogin ?? false);
 
-        if (BridgeUtils.host == null) {
-          globalThis.location.href = url;
+        // Is it inside an iframe?
+        if (globalThis.self !== globalThis.parent) {
+          globalThis.parent.postMessage(["login", url], this.coreOrigin);
         } else {
-          BridgeUtils.host.loadApp(coreName, url);
+          if (BridgeUtils.host == null) {
+            globalThis.location.href = url;
+          } else {
+            BridgeUtils.host.loadApp(coreName, url);
+          }
         }
       });