fix(authentication): retain authStateChangeEvent until consumed (#186)

capawesome-team · Aug 28, 2022 · eeeecae · eeeecae
1 parent e06605d
commit eeeecae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.changeset/twelve-crabs-fetch.md b/.changeset/twelve-crabs-fetch.md
@@ -0,0 +1,5 @@
+---
+"@capacitor-firebase/authentication": patch
+---
+
+fix: retain `authStateChangeEvent` until consumed on Android and iOS
diff --git a/.../capawesome/capacitorjs/plugins/firebase/authentication/FirebaseAuthenticationPlugin.java b/.../capawesome/capacitorjs/plugins/firebase/authentication/FirebaseAuthenticationPlugin.java
@@ -441,10 +441,6 @@ public void startActivityForResult(PluginCall call, Intent intent, String callba
         super.startActivityForResult(call, intent, callbackName);
     }
 
-    public void notifyListeners(String eventName, JSObject data) {
-        super.notifyListeners(eventName, data);
-    }
-
     @Override
     protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
         super.handleOnActivityResult(requestCode, resultCode, data);
@@ -456,7 +452,7 @@ private void updateAuthState() {
         JSObject userResult = FirebaseAuthenticationHelper.createUserResult(user);
         JSObject result = new JSObject();
         result.put("user", userResult);
-        notifyListeners(AUTH_STATE_CHANGE_EVENT, result);
+        notifyListeners(AUTH_STATE_CHANGE_EVENT, result, true);
     }
 
     @ActivityCallback

diff --git a/packages/authentication/ios/Plugin/FirebaseAuthenticationPlugin.swift b/packages/authentication/ios/Plugin/FirebaseAuthenticationPlugin.swift
@@ -329,7 +329,7 @@ public class FirebaseAuthenticationPlugin: CAPPlugin {
         let userResult = FirebaseAuthenticationHelper.createUserResult(user)
         var result = JSObject()
         result["user"] = userResult
-        notifyListeners(authStateChangeEvent, data: result)
+        notifyListeners(authStateChangeEvent, data: result, retainUntilConsumed: true)
     }
 
     private func firebaseAuthenticationConfig() -> FirebaseAuthenticationConfig {