fix auth-exp again

firebase · Oct 15, 2020 · 65399ac · 65399ac
1 parent 0c11355
commit 65399ac
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 14 deletions.
diff --git a/packages-exp/auth-exp/src/api/index.test.ts b/packages-exp/auth-exp/src/api/index.test.ts
@@ -284,7 +284,7 @@ describe('api/_performApiRequest', () => {
         assert.fail('Call should have failed');
       } catch (e) {
         expect(e.code).to.eq(`auth/${AuthErrorCode.NEED_CONFIRMATION}`);
-        expect(e._tokenResponse).to.eql({
+        expect((e as FirebaseError).customData!._tokenResponse).to.eql({
           needConfirmation: true,
           idToken: 'id-token'
         });
@@ -314,7 +314,9 @@ describe('api/_performApiRequest', () => {
         assert.fail('Call should have failed');
       } catch (e) {
         expect(e.code).to.eq(`auth/${AuthErrorCode.CREDENTIAL_ALREADY_IN_USE}`);
-        expect(e._tokenResponse).to.eql(response);
+        expect((e as FirebaseError).customData!._tokenResponse).to.eql(
+          response
+        );
       }
     });
 
@@ -343,8 +345,10 @@ describe('api/_performApiRequest', () => {
         assert.fail('Call should have failed');
       } catch (e) {
         expect(e.code).to.eq(`auth/${AuthErrorCode.EMAIL_EXISTS}`);
-        expect(e.email).to.eq('email@test.com');
-        expect(e.phoneNumber).to.eq('+1555-this-is-a-number');
+        expect((e as FirebaseError).customData!.email).to.eq('email@test.com');
+        expect((e as FirebaseError).customData!.phoneNumber).to.eq(
+          '+1555-this-is-a-number'
+        );
       }
     });
   });

diff --git a/packages-exp/auth-exp/src/api/index.ts b/packages-exp/auth-exp/src/api/index.ts
@@ -251,6 +251,8 @@ function makeTaggedError(
   }
 
   const error = AUTH_ERROR_FACTORY.create(code, errorParams);
-  (error as TaggedWithTokenResponse)._tokenResponse = response;
+
+  // We know customData is defined on error because errorParams is defined
+  (error.customData! as TaggedWithTokenResponse)._tokenResponse = response;
   return error;
 }
diff --git a/packages-exp/auth-exp/src/core/providers/facebook.test.ts b/packages-exp/auth-exp/src/core/providers/facebook.test.ts
@@ -59,7 +59,7 @@ describe('src/core/providers/facebook', () => {
     const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
       appName: 'foo'
     });
-    (error as TaggedWithTokenResponse)._tokenResponse = {
+    (error.customData! as TaggedWithTokenResponse)._tokenResponse = {
       ...TEST_ID_TOKEN_RESPONSE,
       oauthAccessToken: 'access-token'
     };

diff --git a/packages-exp/auth-exp/src/core/providers/facebook.ts b/packages-exp/auth-exp/src/core/providers/facebook.ts
@@ -48,7 +48,7 @@ export class FacebookAuthProvider extends OAuthProvider {
     error: FirebaseError
   ): externs.OAuthCredential | null {
     return FacebookAuthProvider.credentialFromTaggedObject(
-      error as TaggedWithTokenResponse
+      (error.customData || {}) as TaggedWithTokenResponse
     );
   }
 

diff --git a/packages-exp/auth-exp/src/core/providers/github.test.ts b/packages-exp/auth-exp/src/core/providers/github.test.ts
@@ -59,7 +59,7 @@ describe('src/core/providers/github', () => {
     const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
       appName: 'foo'
     });
-    (error as TaggedWithTokenResponse)._tokenResponse = {
+    (error.customData! as TaggedWithTokenResponse)._tokenResponse = {
       ...TEST_ID_TOKEN_RESPONSE,
       oauthAccessToken: 'access-token'
     };

diff --git a/packages-exp/auth-exp/src/core/providers/github.ts b/packages-exp/auth-exp/src/core/providers/github.ts
@@ -48,7 +48,7 @@ export class GithubAuthProvider extends OAuthProvider {
     error: FirebaseError
   ): externs.OAuthCredential | null {
     return GithubAuthProvider.credentialFromTaggedObject(
-      error as TaggedWithTokenResponse
+      (error.customData || {}) as TaggedWithTokenResponse
     );
   }
 

diff --git a/packages-exp/auth-exp/src/core/providers/google.test.ts b/packages-exp/auth-exp/src/core/providers/google.test.ts
@@ -62,7 +62,7 @@ describe('src/core/providers/google', () => {
     const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
       appName: 'foo'
     });
-    (error as TaggedWithTokenResponse)._tokenResponse = {
+    (error.customData! as TaggedWithTokenResponse)._tokenResponse = {
       ...TEST_ID_TOKEN_RESPONSE,
       oauthAccessToken: 'access-token',
       oauthIdToken: 'id-token'

diff --git a/packages-exp/auth-exp/src/core/providers/google.ts b/packages-exp/auth-exp/src/core/providers/google.ts
@@ -53,7 +53,7 @@ export class GoogleAuthProvider extends OAuthProvider {
     error: FirebaseError
   ): externs.OAuthCredential | null {
     return GoogleAuthProvider.credentialFromTaggedObject(
-      error as TaggedWithTokenResponse
+      (error.customData || {}) as TaggedWithTokenResponse
     );
   }
 

diff --git a/packages-exp/auth-exp/src/core/providers/twitter.test.ts b/packages-exp/auth-exp/src/core/providers/twitter.test.ts
@@ -79,7 +79,7 @@ describe('src/core/providers/twitter', () => {
     const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
       appName: 'foo'
     });
-    (error as TaggedWithTokenResponse)._tokenResponse = {
+    (error.customData! as TaggedWithTokenResponse)._tokenResponse = {
       ...TEST_ID_TOKEN_RESPONSE,
       oauthAccessToken: 'access-token',
       oauthTokenSecret: 'token-secret'

diff --git a/packages-exp/auth-exp/src/core/providers/twitter.ts b/packages-exp/auth-exp/src/core/providers/twitter.ts
@@ -67,7 +67,7 @@ export class TwitterAuthProvider extends OAuthProvider {
     error: FirebaseError
   ): externs.OAuthCredential | null {
     return TwitterAuthProvider.credentialFromTaggedObject(
-      error as TaggedWithTokenResponse
+      (error.customData || {}) as TaggedWithTokenResponse
     );
   }
 

diff --git a/packages/util/src/errors.ts b/packages/util/src/errors.ts
@@ -77,7 +77,7 @@ export class FirebaseError extends Error {
   constructor(
     readonly code: string,
     message: string,
-    readonly customData?: Record<string, unknown>
+    public customData?: Record<string, unknown>
   ) {
     super(message);