@tomo-inc/embedded-wallet-providers 0.0.20 → 0.0.22

package/dist/index.cjs

@@ -164,12 +164,14 @@ var onResponse = async (requestParams) => {
 var EmbeddedWallet = class _EmbeddedWallet {
   constructor() {
     this.themeConfig = null;
+    this.walletCloseHandlerRegistered = false;
     this.walletIframe = null;
     this.walletOrigin = "";
     this.maskZIndex = 999;
     this.isAvailable = false;
     this.config = null;
     this.info = null;
+    this.oidcToken = "";
     this.connectors = {
       [walletUtils.ChainTypeEnum.BITCOIN]: null,
       [walletUtils.ChainTypeEnum.DOGECOIN]: null,
@@ -285,7 +287,34 @@ var EmbeddedWallet = class _EmbeddedWallet {
     if (!config) {
       throw new Error("config is not initialized");
     }
+    this.oidcToken = oidcToken || "";
     return new Promise((resolve, reject) => {
+      const receiveResponse = (event) => {
+        var _a, _b;
+        const { origin, data } = event;
+        if ((data == null ? void 0 : data.type) === "wallet-ready" && origin === this.walletOrigin) {
+          this.isAvailable = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a.isAvailable) || false;
+          if (this.themeConfig) {
+            setTimeout(() => {
+              this.request("theme-change", this.themeConfig);
+            }, 0);
+          }
+          const payload = (_b = data == null ? void 0 : data.data) != null ? _b : { isAvailable: false, connectedInfo: null };
+          resolve(payload);
+          if (this.loginStatusCallback) {
+            this == null ? void 0 : this.loginStatusCallback({ type: "login" });
+          }
+          window.removeEventListener("message", receiveResponse);
+        }
+        if ((data == null ? void 0 : data.type) === "wallet-close" && origin === this.walletOrigin) {
+          this.close();
+        }
+      };
+      window.addEventListener("message", receiveResponse);
+      if (!this.walletCloseHandlerRegistered) {
+        window.addEventListener("message", this.walletCloseHandler);
+        this.walletCloseHandlerRegistered = true;
+      }
       try {
         const { walletBaseUrl, clientId, stage, logo, name } = config || {};
         if (!walletBaseUrl || !clientId) {
@@ -293,6 +322,10 @@ var EmbeddedWallet = class _EmbeddedWallet {
         }
         const EMBEDDED_WALLET_ID = clientId;
         let walletIframe = document.getElementById(EMBEDDED_WALLET_ID);
+        if (oidcToken && walletIframe) {
+          walletIframe.remove();
+          walletIframe = null;
+        }
         if (!walletIframe) {
           walletIframe = document.createElement("iframe");
           walletIframe.style.cssText = `width: 0; height: 0; background: transparent; background-color: transparent; border: none;`;
@@ -304,40 +337,20 @@ var EmbeddedWallet = class _EmbeddedWallet {
           dappOrigin: window.location.origin,
           tomoStage: stage,
           tomoClientId: clientId,
-          oidcToken: oidcToken || "",
+          oidcToken: this.oidcToken,
           logo: logo || "",
           name: name || ""
         });
-        walletIframe.src = `${walletBaseUrl}#${searchParams.toString()}`;
+        const r = Math.random().toString(36).substring(2, 15);
+        walletIframe.src = `${walletBaseUrl}?r1=${r}#${searchParams.toString()}`;
         walletIframe.setAttribute("allowTransparency", "true");
         walletIframe.allow = "publickey-credentials-get; publickey-credentials-create";
         this.walletIframe = walletIframe;
       } catch (error) {
         console.error("login error", error);
+        window.removeEventListener("message", receiveResponse);
         reject(error);
       }
-      const receiveResponse = ({ origin, data }) => {
-        var _a;
-        if ((data == null ? void 0 : data.type) === "wallet-ready" && origin === this.walletOrigin) {
-          console.log("------receiveResponse", data, origin);
-          this.isAvailable = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a.isAvailable) || false;
-          if (this.themeConfig) {
-            setTimeout(() => {
-              this.request("theme-change", this.themeConfig);
-            }, 0);
-          }
-          resolve(data == null ? void 0 : data.data);
-          if (this.loginStatusCallback) {
-            this == null ? void 0 : this.loginStatusCallback({ type: "login" });
-          }
-          window.removeEventListener("message", receiveResponse);
-        }
-        if ((data == null ? void 0 : data.type) === "wallet-close" && origin === this.walletOrigin) {
-          this.close();
-        }
-      };
-      window.addEventListener("message", receiveResponse);
-      window.addEventListener("message", this.walletCloseHandler);
     });
   }
   async themeChange(theme) {
@@ -367,6 +380,8 @@ var EmbeddedWallet = class _EmbeddedWallet {
   async logout() {
     if (this.walletIframe) {
       this.walletIframe.src = `${this.walletOrigin}#logout=true`;
+      const config = this.config;
+      config && this.init(config);
     }
     window.removeEventListener("message", this.walletCloseHandler);
     window.removeEventListener("message", this.logoutListener);

package/dist/index.d.cts

@@ -49,12 +49,14 @@ type EmbeddedWalletConnectors = {
 declare class EmbeddedWallet {
     private static instance;
     private themeConfig;
+    private walletCloseHandlerRegistered;
     walletIframe: HTMLIFrameElement | null;
     walletOrigin: string;
     maskZIndex: number;
     isAvailable: boolean;
     config: EmbeddedWalletConfig | null;
     info: WalletInfo | null;
+    private oidcToken;
     connectors: EmbeddedWalletConnectors;
     loginByGoogle: (() => Promise<string>) | null;
     loginByX: (() => Promise<string>) | null;

package/dist/index.d.ts

@@ -49,12 +49,14 @@ type EmbeddedWalletConnectors = {
 declare class EmbeddedWallet {
     private static instance;
     private themeConfig;
+    private walletCloseHandlerRegistered;
     walletIframe: HTMLIFrameElement | null;
     walletOrigin: string;
     maskZIndex: number;
     isAvailable: boolean;
     config: EmbeddedWalletConfig | null;
     info: WalletInfo | null;
+    private oidcToken;
     connectors: EmbeddedWalletConnectors;
     loginByGoogle: (() => Promise<string>) | null;
     loginByX: (() => Promise<string>) | null;

package/dist/index.js

@@ -162,12 +162,14 @@ var onResponse = async (requestParams) => {
 var EmbeddedWallet = class _EmbeddedWallet {
   constructor() {
     this.themeConfig = null;
+    this.walletCloseHandlerRegistered = false;
     this.walletIframe = null;
     this.walletOrigin = "";
     this.maskZIndex = 999;
     this.isAvailable = false;
     this.config = null;
     this.info = null;
+    this.oidcToken = "";
     this.connectors = {
       [ChainTypeEnum.BITCOIN]: null,
       [ChainTypeEnum.DOGECOIN]: null,
@@ -283,7 +285,34 @@ var EmbeddedWallet = class _EmbeddedWallet {
     if (!config) {
       throw new Error("config is not initialized");
     }
+    this.oidcToken = oidcToken || "";
     return new Promise((resolve, reject) => {
+      const receiveResponse = (event) => {
+        var _a, _b;
+        const { origin, data } = event;
+        if ((data == null ? void 0 : data.type) === "wallet-ready" && origin === this.walletOrigin) {
+          this.isAvailable = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a.isAvailable) || false;
+          if (this.themeConfig) {
+            setTimeout(() => {
+              this.request("theme-change", this.themeConfig);
+            }, 0);
+          }
+          const payload = (_b = data == null ? void 0 : data.data) != null ? _b : { isAvailable: false, connectedInfo: null };
+          resolve(payload);
+          if (this.loginStatusCallback) {
+            this == null ? void 0 : this.loginStatusCallback({ type: "login" });
+          }
+          window.removeEventListener("message", receiveResponse);
+        }
+        if ((data == null ? void 0 : data.type) === "wallet-close" && origin === this.walletOrigin) {
+          this.close();
+        }
+      };
+      window.addEventListener("message", receiveResponse);
+      if (!this.walletCloseHandlerRegistered) {
+        window.addEventListener("message", this.walletCloseHandler);
+        this.walletCloseHandlerRegistered = true;
+      }
       try {
         const { walletBaseUrl, clientId, stage, logo, name } = config || {};
         if (!walletBaseUrl || !clientId) {
@@ -291,6 +320,10 @@ var EmbeddedWallet = class _EmbeddedWallet {
         }
         const EMBEDDED_WALLET_ID = clientId;
         let walletIframe = document.getElementById(EMBEDDED_WALLET_ID);
+        if (oidcToken && walletIframe) {
+          walletIframe.remove();
+          walletIframe = null;
+        }
         if (!walletIframe) {
           walletIframe = document.createElement("iframe");
           walletIframe.style.cssText = `width: 0; height: 0; background: transparent; background-color: transparent; border: none;`;
@@ -302,40 +335,20 @@ var EmbeddedWallet = class _EmbeddedWallet {
           dappOrigin: window.location.origin,
           tomoStage: stage,
           tomoClientId: clientId,
-          oidcToken: oidcToken || "",
+          oidcToken: this.oidcToken,
           logo: logo || "",
           name: name || ""
         });
-        walletIframe.src = `${walletBaseUrl}#${searchParams.toString()}`;
+        const r = Math.random().toString(36).substring(2, 15);
+        walletIframe.src = `${walletBaseUrl}?r1=${r}#${searchParams.toString()}`;
         walletIframe.setAttribute("allowTransparency", "true");
         walletIframe.allow = "publickey-credentials-get; publickey-credentials-create";
         this.walletIframe = walletIframe;
       } catch (error) {
         console.error("login error", error);
+        window.removeEventListener("message", receiveResponse);
         reject(error);
       }
-      const receiveResponse = ({ origin, data }) => {
-        var _a;
-        if ((data == null ? void 0 : data.type) === "wallet-ready" && origin === this.walletOrigin) {
-          console.log("------receiveResponse", data, origin);
-          this.isAvailable = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a.isAvailable) || false;
-          if (this.themeConfig) {
-            setTimeout(() => {
-              this.request("theme-change", this.themeConfig);
-            }, 0);
-          }
-          resolve(data == null ? void 0 : data.data);
-          if (this.loginStatusCallback) {
-            this == null ? void 0 : this.loginStatusCallback({ type: "login" });
-          }
-          window.removeEventListener("message", receiveResponse);
-        }
-        if ((data == null ? void 0 : data.type) === "wallet-close" && origin === this.walletOrigin) {
-          this.close();
-        }
-      };
-      window.addEventListener("message", receiveResponse);
-      window.addEventListener("message", this.walletCloseHandler);
     });
   }
   async themeChange(theme) {
@@ -365,6 +378,8 @@ var EmbeddedWallet = class _EmbeddedWallet {
   async logout() {
     if (this.walletIframe) {
       this.walletIframe.src = `${this.walletOrigin}#logout=true`;
+      const config = this.config;
+      config && this.init(config);
     }
     window.removeEventListener("message", this.walletCloseHandler);
     window.removeEventListener("message", this.logoutListener);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/embedded-wallet-providers",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,
@@ -28,7 +28,12 @@
     "tsx": "^4.19.2",
     "typescript": "^5.0.0",
     "@vitest/browser": "^3.2.4",
+    "@vitest/coverage-v8": "^3.2.4",
     "playwright": "^1.44.1",
     "vitest": "^3.2.4"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format esm,cjs --dts --treeshake",
+    "test": "vitest run"
   }
 }

package/project.json

@@ -51,7 +51,7 @@
       "executor": "nx:run-commands",
       "outputs": ["{projectRoot}/coverage"],
       "options": {
-        "command": "vitest run",
+        "command": "vitest run --coverage",
         "cwd": "packages/embedded-wallet-providers"
       }
     },