From 95babba50960b503ceeee5cd2701438313d42b0e Mon Sep 17 00:00:00 2001 From: mansisampat Date: Tue, 21 Oct 2025 22:22:40 +0530 Subject: [PATCH 1/6] Update registerStateListener internal method signature and structure --- packages/auth/src/core/auth/auth_impl.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/auth/src/core/auth/auth_impl.ts b/packages/auth/src/core/auth/auth_impl.ts index 258e2052186..4d813b5eed9 100644 --- a/packages/auth/src/core/auth/auth_impl.ts +++ b/packages/auth/src/core/auth/auth_impl.ts @@ -647,6 +647,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService { return this.registerStateListener( this.authStateSubscription, nextOrObserver, + this.currentUser, error, completed ); @@ -667,6 +668,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService { return this.registerStateListener( this.idTokenSubscription, nextOrObserver, + this.currentUser, error, completed ); @@ -814,9 +816,10 @@ export class AuthImpl implements AuthInternal, _FirebaseService { } } - private registerStateListener( - subscription: Subscription, - nextOrObserver: NextOrObserver, + private registerStateListener( + subscription: Subscription, + nextOrObserver: NextOrObserver, + currentValue: T | null, error?: ErrorFn, completed?: CompleteFn ): Unsubscribe { @@ -841,7 +844,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService { if (isUnsubscribed) { return; } - cb(this.currentUser); + cb(currentValue); }); if (typeof nextOrObserver === 'function') { From 9d79315d62cb48652867d90f58c5ae399ed4e840 Mon Sep 17 00:00:00 2001 From: mansisampat Date: Mon, 27 Oct 2025 13:14:32 +0530 Subject: [PATCH 2/6] Update params of registerStateListener method --- packages/auth/src/core/auth/auth_impl.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/auth/src/core/auth/auth_impl.ts b/packages/auth/src/core/auth/auth_impl.ts index 4d813b5eed9..7d83c183a35 100644 --- a/packages/auth/src/core/auth/auth_impl.ts +++ b/packages/auth/src/core/auth/auth_impl.ts @@ -816,10 +816,10 @@ export class AuthImpl implements AuthInternal, _FirebaseService { } } - private registerStateListener( - subscription: Subscription, - nextOrObserver: NextOrObserver, - currentValue: T | null, + private registerStateListener( + subscription: Subscription, + nextOrObserver: NextOrObserver, + currentValue: User | null, error?: ErrorFn, completed?: CompleteFn ): Unsubscribe { From 1f5d0d28816d8a8fbf0187a14e80c242c77dc0c4 Mon Sep 17 00:00:00 2001 From: mansisampat Date: Mon, 27 Oct 2025 14:30:33 +0530 Subject: [PATCH 3/6] Update logic to callback --- packages/auth/src/core/auth/auth_impl.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/auth/src/core/auth/auth_impl.ts b/packages/auth/src/core/auth/auth_impl.ts index 7d83c183a35..50ceabc511d 100644 --- a/packages/auth/src/core/auth/auth_impl.ts +++ b/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 ); @@ -816,10 +814,9 @@ export class AuthImpl implements AuthInternal, _FirebaseService { } } - private registerStateListener( - subscription: Subscription, - nextOrObserver: NextOrObserver, - currentValue: User | null, + private registerStateListener( + subscription: Subscription, + nextOrObserver: NextOrObserver, error?: ErrorFn, completed?: CompleteFn ): Unsubscribe { @@ -844,7 +841,11 @@ export class AuthImpl implements AuthInternal, _FirebaseService { if (isUnsubscribed) { return; } - cb(currentValue); + if (subscription as unknown == this.idTokenSubscription) { + 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') { From 7fbf586ad1ea0017c06020b3b48593eea562d322 Mon Sep 17 00:00:00 2001 From: mansisampat Date: Mon, 27 Oct 2025 14:35:10 +0530 Subject: [PATCH 4/6] running yarn run format --- packages/auth/src/core/auth/auth_impl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/auth/src/core/auth/auth_impl.ts b/packages/auth/src/core/auth/auth_impl.ts index 50ceabc511d..1d0b606a7f3 100644 --- a/packages/auth/src/core/auth/auth_impl.ts +++ b/packages/auth/src/core/auth/auth_impl.ts @@ -841,9 +841,9 @@ export class AuthImpl implements AuthInternal, _FirebaseService { if (isUnsubscribed) { return; } - if (subscription as unknown == this.idTokenSubscription) { + if ((subscription as unknown) == this.idTokenSubscription) { cb(this.currentUser as unknown as T); - } else if (subscription as unknown == this.firebaseTokenSubscription) { + } else if ((subscription as unknown) == this.firebaseTokenSubscription) { cb(this.firebaseToken as unknown as T); } }); From f8606d8e8b547a8c92bc55565e4c615cd7e38caf Mon Sep 17 00:00:00 2001 From: mansisampat Date: Mon, 27 Oct 2025 14:39:37 +0530 Subject: [PATCH 5/6] running yarn run format --- packages/auth/src/core/auth/auth_impl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/auth/src/core/auth/auth_impl.ts b/packages/auth/src/core/auth/auth_impl.ts index 1d0b606a7f3..0264fff7c9d 100644 --- a/packages/auth/src/core/auth/auth_impl.ts +++ b/packages/auth/src/core/auth/auth_impl.ts @@ -841,9 +841,9 @@ export class AuthImpl implements AuthInternal, _FirebaseService { if (isUnsubscribed) { return; } - if ((subscription as unknown) == this.idTokenSubscription) { + if ((subscription as unknown) === this.idTokenSubscription) { cb(this.currentUser as unknown as T); - } else if ((subscription as unknown) == this.firebaseTokenSubscription) { + } else if ((subscription as unknown) === this.firebaseTokenSubscription) { cb(this.firebaseToken as unknown as T); } }); From 5c480676fa95d1d309cd7148be074e7b4aff153b Mon Sep 17 00:00:00 2001 From: mansisampat Date: Mon, 27 Oct 2025 14:47:36 +0530 Subject: [PATCH 6/6] running yarn run format --- packages/auth/src/core/auth/auth_impl.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/auth/src/core/auth/auth_impl.ts b/packages/auth/src/core/auth/auth_impl.ts index 0264fff7c9d..1036f295627 100644 --- a/packages/auth/src/core/auth/auth_impl.ts +++ b/packages/auth/src/core/auth/auth_impl.ts @@ -841,7 +841,10 @@ export class AuthImpl implements AuthInternal, _FirebaseService { if (isUnsubscribed) { return; } - if ((subscription as unknown) === this.idTokenSubscription) { + 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);