Rebase conflicts

packages-exp/auth-exp/package.json

@@ -37,6 +37,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@rollup/plugin-strip": "^1.3.2",
+    "@firebase/app-exp": "0.x",
     "rollup": "1.32.1",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",

packages-exp/auth-exp/src/api/index.ts

@@ -27,7 +27,6 @@ import {
   ServerError,
   ServerErrorMap
 } from './errors';
-import { Delay } from '../core/util/delay';
 
 export enum HttpMethod {
   POST = 'POST',

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

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import { FirebaseApp } from '@firebase/app-types-exp';
-import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';

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

@@ -38,7 +38,7 @@ export const DEFAULT_TOKEN_API_HOST = 'securetoken.googleapis.com';
 export const DEFAULT_API_HOST = 'identitytoolkit.googleapis.com';
 export const DEFAULT_API_SCHEME = 'https';
 
-export class AuthImpl implements Auth {
+class AuthImpl implements Auth {
   currentUser: User | null = null;
   private operations = Promise.resolve();
   private persistenceManager?: PersistenceUserManager;

packages-exp/auth-exp/src/core/user/reload.test.ts

@@ -25,7 +25,7 @@ import { FirebaseError } from '@firebase/util';
 
 import { mockEndpoint } from '../../../test/api/helper';
 import { testUser } from '../../../test/mock_auth';
-import * as mockFetch from '../../../test/mock_fetch';
+import * as fetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import {
   APIUserInfo,
@@ -56,8 +56,8 @@ const BASIC_PROVIDER_USER_INFO: ProviderUserInfo = {
 };
 
 describe('core/user/reload', () => {
-  beforeEach(mockFetch.setUp);
-  afterEach(mockFetch.tearDown);
+  beforeEach(fetch.setUp);
+  afterEach(fetch.tearDown);
 
   it('sets all the new properties', async () => {
     const serverUser: APIUserInfo = {

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

@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 
+import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
-
-import { FirebaseError } from '@firebase/util';
-
 import { mockEndpoint } from '../../../test/api/helper';
 import { makeJWT } from '../../../test/jwt';
 import { mockAuth } from '../../../test/mock_auth';
@@ -30,6 +28,7 @@ import { Endpoint } from '../../api';
 import { IdTokenResponse } from '../../model/id_token';
 import { StsTokenManager } from './token_manager';
 import { UserImpl } from './user_impl';
+import { APIUserInfo } from '../../api/account_management/account';
 
 use(sinonChai);
 use(chaiAsPromised);
@@ -209,12 +208,12 @@ describe('core/user/user_impl', () => {
     };
 
     beforeEach(() => {
-      mockFetch.setUp();
+      fetch.setUp();
       mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
         users: [serverUser]
       });
     });
-    afterEach(mockFetch.tearDown);
+    afterEach(fetch.tearDown);
 
     it('should initialize a user', async () => {
       const user = await UserImpl._fromIdTokenResponse(

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

@@ -16,15 +16,15 @@
  */
 
 import { IdTokenResult } from '@firebase/auth-types-exp';
-
 import { deleteAccount } from '../../api/account_management/account';
 import { Auth } from '../../model/auth';
+import { IdTokenResponse } from '../../model/id_token';
 import { User } from '../../model/user';
 import { PersistedBlob } from '../persistence';
 import { ProviderId } from '../providers';
 import { assert } from '../util/assert';
 import { getIdTokenResult } from './id_token_result';
-import { reload } from './reload';
+import { reload, _reloadWithoutSaving } from './reload';
 import { StsTokenManager } from './token_manager';
 
 export interface UserParameters {

packages-exp/auth-exp/test/mock_auth.ts

@@ -15,14 +15,15 @@
  * limitations under the License.
  */
 
-import { StsTokenManager } from '../src/core/user/token_manager';
 import { AuthImpl } from '../src/core/auth/auth_impl';
+import { StsTokenManager } from '../src/core/user/token_manager';
 import { UserImpl } from '../src/core/user/user_impl';
 import { Auth } from '../src/model/auth';
 import { User } from '../src/model/user';
 
 export const TEST_HOST = 'localhost';
 export const TEST_TOKEN_HOST = 'localhost/token';
+export const TEST_AUTH_DOMAIN = 'localhost';
 export const TEST_SCHEME = 'mock';
 export const TEST_KEY = 'test-api-key';
 
@@ -33,6 +34,7 @@ export const mockAuth: Auth = new AuthImpl(
     authDomain: TEST_AUTH_DOMAIN,
     apiHost: TEST_HOST,
     apiScheme: TEST_SCHEME,
+    tokenApiHost: TEST_TOKEN_HOST,
     sdkClientVersion: 'testSDK/0.0.0'
   },
   []