update registerStateListener logic

Author: mansisampat

packages/auth/src/core/auth/auth_impl.ts

@@ -647,7 +647,6 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     return this.registerStateListener(
       this.authStateSubscription,
       nextOrObserver,
-      this.currentUser,
       error,
       completed
     );
@@ -668,7 +667,6 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     return this.registerStateListener(
       this.idTokenSubscription,
       nextOrObserver,
-      this.currentUser,
       error,
       completed
     );
@@ -682,7 +680,6 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     return this.registerStateListener(
       this.firebaseTokenSubscription,
       nextOrObserver,
-      this.firebaseToken,
       error,
       completed
     );
@@ -833,7 +830,6 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
   private registerStateListener<T>(
     subscription: Subscription<T>,
     nextOrObserver: NextOrObserver<T>,
-    currentValue: T | null,
     error?: ErrorFn,
     completed?: CompleteFn
   ): Unsubscribe {
@@ -858,7 +854,14 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
       if (isUnsubscribed) {
         return;
       }
-      cb(currentValue);
+      if (
+        (subscription as unknown) === this.idTokenSubscription ||
+        (subscription as unknown) === this.authStateSubscription
+      ) {
+        cb(this.currentUser as unknown as T);
+      } else if ((subscription as unknown) === this.firebaseTokenSubscription) {
+        cb(this.firebaseToken as unknown as T);
+      }
     });
 
     if (typeof nextOrObserver === 'function') {