Merge branch 'master' into feature-otp-api-client-implementation

auth0 · Jan 3, 2022 · 9f337dd · 9f337dd
2 parents a440bec + 667e5ca
commit 9f337dd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/webauth/__mocks__/linking.js b/src/webauth/__mocks__/linking.js
@@ -1,14 +1,18 @@
 import EventEmitter from 'events';
 
-class CustomEmitter extends EventEmitter {}
+class CustomEmitter extends EventEmitter {
+  remove() {
+    this.removeAllListeners();
+  }
+}
 
 export default class Linking {
   constructor() {
     this.emitter = new CustomEmitter();
   }
 
   addEventListener(event, fn) {
-    this.emitter.addListener(event, fn);
+    return this.emitter.addListener(event, fn);
   }
 
   removeEventListener(event, fn) {

diff --git a/src/webauth/agent.js b/src/webauth/agent.js
@@ -16,16 +16,23 @@ export default class Agent {
     }
 
     return new Promise((resolve, reject) => {
+      let eventURL;
       const urlHandler = event => {
         NativeModules.A0Auth0.hide();
-        Linking.removeEventListener('url', urlHandler);
+        if (!skipLegacyListener) {
+          eventURL.remove();
+        }
         resolve(event.url);
       };
       const params =
         Platform.OS === 'ios' ? [ephemeralSession, closeOnLoad] : [closeOnLoad];
-      if (!skipLegacyListener) Linking.addEventListener('url', urlHandler);
+      if (!skipLegacyListener) {
+        eventURL = Linking.addEventListener('url', urlHandler);
+      }
       NativeModules.A0Auth0.showUrl(url, ...params, (error, redirectURL) => {
-        if (!skipLegacyListener) Linking.removeEventListener('url', urlHandler);
+        if (!skipLegacyListener) {
+          eventURL.remove();
+        }
         if (error) {
           reject(error);
         } else if (redirectURL) {