Skip to content

Commit 65399ac

Browse files
committed
fix auth-exp again
1 parent 0c11355 commit 65399ac

File tree

11 files changed

+20
-14
lines changed

11 files changed

+20
-14
lines changed

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ describe('api/_performApiRequest', () => {
284284
assert.fail('Call should have failed');
285285
} catch (e) {
286286
expect(e.code).to.eq(`auth/${AuthErrorCode.NEED_CONFIRMATION}`);
287-
expect(e._tokenResponse).to.eql({
287+
expect((e as FirebaseError).customData!._tokenResponse).to.eql({
288288
needConfirmation: true,
289289
idToken: 'id-token'
290290
});
@@ -314,7 +314,9 @@ describe('api/_performApiRequest', () => {
314314
assert.fail('Call should have failed');
315315
} catch (e) {
316316
expect(e.code).to.eq(`auth/${AuthErrorCode.CREDENTIAL_ALREADY_IN_USE}`);
317-
expect(e._tokenResponse).to.eql(response);
317+
expect((e as FirebaseError).customData!._tokenResponse).to.eql(
318+
response
319+
);
318320
}
319321
});
320322

@@ -343,8 +345,10 @@ describe('api/_performApiRequest', () => {
343345
assert.fail('Call should have failed');
344346
} catch (e) {
345347
expect(e.code).to.eq(`auth/${AuthErrorCode.EMAIL_EXISTS}`);
346-
expect(e.email).to.eq('[email protected]');
347-
expect(e.phoneNumber).to.eq('+1555-this-is-a-number');
348+
expect((e as FirebaseError).customData!.email).to.eq('[email protected]');
349+
expect((e as FirebaseError).customData!.phoneNumber).to.eq(
350+
'+1555-this-is-a-number'
351+
);
348352
}
349353
});
350354
});

packages-exp/auth-exp/src/api/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ function makeTaggedError(
251251
}
252252

253253
const error = AUTH_ERROR_FACTORY.create(code, errorParams);
254-
(error as TaggedWithTokenResponse)._tokenResponse = response;
254+
255+
// We know customData is defined on error because errorParams is defined
256+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = response;
255257
return error;
256258
}

packages-exp/auth-exp/src/core/providers/facebook.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('src/core/providers/facebook', () => {
5959
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
6060
appName: 'foo'
6161
});
62-
(error as TaggedWithTokenResponse)._tokenResponse = {
62+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
6363
...TEST_ID_TOKEN_RESPONSE,
6464
oauthAccessToken: 'access-token'
6565
};

packages-exp/auth-exp/src/core/providers/facebook.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class FacebookAuthProvider extends OAuthProvider {
4848
error: FirebaseError
4949
): externs.OAuthCredential | null {
5050
return FacebookAuthProvider.credentialFromTaggedObject(
51-
error as TaggedWithTokenResponse
51+
(error.customData || {}) as TaggedWithTokenResponse
5252
);
5353
}
5454

packages-exp/auth-exp/src/core/providers/github.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('src/core/providers/github', () => {
5959
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
6060
appName: 'foo'
6161
});
62-
(error as TaggedWithTokenResponse)._tokenResponse = {
62+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
6363
...TEST_ID_TOKEN_RESPONSE,
6464
oauthAccessToken: 'access-token'
6565
};

packages-exp/auth-exp/src/core/providers/github.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class GithubAuthProvider extends OAuthProvider {
4848
error: FirebaseError
4949
): externs.OAuthCredential | null {
5050
return GithubAuthProvider.credentialFromTaggedObject(
51-
error as TaggedWithTokenResponse
51+
(error.customData || {}) as TaggedWithTokenResponse
5252
);
5353
}
5454

packages-exp/auth-exp/src/core/providers/google.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('src/core/providers/google', () => {
6262
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
6363
appName: 'foo'
6464
});
65-
(error as TaggedWithTokenResponse)._tokenResponse = {
65+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
6666
...TEST_ID_TOKEN_RESPONSE,
6767
oauthAccessToken: 'access-token',
6868
oauthIdToken: 'id-token'

packages-exp/auth-exp/src/core/providers/google.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class GoogleAuthProvider extends OAuthProvider {
5353
error: FirebaseError
5454
): externs.OAuthCredential | null {
5555
return GoogleAuthProvider.credentialFromTaggedObject(
56-
error as TaggedWithTokenResponse
56+
(error.customData || {}) as TaggedWithTokenResponse
5757
);
5858
}
5959

packages-exp/auth-exp/src/core/providers/twitter.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('src/core/providers/twitter', () => {
7979
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
8080
appName: 'foo'
8181
});
82-
(error as TaggedWithTokenResponse)._tokenResponse = {
82+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
8383
...TEST_ID_TOKEN_RESPONSE,
8484
oauthAccessToken: 'access-token',
8585
oauthTokenSecret: 'token-secret'

packages-exp/auth-exp/src/core/providers/twitter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class TwitterAuthProvider extends OAuthProvider {
6767
error: FirebaseError
6868
): externs.OAuthCredential | null {
6969
return TwitterAuthProvider.credentialFromTaggedObject(
70-
error as TaggedWithTokenResponse
70+
(error.customData || {}) as TaggedWithTokenResponse
7171
);
7272
}
7373

packages/util/src/errors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export class FirebaseError extends Error {
7777
constructor(
7878
readonly code: string,
7979
message: string,
80-
readonly customData?: Record<string, unknown>
80+
public customData?: Record<string, unknown>
8181
) {
8282
super(message);
8383

0 commit comments

Comments
 (0)