Skip to content

Commit 3698f3b

Browse files
MarkDuckworthMarkDuckworth
committed
Merge branch 'master' of github.com:firebase/firebase-js-sdk into mrschmidt/initflag
2 parents 1007bfd + 37a8abd commit 3698f3b

File tree

13 files changed

+43
-37
lines changed

13 files changed

+43
-37
lines changed

‎packages/auth/karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ function getTestFiles(argv) {
5454
}
5555

5656
function getTestBrowsers(argv) {
57-
let browsers = ["ChromeHeadless"];
57+
let browsers = ['ChromeHeadless'];
5858
if (process.env?.BROWSERS && argv.unit) {
5959
browsers = process.env?.BROWSERS?.split(',');
60-
}
60+
}
6161
return browsers;
6262
}
6363

‎packages/auth/src/api/account_management/mfa.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('api/account_management/startEnrollPhoneMfa', () => {
5252
afterEach(mockFetch.tearDown);
5353

5454
it('should POST to the correct endpoint', async () => {
55-
const mock = mockEndpoint(Endpoint.START_PHONE_MFA_ENROLLMENT, {
55+
const mock = mockEndpoint(Endpoint.START_MFA_ENROLLMENT, {
5656
phoneSessionInfo: {
5757
sessionInfo: 'session-info'
5858
}
@@ -72,7 +72,7 @@ describe('api/account_management/startEnrollPhoneMfa', () => {
7272

7373
it('should handle errors', async () => {
7474
const mock = mockEndpoint(
75-
Endpoint.START_PHONE_MFA_ENROLLMENT,
75+
Endpoint.START_MFA_ENROLLMENT,
7676
{
7777
error: {
7878
code: 400,
@@ -116,7 +116,7 @@ describe('api/account_management/finalizeEnrollPhoneMfa', () => {
116116
afterEach(mockFetch.tearDown);
117117

118118
it('should POST to the correct endpoint', async () => {
119-
const mock = mockEndpoint(Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT, {
119+
const mock = mockEndpoint(Endpoint.FINALIZE_MFA_ENROLLMENT, {
120120
idToken: 'id-token',
121121
refreshToken: 'refresh-token'
122122
});
@@ -136,7 +136,7 @@ describe('api/account_management/finalizeEnrollPhoneMfa', () => {
136136

137137
it('should handle errors', async () => {
138138
const mock = mockEndpoint(
139-
Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
139+
Endpoint.FINALIZE_MFA_ENROLLMENT,
140140
{
141141
error: {
142142
code: 400,

‎packages/auth/src/api/account_management/mfa.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export function startEnrollPhoneMfa(
7171
>(
7272
auth,
7373
HttpMethod.POST,
74-
Endpoint.START_PHONE_MFA_ENROLLMENT,
74+
Endpoint.START_MFA_ENROLLMENT,
7575
_addTidIfNecessary(auth, request)
7676
);
7777
}
@@ -96,7 +96,7 @@ export function finalizeEnrollPhoneMfa(
9696
>(
9797
auth,
9898
HttpMethod.POST,
99-
Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
99+
Endpoint.FINALIZE_MFA_ENROLLMENT,
100100
_addTidIfNecessary(auth, request)
101101
);
102102
}

‎packages/auth/src/api/authentication/mfa.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('api/authentication/startSignInPhoneMfa', () => {
4848
afterEach(mockFetch.tearDown);
4949

5050
it('should POST to the correct endpoint', async () => {
51-
const mock = mockEndpoint(Endpoint.START_PHONE_MFA_SIGN_IN, {
51+
const mock = mockEndpoint(Endpoint.START_MFA_SIGN_IN, {
5252
phoneResponseInfo: {
5353
sessionInfo: 'session-info'
5454
}
@@ -68,7 +68,7 @@ describe('api/authentication/startSignInPhoneMfa', () => {
6868

6969
it('should handle errors', async () => {
7070
const mock = mockEndpoint(
71-
Endpoint.START_PHONE_MFA_SIGN_IN,
71+
Endpoint.START_MFA_SIGN_IN,
7272
{
7373
error: {
7474
code: 400,
@@ -112,7 +112,7 @@ describe('api/authentication/finalizeSignInPhoneMfa', () => {
112112
afterEach(mockFetch.tearDown);
113113

114114
it('should POST to the correct endpoint', async () => {
115-
const mock = mockEndpoint(Endpoint.FINALIZE_PHONE_MFA_SIGN_IN, {
115+
const mock = mockEndpoint(Endpoint.FINALIZE_MFA_SIGN_IN, {
116116
idToken: 'id-token',
117117
refreshToken: 'refresh-token'
118118
});
@@ -132,7 +132,7 @@ describe('api/authentication/finalizeSignInPhoneMfa', () => {
132132

133133
it('should handle errors', async () => {
134134
const mock = mockEndpoint(
135-
Endpoint.FINALIZE_PHONE_MFA_SIGN_IN,
135+
Endpoint.FINALIZE_MFA_SIGN_IN,
136136
{
137137
error: {
138138
code: 400,

‎packages/auth/src/api/authentication/mfa.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function startSignInPhoneMfa(
6868
>(
6969
auth,
7070
HttpMethod.POST,
71-
Endpoint.START_PHONE_MFA_SIGN_IN,
71+
Endpoint.START_MFA_SIGN_IN,
7272
_addTidIfNecessary(auth, request)
7373
);
7474
}
@@ -91,7 +91,7 @@ export function finalizeSignInPhoneMfa(
9191
>(
9292
auth,
9393
HttpMethod.POST,
94-
Endpoint.FINALIZE_PHONE_MFA_SIGN_IN,
94+
Endpoint.FINALIZE_MFA_SIGN_IN,
9595
_addTidIfNecessary(auth, request)
9696
);
9797
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export const enum Endpoint {
6060
SET_ACCOUNT_INFO = '/v1/accounts:update',
6161
GET_ACCOUNT_INFO = '/v1/accounts:lookup',
6262
GET_RECAPTCHA_PARAM = '/v1/recaptchaParams',
63-
START_PHONE_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:start',
64-
FINALIZE_PHONE_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:finalize',
65-
START_PHONE_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:start',
66-
FINALIZE_PHONE_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:finalize',
63+
START_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:start',
64+
FINALIZE_MFA_ENROLLMENT = '/v2/accounts/mfaEnrollment:finalize',
65+
START_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:start',
66+
FINALIZE_MFA_SIGN_IN = '/v2/accounts/mfaSignIn:finalize',
6767
WITHDRAW_MFA = '/v2/accounts/mfaEnrollment:withdraw',
6868
GET_PROJECT_CONFIG = '/v1/projects'
6969
}

‎packages/auth/src/core/util/version.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ describe('core/util/_getClientVersion', () => {
4242
context('worker', () => {
4343
it('should set the correct version', () => {
4444
expect(_getClientVersion(ClientPlatform.WORKER)).to.eq(
45-
`${_getBrowserName(getUA())}-Worker/JsCore/${SDK_VERSION}/FirebaseCore-web`
45+
`${_getBrowserName(
46+
getUA()
47+
)}-Worker/JsCore/${SDK_VERSION}/FirebaseCore-web`
4648
);
4749
});
4850
});

‎packages/auth/src/mfa/mfa_resolver.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('core/mfa/mfa_resolver/MultiFactorResolver', () => {
114114
};
115115

116116
beforeEach(() => {
117-
mock = mockEndpoint(Endpoint.FINALIZE_PHONE_MFA_SIGN_IN, {
117+
mock = mockEndpoint(Endpoint.FINALIZE_MFA_SIGN_IN, {
118118
idToken: finalIdToken,
119119
refreshToken: 'final-refresh-token'
120120
});

‎packages/auth/src/platform_browser/mfa/assertions/phone.test.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('platform_browser/mfa/phone', () => {
6363

6464
it('should finalize the MFA enrollment', async () => {
6565
const mock = mockEndpoint(
66-
Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
66+
Endpoint.FINALIZE_MFA_ENROLLMENT,
6767
serverResponse
6868
);
6969
const response = await assertion._process(auth, session);
@@ -80,7 +80,7 @@ describe('platform_browser/mfa/phone', () => {
8080
context('with display name', () => {
8181
it('should set the display name', async () => {
8282
const mock = mockEndpoint(
83-
Endpoint.FINALIZE_PHONE_MFA_ENROLLMENT,
83+
Endpoint.FINALIZE_MFA_ENROLLMENT,
8484
serverResponse
8585
);
8686
const response = await assertion._process(
@@ -109,10 +109,7 @@ describe('platform_browser/mfa/phone', () => {
109109
});
110110

111111
it('should finalize the MFA sign in', async () => {
112-
const mock = mockEndpoint(
113-
Endpoint.FINALIZE_PHONE_MFA_SIGN_IN,
114-
serverResponse
115-
);
112+
const mock = mockEndpoint(Endpoint.FINALIZE_MFA_SIGN_IN, serverResponse);
116113
const response = await assertion._process(auth, session);
117114
expect(response).to.eql(serverResponse);
118115
expect(mock.calls[0].request).to.eql({

‎packages/auth/src/platform_browser/persistence/session_storage.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ describe('platform_browser/persistence/session_storage', () => {
6666
afterEach(() => sinon.restore());
6767

6868
it('should emit false if sessionStorage setItem throws', async () => {
69-
sinon.stub(Storage.prototype, 'setItem').throws(new Error('nope'));
70-
expect(await persistence._isAvailable()).to.be.false;
69+
sinon.stub(Storage.prototype, 'setItem').throws(new Error('nope'));
70+
expect(await persistence._isAvailable()).to.be.false;
7171
});
7272

7373
it('should emit false if sessionStorage removeItem throws', async () => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ describe('platform_browser/strategies/phone', () => {
323323
});
324324

325325
it('works with an enrollment flow', async () => {
326-
const endpoint = mockEndpoint(Endpoint.START_PHONE_MFA_ENROLLMENT, {
326+
const endpoint = mockEndpoint(Endpoint.START_MFA_ENROLLMENT, {
327327
phoneSessionInfo: {
328328
sessionInfo: 'session-info'
329329
}
@@ -345,7 +345,7 @@ describe('platform_browser/strategies/phone', () => {
345345
});
346346

347347
it('works when completing the sign in flow', async () => {
348-
const endpoint = mockEndpoint(Endpoint.START_PHONE_MFA_SIGN_IN, {
348+
const endpoint = mockEndpoint(Endpoint.START_MFA_SIGN_IN, {
349349
phoneResponseInfo: {
350350
sessionInfo: 'session-info'
351351
}

‎packages/auth/src/platform_cordova/popup_redirect/events.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ describe('platform_cordova/popup_redirect/events', () => {
7373
const spy = sinon.spy(Storage.prototype, 'setItem');
7474
const event = _generateNewEvent(auth, AuthEventType.REAUTH_VIA_REDIRECT);
7575
await _savePartialEvent(auth, event);
76-
expect(spy).to.have.been.calledWith('firebase:authEvent:test-api-key:test-app',
77-
JSON.stringify(event));
76+
expect(spy).to.have.been.calledWith(
77+
'firebase:authEvent:test-api-key:test-app',
78+
JSON.stringify(event)
79+
);
7880
});
7981
});
8082

‎packages/firestore-compat/tools/console.build.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,17 @@ const EXPORTNAME = '__firestore_exports__';
3434
const OUTPUT_FOLDER = 'dist';
3535
const OUTPUT_FILE = 'standalone.js';
3636

37-
const es5InputOptions = {
37+
const es6InputOptions = {
3838
input: 'src/index.console.ts',
3939
plugins: [
4040
nodeResolve(),
4141
typescriptPlugin({
4242
typescript,
43+
tsconfigOverride: {
44+
compilerOptions: {
45+
target: 'es6'
46+
}
47+
},
4348
transformers: [rollupUtil.removeAssertTransformer]
4449
}),
4550
json({ preferConst: true }),
@@ -51,7 +56,7 @@ const es5InputOptions = {
5156
]
5257
};
5358

54-
const es5OutputOptions = {
59+
const es6OutputOptions = {
5560
file: `${OUTPUT_FOLDER}/${OUTPUT_FILE}`,
5661
name: EXPORTNAME,
5762
format: 'iife'
@@ -60,18 +65,18 @@ const es5OutputOptions = {
6065
const POSTFIX = `window['${EXPORTNAME}']=${EXPORTNAME};`;
6166

6267
async function build() {
63-
const es5Bundle = await rollup.rollup(es5InputOptions);
68+
const es6Bundle = await rollup.rollup(es6InputOptions);
6469
const {
6570
output: [{ code }]
66-
} = await es5Bundle.generate(es5OutputOptions);
71+
} = await es6Bundle.generate(es6OutputOptions);
6772

6873
const output = `${String(code)}${POSTFIX}`;
6974

7075
if (!fs.existsSync(OUTPUT_FOLDER)) {
7176
fs.mkdirSync(OUTPUT_FOLDER);
7277
}
7378

74-
await fs_writeFile(es5OutputOptions.file, output, 'utf-8');
79+
await fs_writeFile(es6OutputOptions.file, output, 'utf-8');
7580
}
7681

7782
build();

0 commit comments

Comments
 (0)