Rebase conflicts

Author: avolkovi

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

@@ -16,18 +16,11 @@
  */
 
 import { FirebaseError, querystring } from '@firebase/util';
-
-import { AUTH_ERROR_FACTORY, AuthErrorCode } from '../core/errors';
+import { AuthErrorCode, AUTH_ERROR_FACTORY } from '../core/errors';
 import { Delay } from '../core/util/delay';
 import { Auth } from '../model/auth';
 import { IdTokenResponse } from '../model/id_token';
-import {
-  JsonError,
-  SERVER_ERROR_MAP,
-  ServerError,
-  ServerErrorMap
-} from './errors';
-import { Delay } from '../core/util/delay';
+import { JsonError, ServerError, ServerErrorMap, SERVER_ERROR_MAP } from './errors';
 
 export enum HttpMethod {
   POST = 'POST',

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

@@ -16,26 +16,20 @@
  */
 
 import { FirebaseApp } from '@firebase/app-types-exp';
+import * as externs from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
-
-import { FirebaseApp } from '@firebase/app-types-exp';
-import * as externs from '@firebase/auth-types-exp';
-import { FirebaseError } from '@firebase/util';
-
 import { testUser } from '../../../test/mock_auth';
 import { Auth } from '../../model/auth';
 import { User } from '../../model/user';
 import { Persistence } from '../persistence';
 import { browserLocalPersistence } from '../persistence/browser';
 import { inMemoryPersistence } from '../persistence/in_memory';
 import { PersistenceUserManager } from '../persistence/persistence_user_manager';
-import { _getClientVersion, ClientPlatform } from '../util/version';
-import {
-    DEFAULT_API_HOST, DEFAULT_API_SCHEME, DEFAULT_TOKEN_API_HOST, initializeAuth
-} from './auth_impl';
+import { ClientPlatform, _getClientVersion } from '../util/version';
+import { DEFAULT_API_HOST, DEFAULT_API_SCHEME, DEFAULT_TOKEN_API_HOST, initializeAuth } from './auth_impl';
 
 use(sinonChai);
 

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'
   },
   []