Fix compat

Author: sam-gc

packages-exp/auth-compat-exp/src/auth.ts

@@ -37,6 +37,7 @@ import {
 import { unwrap, Wrapper } from './wrap';
 
 const PERSISTENCE_KEY = 'persistence';
+const _assert: typeof impl._assert = impl._assert;
 
 export class Auth
   implements compat.FirebaseAuth, Wrapper<externs.Auth>, _FirebaseService {
@@ -59,10 +60,12 @@ export class Auth
     const hierarchy = persistences.map<impl.Persistence>(impl._getInstance);
 
     // TODO: platform needs to be determined using heuristics
-    impl.assertFn(apiKey, impl.AuthErrorCode.INVALID_API_KEY, {
+    _assert(apiKey, impl.AuthErrorCode.INVALID_API_KEY, {
       appName: app.name
     });
 
+    this.auth._updateErrorMap(impl.verboseErrorMap);
+
     // This promise is intended to float; auth initialization happens in the
     // background, meanwhile the auth object may be used by the app.
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -128,10 +131,10 @@ export class Auth
     return impl.isSignInWithEmailLink(this.auth, emailLink);
   }
   async getRedirectResult(): Promise<compat.UserCredential> {
-    impl.assertFn(
+    _assert(
       _isPopupRedirectSupported(),
+      this.auth,
       impl.AuthErrorCode.OPERATION_NOT_SUPPORTED,
-      { appName: this.app.name }
     );
     const credential = await impl.getRedirectResult(
       this.auth,
@@ -201,7 +204,7 @@ export class Auth
         case Persistence.NONE:
           return impl.inMemoryPersistence;
         default:
-          return impl.fail(impl.AuthErrorCode.ARGUMENT_ERROR, {
+          return impl._fail(impl.AuthErrorCode.ARGUMENT_ERROR, {
             appName: auth.name
           });
       }
@@ -266,10 +269,10 @@ export class Auth
   async signInWithPopup(
     provider: compat.AuthProvider
   ): Promise<compat.UserCredential> {
-    impl.assertFn(
+    _assert(
       _isPopupRedirectSupported(),
+      this.auth,
       impl.AuthErrorCode.OPERATION_NOT_SUPPORTED,
-      { appName: this.app.name }
     );
     return convertCredential(
       this.auth,
@@ -281,11 +284,10 @@ export class Auth
     );
   }
   async signInWithRedirect(provider: compat.AuthProvider): Promise<void> {
-    impl.assertFn(
+    _assert(
       _isPopupRedirectSupported(),
-      impl.AuthErrorCode.OPERATION_NOT_SUPPORTED,
-      { appName: this.app.name }
-    );
+      this.auth,
+      impl.AuthErrorCode.OPERATION_NOT_SUPPORTED);
     this.savePersistenceForRedirect();
     return impl.signInWithRedirect(
       this.auth,

packages-exp/auth-compat-exp/src/persistence.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { assertFn, AuthErrorCode } from '@firebase/auth-exp/internal';
+import { _assert, AuthErrorCode } from '@firebase/auth-exp/internal';
 import * as externs from '@firebase/auth-types-exp';
 import { isIndexedDBAvailable, isNode, isReactNative } from '@firebase/util';
 import { _isWebStorageSupported, _isWorker } from './platform';
@@ -34,45 +34,45 @@ export function _validatePersistenceArgument(
   auth: externs.Auth,
   persistence: string
 ): void {
-  assertFn(
+  _assert(
     Object.values(Persistence).includes(persistence),
+    auth,
     AuthErrorCode.INVALID_PERSISTENCE,
-    { appName: auth.name }
   );
   // Validate if the specified type is supported in the current environment.
   if (isReactNative()) {
     // This is only supported in a browser.
-    assertFn(
+    _assert(
       persistence !== Persistence.SESSION,
+      auth,
       AuthErrorCode.UNSUPPORTED_PERSISTENCE,
-      { appName: auth.name }
     );
     return;
   }
   if (isNode()) {
     // Only none is supported in Node.js.
-    assertFn(
+    _assert(
       persistence === Persistence.NONE,
+      auth,
       AuthErrorCode.UNSUPPORTED_PERSISTENCE,
-      { appName: auth.name }
     );
     return;
   }
   if (_isWorker()) {
     // In a worker environment, either LOCAL or NONE are supported.
     // If indexedDB not supported and LOCAL provided, throw an error
-    assertFn(
+    _assert(
       persistence === Persistence.NONE ||
         (persistence === Persistence.LOCAL && isIndexedDBAvailable()),
+      auth,
       AuthErrorCode.UNSUPPORTED_PERSISTENCE,
-      { appName: auth.name }
     );
     return;
   }
   // This is restricted by what the browser supports.
-  assertFn(
+  _assert(
     persistence === Persistence.NONE || _isWebStorageSupported(),
+    auth,
     AuthErrorCode.UNSUPPORTED_PERSISTENCE,
-    { appName: auth.name }
   );
 }

packages-exp/auth-compat-exp/src/recaptcha_verifier.ts

@@ -22,6 +22,8 @@ import * as compat from '@firebase/auth-types';
 import * as externs from '@firebase/auth-types-exp';
 import { unwrap, Wrapper } from './wrap';
 
+const _assert: typeof impl._assert = impl._assert;
+
 export class RecaptchaVerifier
   implements compat.RecaptchaVerifier, Wrapper<externs.ApplicationVerifier> {
   readonly verifier: externs.RecaptchaVerifier;
@@ -32,7 +34,7 @@ export class RecaptchaVerifier
     app: FirebaseApp = firebase.app()
   ) {
     // API key is required for web client RPC calls.
-    impl.assertFn(app.options?.apiKey, impl.AuthErrorCode.INVALID_API_KEY, {
+    _assert(app.options?.apiKey, impl.AuthErrorCode.INVALID_API_KEY, {
       appName: app.name
     });
     this.verifier = new impl.RecaptchaVerifier(