Make initializeAuth() idempotent

Author: hsubox76

packages-exp/auth-exp/src/core/auth/initialize.test.ts

@@ -31,7 +31,7 @@ import {
 import { isNode } from '@firebase/util';
 
 import { expect } from 'chai';
-import { inMemoryPersistence } from '../../../internal';
+import { browserLocalPersistence, browserSessionPersistence, inMemoryPersistence } from '../../../internal';
 
 import { AuthInternal } from '../../model/auth';
 import {
@@ -50,6 +50,7 @@ import {
 import { ClientPlatform, _getClientVersion } from '../util/version';
 import { initializeAuth } from './initialize';
 import { registerAuth } from './register';
+import { debugErrorMap, prodErrorMap } from '../errors';
 
 describe('core/auth/initialize', () => {
   let fakeApp: FirebaseApp;
@@ -209,9 +210,49 @@ describe('core/auth/initialize', () => {
       expect(auth._isInitialized).to.be.false;
     });
 
-    it('should throw if called more than once', () => {
-      initializeAuth(fakeApp);
-      expect(() => initializeAuth(fakeApp)).to.throw();
+    it('should not throw if called again with same (no) params', () => {
+      const auth = initializeAuth(fakeApp);
+      expect(initializeAuth(fakeApp)).to.equal(auth);
+    });
+
+    it('should not throw if called again with same params', () => {
+      const auth = initializeAuth(fakeApp, {
+        errorMap: prodErrorMap,
+        persistence: browserSessionPersistence,
+        popupRedirectResolver: fakePopupRedirectResolver
+      });
+      expect(initializeAuth(fakeApp, {
+        errorMap: prodErrorMap,
+        persistence: browserSessionPersistence,
+        popupRedirectResolver: fakePopupRedirectResolver
+      })).to.equal(auth);
+    });
+
+    it('should throw if called again with different params (popupRedirectResolver)', () => {
+      initializeAuth(fakeApp, {
+        popupRedirectResolver: fakePopupRedirectResolver
+      });
+      expect(() => initializeAuth(fakeApp, {
+        popupRedirectResolver: undefined
+      })).to.throw();
+    });
+
+    it('should throw if called again with different params (errorMap)', () => {
+      initializeAuth(fakeApp, {
+        errorMap: prodErrorMap
+      });
+      expect(() => initializeAuth(fakeApp, {
+        errorMap: debugErrorMap
+      })).to.throw();
+    });
+
+    it('should throw if called again with different params (persistence)', () => {
+      initializeAuth(fakeApp, {
+        persistence: [browserLocalPersistence, browserSessionPersistence]
+      });
+      expect(() => initializeAuth(fakeApp, {
+        persistence: [browserSessionPersistence, browserLocalPersistence]
+      })).to.throw();
     });
   });
 });

packages-exp/auth-exp/src/core/auth/initialize.ts

@@ -16,6 +16,7 @@
  */
 
 import { _getProvider, FirebaseApp } from '@firebase/app-exp';
+import { deepEqual } from '@firebase/util';
 import { Auth, Dependencies } from '../../model/public_types';
 
 import { AuthErrorCode } from '../errors';
@@ -54,7 +55,16 @@ export function initializeAuth(app: FirebaseApp, deps?: Dependencies): Auth {
 
   if (provider.isInitialized()) {
     const auth = provider.getImmediate() as AuthImpl;
-    _fail(auth, AuthErrorCode.ALREADY_INITIALIZED);
+    const initialOptions = provider.getOptions() as Dependencies;
+    if (
+      initialOptions.errorMap === deps?.errorMap &&
+      initialOptions.popupRedirectResolver === deps?.popupRedirectResolver &&
+      deepEqual(initialOptions.persistence as object, deps?.persistence as object)
+    ) {
+      return auth;
+    } else {
+      _fail(auth, AuthErrorCode.ALREADY_INITIALIZED);
+    }
   }
 
   const auth = provider.initialize({ options: deps }) as AuthImpl;
@@ -67,9 +77,8 @@ export function _initializeAuthInstance(
   deps?: Dependencies
 ): void {
   const persistence = deps?.persistence || [];
-  const hierarchy = (Array.isArray(persistence)
-    ? persistence
-    : [persistence]
+  const hierarchy = (
+    Array.isArray(persistence) ? persistence : [persistence]
   ).map<PersistenceInternal>(_getInstance);
   if (deps?.errorMap) {
     auth._updateErrorMap(deps.errorMap);