Rebase conflicts & PR feedback

Author: avolkovi

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

@@ -97,7 +97,8 @@ class AuthImpl implements Auth {
   }
 
   private get assertedPersistence(): PersistenceUserManager {
-    return assert(this.persistenceManager, this.name);
+    assert(this.persistenceManager, this.name);
+    return this.persistenceManager;
   }
 }
 
@@ -110,8 +111,9 @@ export function initializeAuth(
   const { apiKey, authDomain } = app.options;
 
   // TODO: platform needs to be determined using heuristics
+  assert(apiKey, app.name, AuthErrorCode.INVALID_API_KEY);
   const config: Config = {
-    apiKey: assert(apiKey, app.name, AuthErrorCode.INVALID_API_KEY),
+    apiKey,
     authDomain,
     apiHost: DEFAULT_API_HOST,
     apiScheme: DEFAULT_API_SCHEME,

packages-exp/auth-exp/src/core/user/user_impl.ts

@@ -20,7 +20,7 @@ import { IdTokenResult } from '../../model/id_token';
 import { User } from '../../model/user';
 import { PersistedBlob } from '../persistence';
 import { ProviderId } from '../providers';
-import { assert, assertStringOrUndefined } from '../util/assert';
+import { assert } from '../util/assert';
 import { StsTokenManager } from './token_manager';
 
 export interface UserParameters {
@@ -34,6 +34,17 @@ export interface UserParameters {
   photoURL?: string;
 }
 
+
+function assertStringOrUndefined(
+  assertion: unknown,
+  appName: string
+): asserts assertion is string | undefined {
+  assert(
+    typeof assertion === 'string' || typeof assertion === 'undefined',
+    appName
+  );
+}
+
 export class UserImpl implements User {
   // For the user object, provider is always Firebase.
   readonly providerId = ProviderId.FIREBASE;

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

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { SDK_VERSION } from '@firebase/app-exp';
-import { AUTH_ERROR_FACTORY, AuthErrorCode } from '../errors';
+import { AuthErrorCode, AUTH_ERROR_FACTORY } from '../errors';
 import { logError } from './log';
 
 /**
@@ -25,8 +24,8 @@ import { logError } from './log';
  * @param appName App name for tagging the error
  * @throws FirebaseError
  */
-export function fail(appName: string): never {
-  throw AUTH_ERROR_FACTORY.create(AuthErrorCode.INTERNAL_ERROR, { appName });
+export function fail(appName: string, errorCode: AuthErrorCode): never {
+  throw AUTH_ERROR_FACTORY.create(errorCode, { appName });
 }
 
 /**
@@ -35,22 +34,12 @@ export function fail(appName: string): never {
  * @param assertion
  * @param appName
  */
-export function assert(assertion: boolean, appName: string): asserts assertion {
+export function assert(assertion: unknown, appName: string, errorCode: AuthErrorCode = AuthErrorCode.INTERNAL_ERROR): asserts assertion {
   if (!assertion) {
-    fail(appName);
+    fail(appName, errorCode);
   }
 }
 
-export function assertStringOrUndefined(
-  assertion: unknown,
-  appName: string
-): asserts assertion is string | undefined {
-  assert(
-    typeof assertion === 'string' || typeof assertion === 'undefined',
-    appName
-  );
-}
-
 /**
  * Unconditionally fails, throwing an internal error with the given message.
  *
@@ -60,10 +49,10 @@ export function assertStringOrUndefined(
 export function debugFail(failure: string): never {
   // Log the failure in addition to throw an exception, just in case the
   // exception is swallowed.
-  const message = `AUTH (${SDK_VERSION}) INTERNAL ASSERTION FAILED: ` + failure;
+  const message = `INTERNAL ASSERTION FAILED: ` + failure;
   logError(message);
 
-  // NOTE: We don't use FirestoreError here because these are internal failures
+  // NOTE: We don't use FirebaseError here because these are internal failures
   // that cannot be handled by the user. (Also it would create a circular
   // dependency between the error and assert modules which doesn't work.)
   throw new Error(message);