Do _fail without an if statement and relocate test case

Author: NhienLam

packages/auth/src/api/index.test.ts

@@ -60,10 +60,10 @@ describe('api/_performApiRequest', () => {
   });
 
   context('with regular requests', () => {
-    beforeEach(mockFetch.setUp);
     afterEach(mockFetch.tearDown);
 
     it('should set the correct request, method and HTTP Headers', async () => {
+      mockFetch.setUp();
       const mock = mockEndpoint(Endpoint.SIGN_UP, serverResponse);
       const response = await _performApiRequest<
         typeof request,
@@ -82,6 +82,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should set the device language if available', async () => {
+      mockFetch.setUp();
       auth.languageCode = 'jp';
       const mock = mockEndpoint(Endpoint.SIGN_UP, serverResponse);
       const response = await _performApiRequest<
@@ -95,6 +96,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should include whatever headers the auth impl attaches', async () => {
+      mockFetch.setUp();
       sinon.stub(auth, '_getAdditionalHeaders').returns(
         Promise.resolve({
           'look-at-me-im-a-header': 'header-value',
@@ -118,6 +120,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should set the framework in clientVersion if logged', async () => {
+      mockFetch.setUp();
       auth._logFramework('Mythical');
       const mock = mockEndpoint(Endpoint.SIGN_UP, serverResponse);
       const response = await _performApiRequest<
@@ -143,6 +146,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should translate server errors to auth errors', async () => {
+      mockFetch.setUp();
       const mock = mockEndpoint(
         Endpoint.SIGN_UP,
         {
@@ -172,6 +176,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should translate server success with errorMessage into auth error', async () => {
+      mockFetch.setUp();
       const response = {
         errorMessage: ServerError.FEDERATED_USER_ID_ALREADY_LINKED,
         idToken: 'foo-bar'
@@ -193,6 +198,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should translate complex server errors to auth errors', async () => {
+      mockFetch.setUp();
       const mock = mockEndpoint(
         Endpoint.SIGN_UP,
         {
@@ -222,6 +228,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should pass through server messages if applicable', async () => {
+      mockFetch.setUp();
       mockEndpoint(
         Endpoint.SIGN_UP,
         {
@@ -247,6 +254,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should handle unknown server errors', async () => {
+      mockFetch.setUp();
       const mock = mockEndpoint(
         Endpoint.SIGN_UP,
         {
@@ -276,6 +284,7 @@ describe('api/_performApiRequest', () => {
     });
 
     it('should support custom error handling per endpoint', async () => {
+      mockFetch.setUp();
       const mock = mockEndpoint(
         Endpoint.SIGN_UP,
         {
@@ -306,6 +315,22 @@ describe('api/_performApiRequest', () => {
       );
       expect(mock.calls[0].request).to.eql(request);
     });
+
+    it('should handle non-FirebaseErrors', async () => {
+      mockFetch.setUpWithOverride(() => {
+        return new Promise<never>((_, reject) => reject(new Error('error')));
+      });
+      const promise = _performApiRequest<typeof request, never>(
+        auth,
+        HttpMethod.POST,
+        Endpoint.SIGN_UP,
+        request
+      );
+      await expect(promise).to.be.rejectedWith(
+        FirebaseError,
+        'auth/internal-error'
+      );
+    });
   });
 
   context('with network issues', () => {
@@ -345,22 +370,6 @@ describe('api/_performApiRequest', () => {
       expect(clock.clearTimeout).to.have.been.called;
       clock.restore();
     });
-
-    it('should handle failures', async () => {
-      mockFetch.setUpWithOverride(() => {
-        return new Promise<never>((_, reject) => reject(new Error('error')));
-      });
-      const promise = _performApiRequest<typeof request, never>(
-        auth,
-        HttpMethod.POST,
-        Endpoint.SIGN_UP,
-        request
-      );
-      await expect(promise).to.be.rejectedWith(
-        FirebaseError,
-        'auth/internal-error'
-      );
-    });
   });
 
   context('edgcase error mapping', () => {

packages/auth/src/api/index.ts

@@ -181,11 +181,7 @@ export async function _performFetchWithErrorHandling<V>(
     if (e instanceof FirebaseError) {
       throw e;
     }
-    if (e instanceof Error) {
-      _fail(auth, AuthErrorCode.INTERNAL_ERROR, e);
-    } else {
-      _fail(auth, AuthErrorCode.INTERNAL_ERROR, String(e));
-    }
+    _fail(auth, AuthErrorCode.INTERNAL_ERROR, { 'message': String(e) });
   }
 }
 

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

@@ -58,12 +58,6 @@ export function _fail<K extends AuthErrorCode>(
   code: K,
   ...data: {} extends LessAppName<K> ? [LessAppName<K>?] : [LessAppName<K>]
 ): never;
-export function _fail<K extends AuthErrorCode>(
-  auth: Auth,
-  code: K,
-  errorMessage: string,
-  ...data: {} extends LessAppName<K> ? [LessAppName<K>?] : [LessAppName<K>]
-): never;
 export function _fail<K extends AuthErrorCode>(
   authOrCode: Auth | K,
   ...rest: unknown[]