Add methods for validating if TenantConfig is initialized

Author: mansisampat

packages/auth/demo/src/index.js

@@ -2046,7 +2046,13 @@ function onApplyAuthSettingsChange() {
 function initApp() {
   log('Initializing app...');
   app = initializeApp(config);
-  auth = getAuth(app);
+  const tenantConfig: {'location': "us", 'tenantId': 'tenant-1'};
+  // auth = getAuth(app);
+  auth = initializeAuth(app, {
+    tenantConfig: tenantConfig
+  });
+  console.log('demo app');
+  console.log(auth);
   if (USE_AUTH_EMULATOR) {
     connectAuthEmulator(auth, AUTH_EMULATOR_URL);
   }

packages/auth/demo/src/worker/service-worker.ts

@@ -74,19 +74,19 @@ function getOriginFromUrl(url: string): string {
   return protocol + '//' + host;
 }
 
-self.addEventListener('install', (event: ExtendableEvent) => {
-  // Perform install steps.
-  event.waitUntil(async (): Promise<void> => {
-    const cache = await caches.open(CACHE_NAME);
-    // Add all URLs of resources we want to cache.
-    try {
-      await cache.addAll(urlsToCache);
-    } catch {
-      // Suppress error as some of the files may not be available for the
-      // current page.
-    }
-  });
-});
+// self.addEventListener('install', (event: ExtendableEvent) => {
+//   // Perform install steps.
+//   event.waitUntil(async (): Promise<void> => {
+//     const cache = await caches.open(CACHE_NAME);
+//     // Add all URLs of resources we want to cache.
+//     try {
+//       await cache.addAll(urlsToCache);
+//     } catch {
+//       // Suppress error as some of the files may not be available for the
+//       // current page.
+//     }
+//   });
+// });
 
 // As this is a test app, let's only return cached data when offline.
 self.addEventListener('fetch', (event: FetchEvent) => {
@@ -155,19 +155,19 @@ self.addEventListener('fetch', (event: FetchEvent) => {
   );
 });
 
-self.addEventListener('activate', (event: ExtendableEvent) => {
-  // Update this list with all caches that need to remain cached.
-  const cacheWhitelist = ['cache-v1'];
-  event.waitUntil(async (): Promise<void> => {
-    const cacheNames = await caches.keys();
-    await Promise.all(
-      cacheNames.map(cacheName => {
-        // Check if cache is not whitelisted above.
-        if (cacheWhitelist.indexOf(cacheName) === -1) {
-          // If not whitelisted, delete it.
-          return caches.delete(cacheName);
-        }
-      })
-    );
-  });
-});
+// self.addEventListener('activate', (event: ExtendableEvent) => {
+//   // Update this list with all caches that need to remain cached.
+//   const cacheWhitelist = ['cache-v1'];
+//   event.waitUntil(async (): Promise<void> => {
+//     const cacheNames = await caches.keys();
+//     await Promise.all(
+//       cacheNames.map(cacheName => {
+//         // Check if cache is not whitelisted above.
+//         if (cacheWhitelist.indexOf(cacheName) === -1) {
+//           // If not whitelisted, delete it.
+//           return caches.delete(cacheName);
+//         }
+//       })
+//     );
+//   });
+// });

packages/auth/internal/index.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { _castAuth } from '../src/core/auth/auth_impl';
+import { _castAuth, AuthImpl } from '../src/core/auth/auth_impl';
 import { Auth } from '../src/model/public_types';
 
 /**
@@ -56,3 +56,15 @@ export { SAMLAuthCredential } from '../src/core/credentials/saml';
 export function addFrameworkForLogging(auth: Auth, framework: string): void {
   _castAuth(auth)._logFramework(framework);
 }
+
+/**
+ *
+ * @param auth - an object of type AuthImpl.
+ *
+ * @returns true if the provided AuthImpl object contains location in tenantConfig.
+ *
+ * @internal
+ */
+export function _isFirebaseRegionalAuthInitialized(auth: AuthImpl): boolean {
+  return !!(auth.tenantConfig.location && auth.tenantConfig.tenantId);
+}

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

@@ -36,7 +36,8 @@ import {
   ErrorFn,
   NextFn,
   Unsubscribe,
-  PasswordValidationStatus
+  PasswordValidationStatus,
+  TenantConfig
 } from '../../model/public_types';
 import {
   createSubscribe,
@@ -126,6 +127,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     | undefined = undefined;
   _persistenceManagerAvailable: Promise<void>;
   readonly name: string;
+  readonly tenantConfig: TenantConfig;
 
   // Tracks the last notified UID for state change listeners to prevent
   // repeated calls to the callbacks. Undefined means it's never been
@@ -140,7 +142,8 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     public readonly app: FirebaseApp,
     private readonly heartbeatServiceProvider: Provider<'heartbeat'>,
     private readonly appCheckServiceProvider: Provider<AppCheckInternalComponentName>,
-    public readonly config: ConfigInternal
+    public readonly config: ConfigInternal,
+    tenantConfig?: TenantConfig
   ) {
     this.name = app.name;
     this.clientVersion = config.sdkClientVersion;
@@ -149,6 +152,7 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     this._persistenceManagerAvailable = new Promise<void>(
       resolve => (this._resolvePersistenceManagerAvailable = resolve)
     );
+    this.tenantConfig = tenantConfig ?? {};
   }
 
   _initializeWithPersistence(

packages/auth/src/core/strategies/email_and_password.ts

@@ -31,7 +31,8 @@ import { EmailAuthProvider } from '../providers/email';
 import { UserCredentialImpl } from '../user/user_credential_impl';
 import {
   _assert,
-  _serverAppCurrentUserOperationNotSupportedError
+  _serverAppCurrentUserOperationNotSupportedError,
+  _operationNotSupportedForInitializedAuthInstance
 } from '../util/assert';
 import { _setActionCodeSettingsOnRequest } from './action_code_settings';
 import { signInWithCredential } from './credential';
@@ -47,6 +48,7 @@ import {
   RecaptchaAuthProvider
 } from '../../api';
 import { _isFirebaseServerApp } from '@firebase/app';
+import { _isFirebaseRegionalAuthInitialized } from '../../../internal';
 
 /**
  * Updates the password policy cached in the {@link Auth} instance if a policy is already
@@ -352,6 +354,9 @@ export function signInWithEmailAndPassword(
       _serverAppCurrentUserOperationNotSupportedError(auth)
     );
   }
+  if (_isFirebaseRegionalAuthInitialized(auth)) {
+    return Promise.reject(_operationNotSupportedForInitializedAuthInstance(auth));
+  }
   return signInWithCredential(
     getModularInstance(auth),
     EmailAuthProvider.credential(email, password)

packages/auth/src/core/util/assert.ts

@@ -112,6 +112,14 @@ export function _serverAppCurrentUserOperationNotSupportedError(
   );
 }
 
+export function _operationNotSupportedForInitializedAuthInstance(auth: Auth) : FirebaseError {
+  return _errorWithCustomMessage(
+    auth,
+    AuthErrorCode.OPERATION_NOT_ALLOWED,
+    'Operations not allowed for the auth object initialized.'
+  );
+}
+
 export function _assertInstanceOf(
   auth: Auth,
   object: object,