Merge pull request #19 from openfort-xyz/fix/logout-dispose

Fix/logout dispose
openfort-xyz · Mar 15, 2024 · 5957939 · 5957939
2 parents 7ac7834 + 6aea688
commit 5957939
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@openfort/openfort-js",
-    "version": "0.5.16",
+    "version": "0.5.17",
     "description": "",
     "author": "Openfort",
     "repository": {

diff --git a/src/clients/iframe-client.ts b/src/clients/iframe-client.ts
@@ -6,10 +6,10 @@ export class IframeClient {
             throw new Error("must be run in a browser");
         }
 
-        const actualIframeURL = document.getElementById("openfort-iframe");
+        const actualIframeURL = document.getElementById("openfort-iframe") as HTMLIFrameElement;
         if (actualIframeURL) {
-            actualIframeURL.setAttribute("src", "https://iframe.openfort.xyz/iframe?accessToken=" + accessToken + "&publishableKey=" + publishableKey);
-            this._iframe = actualIframeURL as HTMLIFrameElement;
+            actualIframeURL.src = "https://iframe.openfort.xyz/iframe?accessToken=" + accessToken + "&publishableKey=" + publishableKey;
+            this._iframe = actualIframeURL;
             return;
         }
 
@@ -21,13 +21,6 @@ export class IframeClient {
         document.body.appendChild(this._iframe);
     }
 
-    public dispose(): void {
-        const iframe = document.getElementById("openfort-iframe");
-        if (iframe) {
-            iframe.remove();
-        }
-    }
-
     public isLoaded(): boolean {
         return this._iframe.contentWindow !== null;
     }
@@ -57,14 +50,16 @@ export class IframeClient {
 
             window.addEventListener("message", handleMessage);
 
-            this._iframe.contentWindow?.postMessage(
-                {
-                    action: "generateKey",
-                    password: password,
-                    chainId: chainId,
-                },
-                "*",
-            );
+            setTimeout(() => {
+                this._iframe.contentWindow?.postMessage(
+                    {
+                        action: "generateKey",
+                        password: password,
+                        chainId: chainId,
+                    },
+                    "*",
+                );
+            }, 1000);
         });
     }
 

diff --git a/src/signer/embedded.signer.ts b/src/signer/embedded.signer.ts
@@ -19,7 +19,6 @@ export class EmbeddedSigner implements ISigner {
     async logout(): Promise<void> {
         await this._iframeClient.logout();
         this._instanceManager.removeDeviceID();
-        this._iframeClient.dispose();
     }
     useCredentials(): boolean {
         return true;

diff --git a/src/version.ts b/src/version.ts
@@ -1,2 +1,2 @@
-export const VERSION = "0.5.16";
+export const VERSION = "0.5.17";
 export const PACKAGE = "@openfort/openfort-js";