Removing onFirebaseTokenChanged from public_types

Author: mansisampat

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

@@ -549,7 +549,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
       await this._setRedirectUser(null);
     }
     if (this.tenantConfig) {
-      return this._updateFirebaseToken(null);
+      await this._updateFirebaseToken(null);
     }
     // Prevent callbacks from being called again in _updateCurrentUser, as
     // they were already called in the first line.

packages/auth/src/core/auth/firebase_internal.test.ts

@@ -331,19 +331,15 @@ describe('core/auth/firebase_internal - Regional Firebase Auth', () => {
     let isProactiveRefresh = false;
     const initialToken = 'initial-regional-token';
     const updatedToken = 'updated-regional-token';
-    beforeEach(async() => {
+    beforeEach(async () => {
       isProactiveRefresh = false;
 
-      sinon
-        .stub(regionalAuth, '_startProactiveRefresh')
-        .callsFake(() => {
-          isProactiveRefresh = true;
-        });
-      sinon
-        .stub(regionalAuth, '_stopProactiveRefresh')
-        .callsFake(() => {
-          isProactiveRefresh = false;
-        });
+      sinon.stub(regionalAuth, '_startProactiveRefresh').callsFake(() => {
+        isProactiveRefresh = true;
+      });
+      sinon.stub(regionalAuth, '_stopProactiveRefresh').callsFake(() => {
+        isProactiveRefresh = false;
+      });
       await regionalAuth._updateFirebaseToken({
         token: initialToken,
         expirationTime: now + 300_000
@@ -354,21 +350,21 @@ describe('core/auth/firebase_internal - Regional Firebase Auth', () => {
       let firstCall = true;
 
       regionalAuthInternal.addAuthTokenListener(token => {
-          if (firstCall) {
-            firstCall = false;
-            expect(token).to.eq(initialToken);
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            regionalAuth._updateFirebaseToken({
-              token: updatedToken,
-              expirationTime: now + 300_000
-            });
-            return;
-          }
+        if (firstCall) {
+          firstCall = false;
+          expect(token).to.eq(initialToken);
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          regionalAuth._updateFirebaseToken({
+            token: updatedToken,
+            expirationTime: now + 300_000
+          });
+          return;
+        }
 
-          expect(token).to.eq(updatedToken);
-          expect(isProactiveRefresh).to.be.true;
-          done();
-        });
+        expect(token).to.eq(updatedToken);
+        expect(isProactiveRefresh).to.be.true;
+        done();
+      });
     });
 
     it('gets called on subsequent updates', async () => {
@@ -386,13 +382,12 @@ describe('core/auth/firebase_internal - Regional Firebase Auth', () => {
     });
 
     it('errors if Regional Auth is not initialized', () => {
-        delete (regionalAuth as unknown as Record<string, unknown>)[
-          '_initializationPromise'
-        ];
-        expect(() => regionalAuthInternal.addAuthTokenListener(() => {})).to.throw(
-          FirebaseError,
-          'auth/dependent-sdk-initialized-before-auth'
-        );
-      });
+      delete (regionalAuth as unknown as Record<string, unknown>)[
+        '_initializationPromise'
+      ];
+      expect(() =>
+        regionalAuthInternal.addAuthTokenListener(() => {})
+      ).to.throw(FirebaseError, 'auth/dependent-sdk-initialized-before-auth');
+    });
   });
 });

packages/auth/src/core/auth/firebase_internal.ts

@@ -64,14 +64,16 @@ export class AuthInterop implements FirebaseAuthInternal {
 
     let unsubscribe: Unsubscribe;
     if (this.auth.tenantConfig) {
-      unsubscribe = this.auth.onFirebaseTokenChanged((firebaseToken: FirebaseToken | null) => {
-        try {
-          listener(firebaseToken?.token || null);
-        } catch (error) {
-          console.error('Failed to retrieve firebase token:', error);
-          listener(null);
+      unsubscribe = this.auth.onFirebaseTokenChanged(
+        (firebaseToken: FirebaseToken | null) => {
+          try {
+            listener(firebaseToken?.token || null);
+          } catch (error) {
+            console.error('Failed to retrieve firebase token:', error);
+            listener(null);
+          }
         }
-      });
+      );
     } else {
       unsubscribe = this.auth.onIdTokenChanged(user => {
         listener(

packages/auth/src/model/auth.ts

@@ -18,13 +18,17 @@
 import {
   Auth,
   AuthSettings,
+  CompleteFn,
   Config,
   EmulatorConfig,
+  ErrorFn,
+  NextOrObserver,
   PasswordPolicy,
   PasswordValidationStatus,
   PopupRedirectResolver,
   TenantConfig,
-  User
+  User,
+  Unsubscribe
 } from './public_types';
 import { ErrorFactory } from '@firebase/util';
 import { AuthErrorCode, AuthErrorParams } from '../core/errors';
@@ -77,6 +81,11 @@ export interface AuthInternal extends Auth {
   currentUser: User | null;
   emulatorConfig: EmulatorConfig | null;
   getFirebaseAccessToken(forceRefresh?: boolean): Promise<string | null>;
+  onFirebaseTokenChanged(
+    nextOrObserver: NextOrObserver<FirebaseToken | null>,
+    error?: ErrorFn,
+    completed?: CompleteFn
+  ): Unsubscribe;
   _agentRecaptchaConfig: RecaptchaConfig | null;
   _tenantRecaptchaConfigs: Record<string, RecaptchaConfig>;
   _projectPasswordPolicy: PasswordPolicy | null;

packages/auth/src/model/public_types.ts

@@ -32,7 +32,6 @@ import {
   OperationType as OperationTypeMap,
   ActionCodeOperation as ActionCodeOperationMap
 } from './enum_maps';
-import { FirebaseToken } from './auth';
 
 export { CompleteFn, ErrorFn, NextFn, Unsubscribe };
 
@@ -362,11 +361,6 @@ export interface Auth {
     error?: ErrorFn,
     completed?: CompleteFn
   ): Unsubscribe;
-  onFirebaseTokenChanged(
-    nextOrObserver: NextOrObserver<FirebaseToken | null>,
-    error?: ErrorFn,
-    completed?: CompleteFn
-  ): Unsubscribe;
   /**
    * returns a promise that resolves immediately when the initial
    * auth state is settled. When the promise resolves, the current user might be a valid user