Merge conflicts

Author: avolkovi

packages-exp/auth-exp/index.ts

@@ -21,7 +21,7 @@ import { Auth } from '@firebase/auth-types-exp';
 import { initializeAuth } from './src';
 import { registerAuth } from './src/core/auth/register';
 import { ClientPlatform } from './src/core/util/version';
-import { browserLocalPersistence } from './src/platform_browser/persistence/browser';
+import { browserLocalPersistence } from './src/platform_browser/persistence/local_storage';
 import { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
 import { browserPopupRedirectResolver } from './src/platform_browser/popup_redirect';
 

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

@@ -24,11 +24,14 @@ import { _AUTH_COMPONENT_NAME, registerAuth } from './src/core/auth/register';
 import { Persistence } from './src/core/persistence';
 import { _getInstance } from './src/core/util/instantiator';
 import { ClientPlatform } from './src/core/util/version';
-export { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
+import { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
 
 // Core functionality shared by all clients
 export * from './src';
 
+// persistence
+export { indexedDBLocalPersistence } from './src/platform_browser/persistence/indexed_db';
+
 registerAuth(ClientPlatform.WORKER);
 
 export function getAuth(app = getApp()): Auth {

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

@@ -284,7 +284,7 @@ describe('core/auth/auth_impl', () => {
       context('still logged out', () => {
         it('should do nothing', async () => {
           await auth._onStorageEvent();
-          
+
           expect(authStateCallback).not.to.have.been.called;
           expect(idTokenCallback).not.to.have.been.called;
         });
@@ -340,7 +340,7 @@ describe('core/auth/auth_impl', () => {
 
           expect(auth.currentUser?.toJSON()).to.eql(user.toJSON());
           expect(authStateCallback).not.to.have.been.called;
-          expect(idTokenCallback).not.to.have.been.called;     
+          expect(idTokenCallback).not.to.have.been.called;
         });
 
         it('should update fields if they have changed', async () => {
@@ -353,18 +353,21 @@ describe('core/auth/auth_impl', () => {
           expect(auth.currentUser?.uid).to.eq(user.uid);
           expect(auth.currentUser?.displayName).to.eq('other-name');
           expect(authStateCallback).not.to.have.been.called;
-          expect(idTokenCallback).not.to.have.been.called;          
+          expect(idTokenCallback).not.to.have.been.called;
         });
 
         it('should update tokens if they have changed', async () => {
           const userObj = user.toJSON();
-          (userObj['stsTokenManager'] as any)['accessToken'] = 'new-access-token';
+          (userObj['stsTokenManager'] as any)['accessToken'] =
+            'new-access-token';
           persistenceStub.get.returns(Promise.resolve(userObj));
 
           await auth._onStorageEvent();
 
           expect(auth.currentUser?.uid).to.eq(user.uid);
-          expect(auth.currentUser?.stsTokenManager.accessToken).to.eq('new-access-token');
+          expect(auth.currentUser?.stsTokenManager.accessToken).to.eq(
+            'new-access-token'
+          );
           expect(authStateCallback).not.to.have.been.called;
           expect(idTokenCallback).to.have.been.called;
         });
@@ -377,8 +380,6 @@ describe('core/auth/auth_impl', () => {
 
           await auth._onStorageEvent();
 
-          console.log(auth.currentUser?.toJSON());
-          console.log(newUser.toJSON());
           expect(auth.currentUser?.toJSON()).to.eql(newUser.toJSON());
           expect(authStateCallback).to.have.been.called;
           expect(idTokenCallback).to.have.been.called;

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

@@ -116,7 +116,7 @@ export class AuthImplCompat<T extends User> implements Auth, _FirebaseService {
     if (!this.currentUser && !user) {
       // No change, do nothing (was signed out and remained signed out).
       return;
-    } 
+    }
 
     // If the same user is to be synchronized.
     if (this.currentUser && user && this.currentUser.uid === user.uid) {

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

@@ -70,13 +70,9 @@ describe('src/core/auth/firebase_internal', () => {
     beforeEach(async () => {
       user = testUser(auth, 'uid', undefined, true);
       await auth.updateCurrentUser(user);
-      sinon.stub(user.stsTokenManager, 'getToken').returns(
-        Promise.resolve({
-          accessToken: 'access-token',
-          refreshToken: 'refresh-tken',
-          wasRefreshed: true
-        })
-      );
+      sinon
+        .stub(user.stsTokenManager, 'getToken')
+        .returns(Promise.resolve('access-token'));
       sinon
         .stub(user, '_startProactiveRefresh')
         .callsFake(() => (isProactiveRefresh = true));

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

@@ -51,7 +51,10 @@ export class PersistenceUserManager {
       config.apiKey,
       name
     );
-    this.persistence.addListener(this.fullUserKey, auth._onStorageEvent.bind(auth));
+    this.persistence.addListener(
+      this.fullUserKey,
+      auth._onStorageEvent.bind(auth)
+    );
   }
 
   setCurrentUser(user: User): Promise<void> {

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

@@ -57,7 +57,9 @@ export class StsTokenManager {
     }
 
     if (!this.refreshToken) {
-      assert(!this.accessToken, AuthErrorCode.TOKEN_EXPIRED, { appName: auth.name });
+      assert(!this.accessToken, AuthErrorCode.TOKEN_EXPIRED, {
+        appName: auth.name
+      });
       return null;
     }
 

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

@@ -28,10 +28,9 @@ import { MutableUserInfo, User, UserParameters } from '../../model/user';
 import { AuthErrorCode } from '../errors';
 import { PersistedBlob } from '../persistence';
 import { assert } from '../util/assert';
-import { utcTimestampToDateString } from '../util/time';
 import { getIdTokenResult } from './id_token_result';
 import { ProactiveRefresh } from './proactive_refresh';
-import { _reloadWithoutSaving, reload } from './reload';
+import { reload, _reloadWithoutSaving } from './reload';
 import { StsTokenManager } from './token_manager';
 import { UserMetadata } from './user_metadata';
 
@@ -84,8 +83,13 @@ export class UserImpl implements User {
   }
 
   async getIdToken(forceRefresh?: boolean): Promise<string> {
-    const accessToken = await this.stsTokenManager.getToken(this.auth, forceRefresh);
-    assert(accessToken, AuthErrorCode.INTERNAL_ERROR, { appName: this.auth.name });
+    const accessToken = await this.stsTokenManager.getToken(
+      this.auth,
+      forceRefresh
+    );
+    assert(accessToken, AuthErrorCode.INTERNAL_ERROR, {
+      appName: this.auth.name
+    });
 
     if (this.accessToken !== accessToken) {
       this.accessToken = accessToken;

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

@@ -17,15 +17,13 @@
 
 import * as externs from '@firebase/auth-types-exp';
 import { NextFn } from '@firebase/util';
-
 import { APIUserInfo } from '../api/account_management/account';
 import { FinalizeMfaResponse } from '../api/authentication/mfa';
 import { PersistedBlob } from '../core/persistence';
 import { StsTokenManager } from '../core/user/token_manager';
+import { UserMetadata } from '../core/user/user_metadata';
 import { Auth } from './auth';
 import { IdTokenResponse, TaggedWithTokenResponse } from './id_token';
-import { StsTokenManager } from '../core/user/token_manager';
-import { UserMetadata } from '../core/user/user_metadata';
 
 type MutableUserInfo = {
   -readonly [K in keyof externs.UserInfo]: externs.UserInfo[K];

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

@@ -22,7 +22,13 @@ import * as sinonChai from 'sinon-chai';
 import { testUser, testAuth } from '../../../test/helpers/mock_auth';
 import { _getInstance } from '../../core/util/instantiator';
 import { Persistence, PersistenceType } from '../../core/persistence';
-import { indexedDBLocalPersistence, POLLING_INTERVAL_MS, _putObject, _openDatabase, _clearDatabase } from './indexed_db';
+import {
+  indexedDBLocalPersistence,
+  POLLING_INTERVAL_MS,
+  _putObject,
+  _openDatabase,
+  _clearDatabase
+} from './indexed_db';
 
 use(sinonChai);
 
@@ -74,13 +80,13 @@ describe('core/persistence/indexed_db', () => {
     });
   });
 
-  describe("#addEventListener", () => {
+  describe('#addEventListener', () => {
     let clock: sinon.SinonFakeTimers;
     const key = 'my-key';
     const newValue = 'new-value';
     let callback: sinon.SinonSpy;
     let db: IDBDatabase;
-    
+
     before(async () => {
       db = await _openDatabase();
     });
@@ -99,7 +105,7 @@ describe('core/persistence/indexed_db', () => {
 
     it('should trigger a listener when the key changes', async () => {
       await _putObject(db, key, newValue);
-      
+
       clock.tick(POLLING_INTERVAL_MS + 1);
       clock.restore();
       // Wait a little for the poll operation to complete
@@ -119,7 +125,6 @@ describe('core/persistence/indexed_db', () => {
       expect(callback).not.to.have.been.called;
     });
 
-
     it('should not trigger if a write is pending', async () => {
       await _putObject(db, key, newValue);
       (persistence as any)['pendingWrites'] = 1;

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

@@ -61,7 +61,7 @@ function getObjectStore(db: IDBDatabase, isReadWrite: boolean): IDBObjectStore {
     .objectStore(DB_OBJECTSTORE_NAME);
 }
 
-export async function _clearDatabase(db: IDBDatabase): Promise<void>{
+export async function _clearDatabase(db: IDBDatabase): Promise<void> {
   const objectStore = getObjectStore(db, true);
   return new DBPromise<void>(objectStore.clear()).toPromise();
 }
@@ -247,10 +247,7 @@ class IndexedDBLocalPersistence implements Persistence {
   private _startPolling(): void {
     this._stopPolling();
 
-    this.pollTimer = setInterval(
-      async () => this._poll(),
-      POLLING_INTERVAL_MS
-    );
+    this.pollTimer = setInterval(async () => this._poll(), POLLING_INTERVAL_MS);
   }
 
   private _stopPolling(): void {

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

@@ -149,10 +149,7 @@ class BrowserLocalPersistence extends BrowserPersistenceClass
       // correct key, oldValue and newValue but localStorage.getItem(key) does
       // not yield the updated value until a few milliseconds. This ensures
       // this recovers from that situation.
-      setTimeout(
-        triggerListeners,
-        IE10_LOCAL_STORAGE_SYNC_DELAY
-      );
+      setTimeout(triggerListeners, IE10_LOCAL_STORAGE_SYNC_DELAY);
     } else {
       triggerListeners();
     }

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

@@ -436,7 +436,6 @@ describe('core/strategies/phone', () => {
 
     it('should link the phone number to the user', async () => {
       await updatePhoneNumber(user, credential);
-      console.log(JSON.stringify(signInMock.calls[0].request));
       expect(signInMock.calls[0].request).to.eql({
         idToken: 'access-token',
         sessionInfo: 'session-info',