Merge pull request #5404 from WalletConnect/fix/json-parse-err

fix: json parse unhandled
WalletConnect · Sep 30, 2024 · 744e71f · 744e71f
2 parents cd15477 + 93e61ee
commit 744e71f
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/packages/core/src/controllers/verify.ts b/packages/core/src/controllers/verify.ts
@@ -80,16 +80,21 @@ export class Verify extends IVerify {
         iframe.addEventListener("error", abortListener, { signal: this.abortController.signal });
         const listener = (event: MessageEvent) => {
           if (!event.data) return;
-          const data = JSON.parse(event.data);
-          if (data.type === "verify_attestation") {
-            const decoded = decodeJWT(data.attestation) as unknown as { payload: JwkPayload };
-            if (decoded.payload.id !== id) return;
-
-            clearInterval(abortTimeout);
-            document.body.removeChild(iframe);
-            this.abortController.signal.removeEventListener("abort", abortListener);
-            window.removeEventListener("message", listener);
-            resolve(data.attestation === null ? "" : data.attestation);
+          if (typeof event.data !== "string") return;
+          try {
+            const data = JSON.parse(event.data);
+            if (data.type === "verify_attestation") {
+              const decoded = decodeJWT(data.attestation) as unknown as { payload: JwkPayload };
+              if (decoded.payload.id !== id) return;
+
+              clearInterval(abortTimeout);
+              document.body.removeChild(iframe);
+              this.abortController.signal.removeEventListener("abort", abortListener);
+              window.removeEventListener("message", listener);
+              resolve(data.attestation === null ? "" : data.attestation);
+            }
+          } catch (e) {
+            this.logger.warn(e);
           }
         };
         document.body.appendChild(iframe);