Skip to content

Commit d13b99c

Browse files
avolkoviavolkovi
committed
Merge conflicts
1 parent 290b5c1 commit d13b99c

File tree

13 files changed

+46
-41
lines changed

13 files changed

+46
-41
lines changed

‎packages-exp/auth-exp/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { Auth } from '@firebase/auth-types-exp';
2121
import { initializeAuth } from './src';
2222
import { registerAuth } from './src/core/auth/register';
2323
import { ClientPlatform } from './src/core/util/version';
24-
import { browserLocalPersistence } from './src/platform_browser/persistence/browser';
24+
import { browserLocalPersistence } from './src/platform_browser/persistence/local_storage';
2525
import { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
2626
import { browserPopupRedirectResolver } from './src/platform_browser/popup_redirect';
2727

‎packages-exp/auth-exp/index.webworker.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ import { _AUTH_COMPONENT_NAME, registerAuth } from './src/core/auth/register';
2424
import { Persistence } from './src/core/persistence';
2525
import { _getInstance } from './src/core/util/instantiator';
2626
import { ClientPlatform } from './src/core/util/version';
27-
export { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
27+
import { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
2828

2929
// Core functionality shared by all clients
3030
export * from './src';
3131

32+
// persistence
33+
export { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
34+
3235
registerAuth(ClientPlatform.WORKER);
3336

3437
export function getAuth(app = getApp()): Auth {

‎packages-exp/auth-exp/src/core/auth/auth_impl.test.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ describe('core/auth/auth_impl', () => {
284284
context('still logged out', () => {
285285
it('should do nothing', async () => {
286286
await auth._onStorageEvent();
287-
287+
288288
expect(authStateCallback).not.to.have.been.called;
289289
expect(idTokenCallback).not.to.have.been.called;
290290
});
@@ -340,7 +340,7 @@ describe('core/auth/auth_impl', () => {
340340

341341
expect(auth.currentUser?.toJSON()).to.eql(user.toJSON());
342342
expect(authStateCallback).not.to.have.been.called;
343-
expect(idTokenCallback).not.to.have.been.called;
343+
expect(idTokenCallback).not.to.have.been.called;
344344
});
345345

346346
it('should update fields if they have changed', async () => {
@@ -353,18 +353,21 @@ describe('core/auth/auth_impl', () => {
353353
expect(auth.currentUser?.uid).to.eq(user.uid);
354354
expect(auth.currentUser?.displayName).to.eq('other-name');
355355
expect(authStateCallback).not.to.have.been.called;
356-
expect(idTokenCallback).not.to.have.been.called;
356+
expect(idTokenCallback).not.to.have.been.called;
357357
});
358358

359359
it('should update tokens if they have changed', async () => {
360360
const userObj = user.toJSON();
361-
(userObj['stsTokenManager'] as any)['accessToken'] = 'new-access-token';
361+
(userObj['stsTokenManager'] as any)['accessToken'] =
362+
'new-access-token';
362363
persistenceStub.get.returns(Promise.resolve(userObj));
363364

364365
await auth._onStorageEvent();
365366

366367
expect(auth.currentUser?.uid).to.eq(user.uid);
367-
expect(auth.currentUser?.stsTokenManager.accessToken).to.eq('new-access-token');
368+
expect(auth.currentUser?.stsTokenManager.accessToken).to.eq(
369+
'new-access-token'
370+
);
368371
expect(authStateCallback).not.to.have.been.called;
369372
expect(idTokenCallback).to.have.been.called;
370373
});
@@ -377,8 +380,6 @@ describe('core/auth/auth_impl', () => {
377380

378381
await auth._onStorageEvent();
379382

380-
console.log(auth.currentUser?.toJSON());
381-
console.log(newUser.toJSON());
382383
expect(auth.currentUser?.toJSON()).to.eql(newUser.toJSON());
383384
expect(authStateCallback).to.have.been.called;
384385
expect(idTokenCallback).to.have.been.called;

‎packages-exp/auth-exp/src/core/auth/auth_impl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export class AuthImplCompat<T extends User> implements Auth, _FirebaseService {
116116
if (!this.currentUser && !user) {
117117
// No change, do nothing (was signed out and remained signed out).
118118
return;
119-
}
119+
}
120120

121121
// If the same user is to be synchronized.
122122
if (this.currentUser && user && this.currentUser.uid === user.uid) {

‎packages-exp/auth-exp/src/core/auth/firebase_internal.test.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,9 @@ describe('src/core/auth/firebase_internal', () => {
7070
beforeEach(async () => {
7171
user = testUser(auth, 'uid', undefined, true);
7272
await auth.updateCurrentUser(user);
73-
sinon.stub(user.stsTokenManager, 'getToken').returns(
74-
Promise.resolve({
75-
accessToken: 'access-token',
76-
refreshToken: 'refresh-tken',
77-
wasRefreshed: true
78-
})
79-
);
73+
sinon
74+
.stub(user.stsTokenManager, 'getToken')
75+
.returns(Promise.resolve('new-access-token'));
8076
sinon
8177
.stub(user, '_startProactiveRefresh')
8278
.callsFake(() => (isProactiveRefresh = true));

‎packages-exp/auth-exp/src/core/persistence/persistence_user_manager.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ export class PersistenceUserManager {
5151
config.apiKey,
5252
name
5353
);
54-
this.persistence.addListener(this.fullUserKey, auth._onStorageEvent.bind(auth));
54+
this.persistence.addListener(
55+
this.fullUserKey,
56+
auth._onStorageEvent.bind(auth)
57+
);
5558
}
5659

5760
setCurrentUser(user: User): Promise<void> {

‎packages-exp/auth-exp/src/core/user/token_manager.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ export class StsTokenManager {
5757
}
5858

5959
if (!this.refreshToken) {
60-
assert(!this.accessToken, AuthErrorCode.TOKEN_EXPIRED, { appName: auth.name });
60+
assert(!this.accessToken, AuthErrorCode.TOKEN_EXPIRED, {
61+
appName: auth.name
62+
});
6163
return null;
6264
}
6365

‎packages-exp/auth-exp/src/core/user/user_impl.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ import { MutableUserInfo, User, UserParameters } from '../../model/user';
2828
import { AuthErrorCode } from '../errors';
2929
import { PersistedBlob } from '../persistence';
3030
import { assert } from '../util/assert';
31-
import { utcTimestampToDateString } from '../util/time';
3231
import { getIdTokenResult } from './id_token_result';
3332
import { ProactiveRefresh } from './proactive_refresh';
34-
import { _reloadWithoutSaving, reload } from './reload';
33+
import { reload, _reloadWithoutSaving } from './reload';
3534
import { StsTokenManager } from './token_manager';
3635
import { UserMetadata } from './user_metadata';
3736

@@ -84,8 +83,13 @@ export class UserImpl implements User {
8483
}
8584

8685
async getIdToken(forceRefresh?: boolean): Promise<string> {
87-
const accessToken = await this.stsTokenManager.getToken(this.auth, forceRefresh);
88-
assert(accessToken, AuthErrorCode.INTERNAL_ERROR, { appName: this.auth.name });
86+
const accessToken = await this.stsTokenManager.getToken(
87+
this.auth,
88+
forceRefresh
89+
);
90+
assert(accessToken, AuthErrorCode.INTERNAL_ERROR, {
91+
appName: this.auth.name
92+
});
8993

9094
if (this.accessToken !== accessToken) {
9195
this.accessToken = accessToken;

‎packages-exp/auth-exp/src/model/user.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717

1818
import * as externs from '@firebase/auth-types-exp';
1919
import { NextFn } from '@firebase/util';
20-
2120
import { APIUserInfo } from '../api/account_management/account';
2221
import { FinalizeMfaResponse } from '../api/authentication/mfa';
2322
import { PersistedBlob } from '../core/persistence';
2423
import { StsTokenManager } from '../core/user/token_manager';
24+
import { UserMetadata } from '../core/user/user_metadata';
2525
import { Auth } from './auth';
2626
import { IdTokenResponse, TaggedWithTokenResponse } from './id_token';
27-
import { StsTokenManager } from '../core/user/token_manager';
28-
import { UserMetadata } from '../core/user/user_metadata';
2927

3028
type MutableUserInfo = {
3129
-readonly [K in keyof externs.UserInfo]: externs.UserInfo[K];

‎packages-exp/auth-exp/src/platform_browser/persistence/indexed_db.test.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ import * as sinonChai from 'sinon-chai';
2222
import { testUser, testAuth } from '../../../test/helpers/mock_auth';
2323
import { _getInstance } from '../../core/util/instantiator';
2424
import { Persistence, PersistenceType } from '../../core/persistence';
25-
import { indexedDBLocalPersistence, POLLING_INTERVAL_MS, _putObject, _openDatabase, _clearDatabase } from './indexed_db';
25+
import {
26+
indexedDBLocalPersistence,
27+
POLLING_INTERVAL_MS,
28+
_putObject,
29+
_openDatabase,
30+
_clearDatabase
31+
} from './indexed_db';
2632

2733
use(sinonChai);
2834

@@ -74,13 +80,13 @@ describe('core/persistence/indexed_db', () => {
7480
});
7581
});
7682

77-
describe("#addEventListener", () => {
83+
describe('#addEventListener', () => {
7884
let clock: sinon.SinonFakeTimers;
7985
const key = 'my-key';
8086
const newValue = 'new-value';
8187
let callback: sinon.SinonSpy;
8288
let db: IDBDatabase;
83-
89+
8490
before(async () => {
8591
db = await _openDatabase();
8692
});
@@ -99,7 +105,7 @@ describe('core/persistence/indexed_db', () => {
99105

100106
it('should trigger a listener when the key changes', async () => {
101107
await _putObject(db, key, newValue);
102-
108+
103109
clock.tick(POLLING_INTERVAL_MS + 1);
104110
clock.restore();
105111
// Wait a little for the poll operation to complete
@@ -119,7 +125,6 @@ describe('core/persistence/indexed_db', () => {
119125
expect(callback).not.to.have.been.called;
120126
});
121127

122-
123128
it('should not trigger if a write is pending', async () => {
124129
await _putObject(db, key, newValue);
125130
(persistence as any)['pendingWrites'] = 1;

‎packages-exp/auth-exp/src/platform_browser/persistence/indexed_db.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function getObjectStore(db: IDBDatabase, isReadWrite: boolean): IDBObjectStore {
6161
.objectStore(DB_OBJECTSTORE_NAME);
6262
}
6363

64-
export async function _clearDatabase(db: IDBDatabase): Promise<void>{
64+
export async function _clearDatabase(db: IDBDatabase): Promise<void> {
6565
const objectStore = getObjectStore(db, true);
6666
return new DBPromise<void>(objectStore.clear()).toPromise();
6767
}
@@ -247,10 +247,7 @@ class IndexedDBLocalPersistence implements Persistence {
247247
private _startPolling(): void {
248248
this._stopPolling();
249249

250-
this.pollTimer = setInterval(
251-
async () => this._poll(),
252-
POLLING_INTERVAL_MS
253-
);
250+
this.pollTimer = setInterval(async () => this._poll(), POLLING_INTERVAL_MS);
254251
}
255252

256253
private _stopPolling(): void {

‎packages-exp/auth-exp/src/platform_browser/persistence/local_storage.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,7 @@ class BrowserLocalPersistence extends BrowserPersistenceClass
149149
// correct key, oldValue and newValue but localStorage.getItem(key) does
150150
// not yield the updated value until a few milliseconds. This ensures
151151
// this recovers from that situation.
152-
setTimeout(
153-
triggerListeners,
154-
IE10_LOCAL_STORAGE_SYNC_DELAY
155-
);
152+
setTimeout(triggerListeners, IE10_LOCAL_STORAGE_SYNC_DELAY);
156153
} else {
157154
triggerListeners();
158155
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ describe('core/strategies/phone', () => {
436436

437437
it('should link the phone number to the user', async () => {
438438
await updatePhoneNumber(user, credential);
439-
console.log(JSON.stringify(signInMock.calls[0].request));
440439
expect(signInMock.calls[0].request).to.eql({
441440
idToken: 'access-token',
442441
sessionInfo: 'session-info',

0 commit comments

Comments
 (0)