Merge pull request #4403 from WalletConnect/fix/fallback-listener

fix: fallback event listener cleanup
WalletConnect · Apr 5, 2024 · b48ae14 · b48ae14
2 parents 340c7db + 0c0acea
commit b48ae14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/sign-client/src/controllers/engine.ts b/packages/sign-client/src/controllers/engine.ts
@@ -710,15 +710,20 @@ export class Engine extends IEngine {
     };
     // handle session authenticate response
     const onAuthenticate = async (payload: any) => {
-      // remove cleanup for fallback response
-      this.events.off(engineEvent("session_connect"), onSessionConnect);
       if (payload.error) {
         // wallets that do not support wc_sessionAuthenticate will return an error
         // we should not reject the promise in this case as the fallback session proposal will be used
         const error = getSdkError("WC_METHOD_UNSUPPORTED", "wc_sessionAuthenticate");
         if (payload.error.code === error.code) return;
+
+        // cleanup listener for fallback response
+        this.events.off(engineEvent("session_connect"), onSessionConnect);
         return reject(payload.error.message);
       }
+
+      // cleanup listener for fallback response
+      this.events.off(engineEvent("session_connect"), onSessionConnect);
+
       const {
         cacaos,
         responder,

diff --git a/packages/sign-client/test/sdk/auth.spec.ts b/packages/sign-client/test/sdk/auth.spec.ts
@@ -1124,6 +1124,15 @@ describe("Authenticated Sessions", () => {
       metadata: TEST_APP_METADATA_B,
     });
 
+    // force wallet to not support `wc_sessionAuthenticate` by removing it from registered methods
+    const supportedMethods = ENGINE_RPC_OPTS;
+    const toRegisterMethods = Object.keys(supportedMethods).filter(
+      (method) => method !== "wc_sessionAuthenticate",
+    );
+    //@ts-expect-error
+    wallet.core.pairing.registeredMethods = [];
+    wallet.core.pairing.register({ methods: toRegisterMethods });
+
     await Promise.all([
       new Promise<void>((resolve) => {
         wallet.on("session_proposal", async (payload) => {
@@ -1151,7 +1160,7 @@ describe("Authenticated Sessions", () => {
         });
       }),
       new Promise<void>((resolve) => {
-        wallet.pair({ uri: uri.replace("methods", "") });
+        wallet.pair({ uri });
         resolve();
       }),
     ]);