Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions packages/auth/src/core/auth/auth_impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -814,9 +814,9 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
}
}

private registerStateListener(
subscription: Subscription<User>,
nextOrObserver: NextOrObserver<User>,
private registerStateListener<T>(
subscription: Subscription<T>,
nextOrObserver: NextOrObserver<T>,
error?: ErrorFn,
completed?: CompleteFn
): Unsubscribe {
Expand All @@ -841,7 +841,14 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
if (isUnsubscribed) {
return;
}
cb(this.currentUser);
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') {
Expand Down
Loading