@etsoo/materialui 1.3.95 → 1.3.97

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/ServiceApp.js

@@ -53,11 +53,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], new URL(this.coreEndpoint.webUrl).origin);
             }
             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
@@ -71,16 +77,17 @@ export class ServiceApp extends ReactApp {
      * @param dispatch User state dispatch
      */
     userLogin(user, refreshToken, keep, dispatch) {
-        // Super call, set token
-        super.userLogin(user, refreshToken, keep, dispatch);
         if (user.clientDeviceId && user.passphrase) {
             // Save the passphrase
-            const passphrase = this.decrypt(user.passphrase, `${user.uid}-${this.settings.appId}`);
+            // Interpolated string expressions are different between TypeScript and C# for the null value
+            const passphrase = this.decrypt(user.passphrase, `${user.uid ?? ""}-${this.settings.appId}`);
             if (passphrase) {
                 this.deviceId = user.clientDeviceId;
                 this.updatePassphrase(passphrase);
             }
         }
+        // Super call, set token
+        super.userLogin(user, refreshToken, keep, dispatch);
     }
     /**
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.95",
+  "version": "1.3.97",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.28",
+    "@etsoo/appscript": "^1.5.29",
     "@etsoo/notificationbase": "^1.1.49",
     "@etsoo/react": "^1.7.69",
     "@etsoo/shared": "^1.2.48",
@@ -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/ServiceApp.ts

@@ -86,10 +86,18 @@ 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],
+            new URL(this.coreEndpoint.webUrl).origin
+          );
         } else {
-          BridgeUtils.host.loadApp(coreName, url);
+          if (BridgeUtils.host == null) {
+            globalThis.location.href = url;
+          } else {
+            BridgeUtils.host.loadApp(coreName, url);
+          }
         }
       });
 
@@ -110,20 +118,21 @@ export class ServiceApp<
     keep?: boolean,
     dispatch?: boolean
   ): void {
-    // Super call, set token
-    super.userLogin(user, refreshToken, keep, 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}`
+        `${user.uid ?? ""}-${this.settings.appId}`
       );
       if (passphrase) {
         this.deviceId = user.clientDeviceId;
         this.updatePassphrase(passphrase);
       }
     }
+
+    // Super call, set token
+    super.userLogin(user, refreshToken, keep, dispatch);
   }
 
   /**