Skip to content

Commit 068fac5

Browse files
committed
PR feedback
1 parent 84a5226 commit 068fac5

File tree

5 files changed

+14
-33
lines changed

5 files changed

+14
-33
lines changed

packages-exp/auth-exp/src/core/strategies/action_code_settings.test.ts

+6-22
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { ActionCodeSettings } from '@firebase/auth-types-exp';
2121

2222
import { testAuth, TestAuth } from '../../../test/helpers/mock_auth';
2323
import { GetOobCodeRequest } from '../../api/authentication/email_and_password';
24-
import { setActionCodeSettingsOnRequest_ } from './action_code_settings';
24+
import { _setActionCodeSettingsOnRequest } from './action_code_settings';
2525

2626
describe('core/strategies/action_code_settings', () => {
2727
let auth: TestAuth;
@@ -32,25 +32,9 @@ describe('core/strategies/action_code_settings', () => {
3232
auth = await testAuth();
3333
});
3434

35-
36-
it('should require a continue URL', () => {
37-
expect(() =>
38-
setActionCodeSettingsOnRequest_(auth, request, {
39-
handleCodeInApp: true,
40-
iOS: {
41-
bundleId: 'my-bundle'
42-
},
43-
dynamicLinkDomain: 'fdl-domain'
44-
} as unknown as ActionCodeSettings)
45-
).to.throw(
46-
FirebaseError,
47-
'(auth/missing-continue-uri)'
48-
);
49-
});
50-
5135
it('should require a non empty continue URL', () => {
5236
expect(() =>
53-
setActionCodeSettingsOnRequest_(auth, request, {
37+
_setActionCodeSettingsOnRequest(auth, request, {
5438
handleCodeInApp: true,
5539
iOS: {
5640
bundleId: 'my-bundle'
@@ -66,7 +50,7 @@ describe('core/strategies/action_code_settings', () => {
6650

6751
it('should allow undefined dynamic link URL', () => {
6852
expect(() =>
69-
setActionCodeSettingsOnRequest_(auth, request, {
53+
_setActionCodeSettingsOnRequest(auth, request, {
7054
handleCodeInApp: true,
7155
iOS: {
7256
bundleId: 'my-´bundle'
@@ -78,7 +62,7 @@ describe('core/strategies/action_code_settings', () => {
7862

7963
it('should require a non empty dynamic link URL', () => {
8064
expect(() =>
81-
setActionCodeSettingsOnRequest_(auth, request, {
65+
_setActionCodeSettingsOnRequest(auth, request, {
8266
handleCodeInApp: true,
8367
iOS: {
8468
bundleId: 'my-´bundle'
@@ -94,7 +78,7 @@ describe('core/strategies/action_code_settings', () => {
9478

9579
it('should require a non-empty bundle ID', () => {
9680
expect(() =>
97-
setActionCodeSettingsOnRequest_(auth, request, {
81+
_setActionCodeSettingsOnRequest(auth, request, {
9882
handleCodeInApp: true,
9983
iOS: {
10084
bundleId: ''
@@ -110,7 +94,7 @@ describe('core/strategies/action_code_settings', () => {
11094

11195
it('should require a non-empty package name', () => {
11296
expect(() =>
113-
setActionCodeSettingsOnRequest_(auth, request, {
97+
_setActionCodeSettingsOnRequest(auth, request, {
11498
handleCodeInApp: true,
11599
android: {
116100
packageName: ''

packages-exp/auth-exp/src/core/strategies/action_code_settings.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@ import { AuthErrorCode } from '../errors';
2222
import { assert } from '../util/assert';
2323
import { AuthCore } from '../../model/auth';
2424

25-
export function setActionCodeSettingsOnRequest_(
25+
export function _setActionCodeSettingsOnRequest(
2626
auth: AuthCore,
2727
request: GetOobCodeRequest,
2828
actionCodeSettings: ActionCodeSettings
2929
): void {
30-
assert(typeof actionCodeSettings.url !== 'undefined', AuthErrorCode.MISSING_CONTINUE_URI, {
31-
appName: auth.name
32-
});
3330
assert(actionCodeSettings.url.length > 0, AuthErrorCode.INVALID_CONTINUE_URI, {
3431
appName: auth.name
3532
});

packages-exp/auth-exp/src/core/strategies/email.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
import * as api from '../../api/authentication/email_and_password';
2525
import { User } from '../../model/user';
2626
import { _getCurrentUrl, _isHttpOrHttps } from '../util/location';
27-
import { setActionCodeSettingsOnRequest_ } from './action_code_settings';
27+
import { _setActionCodeSettingsOnRequest } from './action_code_settings';
2828
import { _castAuth } from '../auth/auth_impl';
2929

3030
export async function fetchSignInMethodsForEmail(
@@ -56,7 +56,7 @@ export async function sendEmailVerification(
5656
idToken
5757
};
5858
if (actionCodeSettings) {
59-
setActionCodeSettingsOnRequest_(user.auth, request, actionCodeSettings);
59+
_setActionCodeSettingsOnRequest(user.auth, request, actionCodeSettings);
6060
}
6161

6262
const { email } = await api.sendEmailVerification(user.auth, request);
@@ -79,7 +79,7 @@ export async function verifyBeforeUpdateEmail(
7979
newEmail
8080
};
8181
if (actionCodeSettings) {
82-
setActionCodeSettingsOnRequest_(user.auth, request, actionCodeSettings);
82+
_setActionCodeSettingsOnRequest(user.auth, request, actionCodeSettings);
8383
}
8484

8585
const { email } = await api.verifyAndChangeEmail(user.auth, request);

packages-exp/auth-exp/src/core/strategies/email_and_password.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { MultiFactorInfo } from '../../mfa/mfa_info';
2424
import { EmailAuthProvider } from '../providers/email';
2525
import { UserCredentialImpl } from '../user/user_credential_impl';
2626
import { assert } from '../util/assert';
27-
import { setActionCodeSettingsOnRequest_ } from './action_code_settings';
27+
import { _setActionCodeSettingsOnRequest } from './action_code_settings';
2828
import { signInWithCredential } from './credential';
2929
import { _castAuth } from '../auth/auth_impl';
3030
import { AuthErrorCode } from '../errors';
@@ -39,7 +39,7 @@ export async function sendPasswordResetEmail(
3939
email
4040
};
4141
if (actionCodeSettings) {
42-
setActionCodeSettingsOnRequest_(auth, request, actionCodeSettings);
42+
_setActionCodeSettingsOnRequest(auth, request, actionCodeSettings);
4343
}
4444

4545
await authentication.sendPasswordResetEmail(auth, request);

packages-exp/auth-exp/src/core/strategies/email_link.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import * as api from '../../api/authentication/email_and_password';
2121
import { ActionCodeURL } from '../action_code_url';
2222
import { EmailAuthProvider } from '../providers/email';
2323
import { _getCurrentUrl } from '../util/location';
24-
import { setActionCodeSettingsOnRequest_ } from './action_code_settings';
24+
import { _setActionCodeSettingsOnRequest } from './action_code_settings';
2525
import { signInWithCredential } from './credential';
2626
import { AuthErrorCode } from '../errors';
2727
import { assert } from '../util/assert';
@@ -36,7 +36,7 @@ export async function sendSignInLinkToEmail(
3636
email
3737
};
3838
if (actionCodeSettings) {
39-
setActionCodeSettingsOnRequest_(auth ,request, actionCodeSettings);
39+
_setActionCodeSettingsOnRequest(auth ,request, actionCodeSettings);
4040
}
4141

4242
await api.sendSignInLinkToEmail(auth, request);

0 commit comments

Comments
 (0)