Use getAuth for default auth instance and initializeAuth for locationData

Author: mansisampat

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

@@ -30,7 +30,7 @@ import {
   NextOrObserver,
   Persistence,
   PopupRedirectResolver,
-  RegionData,
+  LocationData,
   User,
   UserCredential,
   CompleteFn,
@@ -127,7 +127,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     | undefined = undefined;
   _persistenceManagerAvailable: Promise<void>;
   readonly name: string;
-  readonly regionData: RegionData;
+  readonly locationData: LocationData;
 
   // Tracks the last notified UID for state change listeners to prevent
   // repeated calls to the callbacks. Undefined means it's never been
@@ -143,7 +143,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     private readonly heartbeatServiceProvider: Provider<'heartbeat'>,
     private readonly appCheckServiceProvider: Provider<AppCheckInternalComponentName>,
     public readonly config: ConfigInternal,
-    regionData?: RegionData
+    locationData?: LocationData
   ) {
     this.name = app.name;
     this.clientVersion = config.sdkClientVersion;
@@ -152,7 +152,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     this._persistenceManagerAvailable = new Promise<void>(
       resolve => (this._resolvePersistenceManagerAvailable = resolve)
     );
-    this.regionData = regionData ?? {};
+    this.locationData = locationData ?? {};
   }
 
   _initializeWithPersistence(

packages/auth/src/core/auth/register.ts

@@ -69,7 +69,7 @@ export function registerAuth(clientPlatform: ClientPlatform): void {
         const appCheckServiceProvider =
           container.getProvider<'app-check-internal'>('app-check-internal');
         const { apiKey, authDomain } = app.options;
-        const regionData = deps?.regionData ?? { location: '', tenantId: '' };
+        const locationData = deps?.locationData ?? { location: '', tenantId: '' };
         console.log("inside register auth new component");
         _assert(
           apiKey && !apiKey.includes(':'),
@@ -81,7 +81,7 @@ export function registerAuth(clientPlatform: ClientPlatform): void {
           apiKey,
           authDomain,
           clientPlatform,
-          apiHost: regionData.location ? DefaultConfig.REGIONAL_API_HOST : DefaultConfig.API_HOST,
+          apiHost: locationData.location ? DefaultConfig.REGIONAL_API_HOST : DefaultConfig.API_HOST,
           tokenApiHost: DefaultConfig.TOKEN_API_HOST,
           apiScheme: DefaultConfig.API_SCHEME,
           sdkClientVersion: _getClientVersion(clientPlatform)
@@ -92,7 +92,7 @@ export function registerAuth(clientPlatform: ClientPlatform): void {
           heartbeatServiceProvider,
           appCheckServiceProvider,
           config,
-          regionData
+          locationData
         );
         _initializeAuthInstance(authInstance, deps);
 

packages/auth/src/model/public_types.ts

@@ -1260,10 +1260,10 @@ export interface Dependencies {
    * Which {@link AuthErrorMap} to use.
    */
   errorMap?: AuthErrorMap;
-  regionData?: RegionData
+  locationData?: LocationData;
 }
 
-export interface RegionData {
+export interface LocationData {
   location?: string;
   tenantId?: string;
 }

packages/auth/src/platform_browser/index.ts

@@ -29,12 +29,11 @@ import { browserLocalPersistence } from './persistence/local_storage';
 import { browserSessionPersistence } from './persistence/session_storage';
 import { indexedDBLocalPersistence } from './persistence/indexed_db';
 import { browserPopupRedirectResolver } from './popup_redirect';
-import { Auth, Dependencies, RegionData, User } from '../model/public_types';
-import { deepEqual, getDefaultEmulatorHost, getExperimentalSetting } from '@firebase/util';
+import { Auth, User } from '../model/public_types';
+import { getDefaultEmulatorHost, getExperimentalSetting } from '@firebase/util';
 import { _setExternalJSProvider } from './load_js';
-import { _createError, _fail } from '../core/util/assert';
+import { _createError } from '../core/util/assert';
 import { AuthErrorCode } from '../core/errors';
-import { AuthImpl } from '../core/auth/auth_impl';
 
 const DEFAULT_ID_TOKEN_MAX_AGE = 5 * 60;
 const authIdTokenMaxAge =
@@ -74,22 +73,10 @@ const mintCookieFactory = (url: string) => async (user: User | null) => {
  *
  * @public
  */
-export function getAuth(app: FirebaseApp = getApp(), regionData?: RegionData): Auth {
+export function getAuth(app: FirebaseApp = getApp()): Auth {
   const provider = _getProvider(app, 'auth');
 
   if (provider.isInitialized()) {
-    const auth = provider.getImmediate() as AuthImpl;
-    // Extract previously used regionData from initialization
-    const initialOptions = provider.getOptions() as Dependencies;
-
-    const previousRegionData = initialOptions?.regionData ?? {};
-    const currentRegionData = regionData ?? {};
-    if (deepEqual(previousRegionData, currentRegionData)) {
-      return auth;
-    } else {
-      _fail(auth, AuthErrorCode.ALREADY_INITIALIZED);
-    }
-
     return provider.getImmediate();
   }
 
@@ -100,7 +87,6 @@ export function getAuth(app: FirebaseApp = getApp(), regionData?: RegionData): A
       browserLocalPersistence,
       browserSessionPersistence
     ],
-    regionData
   });
 
   const authTokenSyncPath = getExperimentalSetting('authTokenSyncURL');