Skip to content

Commit 9a969c7

Browse files
avolkoviavolkovi
committed
PR feedback
1 parent 20444f9 commit 9a969c7

File tree

5 files changed

+51
-69
lines changed

5 files changed

+51
-69
lines changed

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

+12-42
Original file line numberDiff line numberDiff line change
@@ -17,56 +17,35 @@
1717

1818
import { FirebaseError } from '@firebase/util';
1919
import { expect } from 'chai';
20-
import { ActionCodeSettings } from '@firebase/auth-types-exp';
2120

2221
import { testAuth, TestAuth } from '../../../test/helpers/mock_auth';
2322
import { GetOobCodeRequest } from '../../api/authentication/email_and_password';
24-
import { setActionCodeSettingsOnRequest_ } from './action_code_settings';
23+
import { _setActionCodeSettingsOnRequest } from './action_code_settings';
2524

2625
describe('core/strategies/action_code_settings', () => {
2726
let auth: TestAuth;
28-
const request: GetOobCodeRequest = {
29-
};
27+
const request: GetOobCodeRequest = {};
3028

3129
beforeEach(async () => {
3230
auth = await testAuth();
3331
});
3432

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-
5133
it('should require a non empty continue URL', () => {
5234
expect(() =>
53-
setActionCodeSettingsOnRequest_(auth, request, {
35+
_setActionCodeSettingsOnRequest(auth, request, {
5436
handleCodeInApp: true,
5537
iOS: {
5638
bundleId: 'my-bundle'
5739
},
5840
url: '',
5941
dynamicLinkDomain: 'fdl-domain'
6042
})
61-
).to.throw(
62-
FirebaseError,
63-
'(auth/invalid-continue-uri)'
64-
);
43+
).to.throw(FirebaseError, '(auth/invalid-continue-uri)');
6544
});
6645

6746
it('should allow undefined dynamic link URL', () => {
6847
expect(() =>
69-
setActionCodeSettingsOnRequest_(auth, request, {
48+
_setActionCodeSettingsOnRequest(auth, request, {
7049
handleCodeInApp: true,
7150
iOS: {
7251
bundleId: 'my-´bundle'
@@ -78,49 +57,40 @@ describe('core/strategies/action_code_settings', () => {
7857

7958
it('should require a non empty dynamic link URL', () => {
8059
expect(() =>
81-
setActionCodeSettingsOnRequest_(auth, request, {
60+
_setActionCodeSettingsOnRequest(auth, request, {
8261
handleCodeInApp: true,
8362
iOS: {
8463
bundleId: 'my-´bundle'
8564
},
8665
url: 'my-url',
8766
dynamicLinkDomain: ''
8867
})
89-
).to.throw(
90-
FirebaseError,
91-
'(auth/invalid-dynamic-link-domain)'
92-
);
68+
).to.throw(FirebaseError, '(auth/invalid-dynamic-link-domain)');
9369
});
9470

9571
it('should require a non-empty bundle ID', () => {
9672
expect(() =>
97-
setActionCodeSettingsOnRequest_(auth, request, {
73+
_setActionCodeSettingsOnRequest(auth, request, {
9874
handleCodeInApp: true,
9975
iOS: {
10076
bundleId: ''
10177
},
10278
url: 'my-url',
10379
dynamicLinkDomain: 'fdl-domain'
10480
})
105-
).to.throw(
106-
FirebaseError,
107-
'(auth/missing-ios-bundle-id)'
108-
);
81+
).to.throw(FirebaseError, '(auth/missing-ios-bundle-id)');
10982
});
11083

11184
it('should require a non-empty package name', () => {
11285
expect(() =>
113-
setActionCodeSettingsOnRequest_(auth, request, {
86+
_setActionCodeSettingsOnRequest(auth, request, {
11487
handleCodeInApp: true,
11588
android: {
11689
packageName: ''
11790
},
11891
url: 'my-url',
11992
dynamicLinkDomain: 'fdl-domain'
12093
})
121-
).to.throw(
122-
FirebaseError,
123-
'(auth/missing-android-pkg-name)'
124-
);
94+
).to.throw(FirebaseError, '(auth/missing-android-pkg-name)');
12595
});
126-
});
96+
});

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

+32-20
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,56 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { ActionCodeSettings } from '@firebase/auth-types-exp';
18+
import { ActionCodeSettings, Auth } from '@firebase/auth-types-exp';
1919

2020
import { GetOobCodeRequest } from '../../api/authentication/email_and_password';
2121
import { AuthErrorCode } from '../errors';
2222
import { assert } from '../util/assert';
23-
import { AuthCore } from '../../model/auth';
2423

25-
export function setActionCodeSettingsOnRequest_(
26-
auth: AuthCore,
24+
export function _setActionCodeSettingsOnRequest(
25+
auth: Auth,
2726
request: GetOobCodeRequest,
2827
actionCodeSettings: ActionCodeSettings
2928
): void {
30-
assert(typeof actionCodeSettings.url !== 'undefined', AuthErrorCode.MISSING_CONTINUE_URI, {
31-
appName: auth.name
32-
});
33-
assert(actionCodeSettings.url.length > 0, AuthErrorCode.INVALID_CONTINUE_URI, {
34-
appName: auth.name
35-
});
36-
assert(typeof actionCodeSettings.dynamicLinkDomain === 'undefined' ||
37-
actionCodeSettings.dynamicLinkDomain.length > 0, AuthErrorCode.INVALID_DYNAMIC_LINK_DOMAIN, {
38-
appName: auth.name
39-
});
29+
assert(
30+
actionCodeSettings.url.length > 0,
31+
AuthErrorCode.INVALID_CONTINUE_URI,
32+
{
33+
appName: auth.name
34+
}
35+
);
36+
assert(
37+
typeof actionCodeSettings.dynamicLinkDomain === 'undefined' ||
38+
actionCodeSettings.dynamicLinkDomain.length > 0,
39+
AuthErrorCode.INVALID_DYNAMIC_LINK_DOMAIN,
40+
{
41+
appName: auth.name
42+
}
43+
);
4044

4145
request.continueUrl = actionCodeSettings.url;
4246
request.dynamicLinkDomain = actionCodeSettings.dynamicLinkDomain;
4347
request.canHandleCodeInApp = actionCodeSettings.handleCodeInApp;
4448

4549
if (actionCodeSettings.iOS) {
46-
assert(actionCodeSettings.iOS.bundleId.length > 0, AuthErrorCode.MISSING_IOS_BUNDLE_ID, {
47-
appName: auth.name
48-
});
50+
assert(
51+
actionCodeSettings.iOS.bundleId.length > 0,
52+
AuthErrorCode.MISSING_IOS_BUNDLE_ID,
53+
{
54+
appName: auth.name
55+
}
56+
);
4957
request.iosBundleId = actionCodeSettings.iOS.bundleId;
5058
}
5159

5260
if (actionCodeSettings.android) {
53-
assert(actionCodeSettings.android.packageName.length > 0, AuthErrorCode.MISSING_ANDROID_PACKAGE_NAME, {
54-
appName: auth.name
55-
});
61+
assert(
62+
actionCodeSettings.android.packageName.length > 0,
63+
AuthErrorCode.MISSING_ANDROID_PACKAGE_NAME,
64+
{
65+
appName: auth.name
66+
}
67+
);
5668
request.androidInstallApp = actionCodeSettings.android.installApp;
5769
request.androidMinimumVersionCode =
5870
actionCodeSettings.android.minimumVersion;

‎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)