Skip to content

Commit dfcbe7d

Browse files
NhienLamNhienLam
committed
Change RecaptchaProvider to RecaptchaAuthProvider
1 parent 124fbb3 commit dfcbe7d

File tree

11 files changed

+62
-63
lines changed

11 files changed

+62
-63
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const enum EnforcementState {
100100
}
101101

102102
// Providers that have reCAPTCHA Enterprise support.
103-
export const enum RecaptchaProvider {
103+
export const enum RecaptchaAuthProvider {
104104
EMAIL_PASSWORD_PROVIDER = 'EMAIL_PASSWORD_PROVIDER',
105105
PHONE_PROVIDER = 'PHONE_PROVIDER'
106106
}

‎packages/auth/src/core/credentials/email.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { handleRecaptchaFlow } from '../../platform_browser/recaptcha/recaptcha_
3535
import {
3636
RecaptchaActionName,
3737
RecaptchaClientType,
38-
RecaptchaProvider
38+
RecaptchaAuthProvider
3939
} from '../../api';
4040
import { SignUpRequest } from '../../api/authentication/sign_up';
4141
/**
@@ -133,7 +133,7 @@ export class EmailAuthCredential extends AuthCredential {
133133
request,
134134
RecaptchaActionName.SIGN_IN_WITH_PASSWORD,
135135
signInWithPassword,
136-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
136+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
137137
);
138138
case SignInMethod.EMAIL_LINK:
139139
return signInWithEmailLink(auth, {
@@ -164,7 +164,7 @@ export class EmailAuthCredential extends AuthCredential {
164164
request,
165165
RecaptchaActionName.SIGN_UP_PASSWORD,
166166
linkEmailPassword,
167-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
167+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
168168
);
169169
case SignInMethod.EMAIL_LINK:
170170
return signInWithEmailLinkForLinking(auth, {

‎packages/auth/src/core/strategies/email_and_password.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import { IdTokenResponse } from '../../model/id_token';
4444
import {
4545
RecaptchaActionName,
4646
RecaptchaClientType,
47-
RecaptchaProvider
47+
RecaptchaAuthProvider
4848
} from '../../api';
4949
import { _isFirebaseServerApp } from '@firebase/app';
5050

@@ -121,7 +121,7 @@ export async function sendPasswordResetEmail(
121121
request,
122122
RecaptchaActionName.GET_OOB_CODE,
123123
authentication.sendPasswordResetEmail,
124-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
124+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
125125
);
126126
}
127127

@@ -296,7 +296,7 @@ export async function createUserWithEmailAndPassword(
296296
request,
297297
RecaptchaActionName.SIGN_UP_PASSWORD,
298298
signUp,
299-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
299+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
300300
);
301301
const response = await signUpResponse.catch(error => {
302302
if (

‎packages/auth/src/core/strategies/email_link.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { handleRecaptchaFlow } from '../../platform_browser/recaptcha/recaptcha_
3636
import {
3737
RecaptchaActionName,
3838
RecaptchaClientType,
39-
RecaptchaProvider
39+
RecaptchaAuthProvider
4040
} from '../../api';
4141
import { _isFirebaseServerApp } from '@firebase/app';
4242
import { _serverAppCurrentUserOperationNotSupportedError } from '../../core/util/assert';
@@ -113,7 +113,7 @@ export async function sendSignInLinkToEmail(
113113
request,
114114
RecaptchaActionName.GET_OOB_CODE,
115115
api.sendSignInLinkToEmail,
116-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
116+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
117117
);
118118
}
119119

‎packages/auth/src/platform_browser/providers/phone.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
Endpoint,
2929
RecaptchaClientType,
3030
RecaptchaVersion,
31-
RecaptchaProvider,
31+
RecaptchaAuthProvider,
3232
EnforcementState
3333
} from '../../api';
3434
import { RecaptchaVerifier } from '../../platform_browser/recaptcha/recaptcha_verifier';
@@ -56,7 +56,7 @@ describe('platform_browser/providers/phone', () => {
5656
recaptchaKey: 'foo/bar/to/site-key',
5757
recaptchaEnforcementState: [
5858
{
59-
provider: RecaptchaProvider.PHONE_PROVIDER,
59+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
6060
enforcementState: EnforcementState.OFF
6161
}
6262
]

‎packages/auth/src/platform_browser/recaptcha/recaptcha.test.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929

3030
import { isV2, isEnterprise, RecaptchaConfig } from './recaptcha';
3131
import { GetRecaptchaConfigResponse } from '../../api/authentication/recaptcha';
32-
import { EnforcementState, RecaptchaProvider } from '../../api/index';
32+
import { EnforcementState, RecaptchaAuthProvider } from '../../api/index';
3333

3434
use(chaiAsPromised);
3535
use(sinonChai);
@@ -46,11 +46,11 @@ describe('platform_browser/recaptcha/recaptcha', () => {
4646
recaptchaKey: 'projects/testproj/keys/' + TEST_SITE_KEY,
4747
recaptchaEnforcementState: [
4848
{
49-
provider: RecaptchaProvider.EMAIL_PASSWORD_PROVIDER,
49+
provider: RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER,
5050
enforcementState: EnforcementState.ENFORCE
5151
},
5252
{
53-
provider: RecaptchaProvider.PHONE_PROVIDER,
53+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
5454
enforcementState: EnforcementState.AUDIT
5555
}
5656
]
@@ -60,11 +60,11 @@ describe('platform_browser/recaptcha/recaptcha', () => {
6060
recaptchaKey: 'projects/testproj/keys/' + TEST_SITE_KEY,
6161
recaptchaEnforcementState: [
6262
{
63-
provider: RecaptchaProvider.EMAIL_PASSWORD_PROVIDER,
63+
provider: RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER,
6464
enforcementState: EnforcementState.OFF
6565
},
6666
{
67-
provider: RecaptchaProvider.PHONE_PROVIDER,
67+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
6868
enforcementState: EnforcementState.OFF
6969
}
7070
]
@@ -75,11 +75,11 @@ describe('platform_browser/recaptcha/recaptcha', () => {
7575
recaptchaKey: 'projects/testproj/keys/' + TEST_SITE_KEY,
7676
recaptchaEnforcementState: [
7777
{
78-
provider: RecaptchaProvider.EMAIL_PASSWORD_PROVIDER,
78+
provider: RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER,
7979
enforcementState: EnforcementState.ENFORCE
8080
},
8181
{
82-
provider: RecaptchaProvider.PHONE_PROVIDER,
82+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
8383
enforcementState: EnforcementState.OFF
8484
}
8585
]
@@ -120,33 +120,33 @@ describe('platform_browser/recaptcha/recaptcha', () => {
120120
it('should construct the recaptcha config from the backend response', () => {
121121
expect(recaptchaConfig.siteKey).to.eq(TEST_SITE_KEY);
122122
expect(recaptchaConfig.recaptchaEnforcementState[0]).to.eql({
123-
provider: RecaptchaProvider.EMAIL_PASSWORD_PROVIDER,
123+
provider: RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER,
124124
enforcementState: EnforcementState.ENFORCE
125125
});
126126
expect(recaptchaConfig.recaptchaEnforcementState[1]).to.eql({
127-
provider: RecaptchaProvider.PHONE_PROVIDER,
127+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
128128
enforcementState: EnforcementState.AUDIT
129129
});
130130
expect(recaptchaConfigEnforceAndOff.recaptchaEnforcementState[1]).to.eql({
131-
provider: RecaptchaProvider.PHONE_PROVIDER,
131+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
132132
enforcementState: EnforcementState.OFF
133133
});
134134
});
135135

136136
it('#getProviderEnforcementState should return the correct enforcement state of the provider', () => {
137137
expect(
138138
recaptchaConfig.getProviderEnforcementState(
139-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
139+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
140140
)
141141
).to.eq(EnforcementState.ENFORCE);
142142
expect(
143143
recaptchaConfig.getProviderEnforcementState(
144-
RecaptchaProvider.PHONE_PROVIDER
144+
RecaptchaAuthProvider.PHONE_PROVIDER
145145
)
146146
).to.eq(EnforcementState.AUDIT);
147147
expect(
148148
recaptchaConfigEnforceAndOff.getProviderEnforcementState(
149-
RecaptchaProvider.PHONE_PROVIDER
149+
RecaptchaAuthProvider.PHONE_PROVIDER
150150
)
151151
).to.eq(EnforcementState.OFF);
152152
expect(recaptchaConfig.getProviderEnforcementState('invalid-provider')).to
@@ -156,15 +156,15 @@ describe('platform_browser/recaptcha/recaptcha', () => {
156156
it('#isProviderEnabled should return the enablement state of the provider', () => {
157157
expect(
158158
recaptchaConfig.isProviderEnabled(
159-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
159+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
160160
)
161161
).to.be.true;
162162
expect(
163-
recaptchaConfig.isProviderEnabled(RecaptchaProvider.PHONE_PROVIDER)
163+
recaptchaConfig.isProviderEnabled(RecaptchaAuthProvider.PHONE_PROVIDER)
164164
).to.be.true;
165165
expect(
166166
recaptchaConfigEnforceAndOff.isProviderEnabled(
167-
RecaptchaProvider.PHONE_PROVIDER
167+
RecaptchaAuthProvider.PHONE_PROVIDER
168168
)
169169
).to.be.false;
170170
expect(recaptchaConfig.isProviderEnabled('invalid-provider')).to.be.false;

‎packages/auth/src/platform_browser/recaptcha/recaptcha.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
} from '../../api/authentication/recaptcha';
2323
import {
2424
EnforcementState,
25-
RecaptchaProvider,
25+
RecaptchaAuthProvider,
2626
_parseEnforcementState
2727
} from '../../api/index';
2828

@@ -148,8 +148,8 @@ export class RecaptchaConfig {
148148
*/
149149
isAnyProviderEnabled(): boolean {
150150
return (
151-
this.isProviderEnabled(RecaptchaProvider.EMAIL_PASSWORD_PROVIDER) ||
152-
this.isProviderEnabled(RecaptchaProvider.PHONE_PROVIDER)
151+
this.isProviderEnabled(RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER) ||
152+
this.isProviderEnabled(RecaptchaAuthProvider.PHONE_PROVIDER)
153153
);
154154
}
155155
}

‎packages/auth/src/platform_browser/recaptcha/recaptcha_enterprise_verifier.test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
RecaptchaClientType,
2626
RecaptchaVersion,
2727
RecaptchaActionName,
28-
RecaptchaProvider,
28+
RecaptchaAuthProvider,
2929
EnforcementState
3030
} from '../../api';
3131
import { mockEndpointWithParams } from '../../../test/helpers/api/helper';
@@ -56,11 +56,11 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
5656
recaptchaKey: 'foo/bar/to/site-key',
5757
recaptchaEnforcementState: [
5858
{
59-
provider: RecaptchaProvider.EMAIL_PASSWORD_PROVIDER,
59+
provider: RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER,
6060
enforcementState: EnforcementState.ENFORCE
6161
},
6262
{
63-
provider: RecaptchaProvider.PHONE_PROVIDER,
63+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
6464
enforcementState: EnforcementState.ENFORCE
6565
}
6666
]
@@ -72,11 +72,11 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
7272
recaptchaKey: 'foo/bar/to/site-key',
7373
recaptchaEnforcementState: [
7474
{
75-
provider: RecaptchaProvider.EMAIL_PASSWORD_PROVIDER,
75+
provider: RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER,
7676
enforcementState: EnforcementState.OFF
7777
},
7878
{
79-
provider: RecaptchaProvider.PHONE_PROVIDER,
79+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
8080
enforcementState: EnforcementState.OFF
8181
}
8282
]
@@ -86,11 +86,11 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
8686
recaptchaKey: 'foo/bar/to/site-key',
8787
recaptchaEnforcementState: [
8888
{
89-
provider: RecaptchaProvider.EMAIL_PASSWORD_PROVIDER,
89+
provider: RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER,
9090
enforcementState: EnforcementState.AUDIT
9191
},
9292
{
93-
provider: RecaptchaProvider.PHONE_PROVIDER,
93+
provider: RecaptchaAuthProvider.PHONE_PROVIDER,
9494
enforcementState: EnforcementState.AUDIT
9595
}
9696
]
@@ -198,7 +198,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
198198
mockRequest,
199199
RecaptchaActionName.SIGN_IN_WITH_PASSWORD,
200200
mockActionMethod,
201-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
201+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
202202
);
203203
expect(mockActionMethod).to.have.been.calledOnce;
204204
expect(response).to.equal('testResponse');
@@ -228,7 +228,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
228228
mockRequest,
229229
RecaptchaActionName.SIGN_IN_WITH_PASSWORD,
230230
mockActionMethod,
231-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
231+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
232232
);
233233
expect(mockActionMethod).to.have.been.calledTwice;
234234
expect(response).to.equal('testResponse');
@@ -258,7 +258,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
258258
mockRequest,
259259
RecaptchaActionName.SIGN_IN_WITH_PASSWORD,
260260
mockActionMethod,
261-
RecaptchaProvider.EMAIL_PASSWORD_PROVIDER
261+
RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER
262262
);
263263
await expect(response).to.be.rejectedWith(
264264
AuthErrorCode.RECAPTCHA_NOT_ENABLED
@@ -279,7 +279,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
279279
mockRequest,
280280
RecaptchaActionName.SEND_VERIFICATION_CODE,
281281
mockActionMethod,
282-
RecaptchaProvider.PHONE_PROVIDER
282+
RecaptchaAuthProvider.PHONE_PROVIDER
283283
);
284284
expect(mockActionMethod).to.have.been.calledOnce;
285285
expect(response).to.equal('testResponse');
@@ -308,7 +308,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
308308
mockRequest,
309309
RecaptchaActionName.SEND_VERIFICATION_CODE,
310310
mockActionMethod,
311-
RecaptchaProvider.PHONE_PROVIDER
311+
RecaptchaAuthProvider.PHONE_PROVIDER
312312
);
313313
expect(mockActionMethod).to.have.been.calledTwice;
314314
expect(response).to.equal('testResponse');
@@ -337,7 +337,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
337337
mockRequest,
338338
RecaptchaActionName.SEND_VERIFICATION_CODE,
339339
mockActionMethod,
340-
RecaptchaProvider.PHONE_PROVIDER
340+
RecaptchaAuthProvider.PHONE_PROVIDER
341341
);
342342
expect(mockActionMethod).to.have.been.calledTwice;
343343
expect(response).to.equal('testResponse');
@@ -367,7 +367,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
367367
mockRequest,
368368
RecaptchaActionName.SEND_VERIFICATION_CODE,
369369
mockActionMethod,
370-
RecaptchaProvider.PHONE_PROVIDER
370+
RecaptchaAuthProvider.PHONE_PROVIDER
371371
);
372372
await expect(response).to.be.rejectedWith(
373373
AuthErrorCode.INVALID_RECAPTCHA_TOKEN

0 commit comments

Comments
 (0)