Skip to content

Commit b721ee7

Browse files
committed
Make recaptchaEnterpriseVerifier.verify return a mock when appVerificationDisabledForTesting is true
1 parent ae619b0 commit b721ee7

File tree

8 files changed

+17
-13
lines changed

8 files changed

+17
-13
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ describe('core/credentials/email', () => {
137137

138138
beforeEach(async () => {
139139
auth = await testAuth();
140+
auth.settings.appVerificationDisabledForTesting = false;
140141
});
141142

142143
context('email & password', () => {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ describe('core/strategies/sendPasswordResetEmail', () => {
7474

7575
beforeEach(async () => {
7676
auth = await testAuth();
77+
auth.settings.appVerificationDisabledForTesting = false;
7778
mockFetch.setUp();
7879
});
7980

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ describe('core/strategies/sendSignInLinkToEmail', () => {
5858

5959
beforeEach(async () => {
6060
auth = await testAuth();
61+
auth.settings.appVerificationDisabledForTesting = false;
6162
mockFetch.setUp();
6263
});
6364

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ describe('platform_browser/providers/phone', () => {
4242
beforeEach(async () => {
4343
fetch.setUp();
4444
auth = await testAuth();
45+
auth.settings.appVerificationDisabledForTesting = false;
4546
});
4647

4748
afterEach(() => {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ describe('platform_browser/recaptcha/recaptcha_enterprise_verifier', () => {
108108

109109
beforeEach(async () => {
110110
auth = await testAuth();
111+
auth.settings.appVerificationDisabledForTesting = false;
111112
mockFetch.setUp();
112113
verifier = new RecaptchaEnterpriseVerifier(auth);
113114
recaptcha = new MockGreCAPTCHATopLevel();

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import * as jsHelpers from '../load_js';
3333
import { AuthErrorCode } from '../../core/errors';
3434
import { StartPhoneMfaEnrollmentRequest } from '../../api/account_management/mfa';
3535
import { StartPhoneMfaSignInRequest } from '../../api/authentication/mfa';
36+
import { MockGreCAPTCHATopLevel } from './recaptcha_mock';
3637

3738
const RECAPTCHA_ENTERPRISE_URL =
3839
'https://www.google.com/recaptcha/enterprise.js?render=';
@@ -125,6 +126,12 @@ export class RecaptchaEnterpriseVerifier {
125126
}
126127
}
127128

129+
// Returns Promise for a mock token when appVerificationDisabledForTesting is true.
130+
if (this.auth.settings.appVerificationDisabledForTesting) {
131+
const mockRecaptcha = new MockGreCAPTCHATopLevel();
132+
return mockRecaptcha.execute('siteKey', { action: 'verify' });
133+
}
134+
128135
return new Promise<string>((resolve, reject) => {
129136
retrieveSiteKey(this.auth)
130137
.then(siteKey => {

packages/auth/src/platform_browser/strategies/phone.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ describe('platform_browser/strategies/phone', () => {
131131

132132
beforeEach(async () => {
133133
auth = await testAuth();
134+
auth.settings.appVerificationDisabledForTesting = false;
134135
fetch.setUp();
135136

136137
sendCodeEndpoint = mockEndpoint(Endpoint.SEND_VERIFICATION_CODE, {

packages/auth/src/platform_browser/strategies/phone.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -227,19 +227,10 @@ export async function _verifyPhoneNumber(
227227
options: PhoneInfoOptions | string,
228228
verifier?: ApplicationVerifierInternal
229229
): Promise<string> {
230-
const enterpriseVerifier = new RecaptchaEnterpriseVerifier(auth);
231-
const recaptchaEnterpriseToken = await enterpriseVerifier.verify();
232-
233-
_assert(
234-
typeof recaptchaEnterpriseToken === 'string',
235-
auth,
236-
AuthErrorCode.ARGUMENT_ERROR
237-
);
238-
_assert(
239-
enterpriseVerifier.type === RECAPTCHA_ENTERPRISE_VERIFIER_TYPE,
240-
auth,
241-
AuthErrorCode.ARGUMENT_ERROR
242-
);
230+
if (!auth._getRecaptchaConfig()) {
231+
const enterpriseVerifier = new RecaptchaEnterpriseVerifier(auth);
232+
await enterpriseVerifier.verify();
233+
}
243234

244235
try {
245236
let phoneInfoOptions: PhoneInfoOptions;

0 commit comments

Comments
 (0)