Formatting

Author: sam-gc

packages-exp/auth-exp/src/api/authentication/token.ts

@@ -19,7 +19,11 @@
 
 import { querystring } from '@firebase/util';
 
-import { _getFinalTarget, _performFetchWithErrorHandling, HttpMethod } from '../';
+import {
+  _getFinalTarget,
+  _performFetchWithErrorHandling,
+  HttpMethod
+} from '../';
 import { FetchProvider } from '../../core/util/fetch_provider';
 import { AuthCore } from '../../model/auth';
 
@@ -51,7 +55,10 @@ export async function requestStsToken(
       'refresh_token': refreshToken
     }).slice(1);
     const { apiScheme, tokenApiHost, apiKey, sdkClientVersion } = auth.config;
-    const url = _getFinalTarget(auth, `${apiScheme}://${tokenApiHost}/${_ENDPOINT}`);
+    const url = _getFinalTarget(
+      auth,
+      `${apiScheme}://${tokenApiHost}/${_ENDPOINT}`
+    );
 
     return FetchProvider.fetch()(`${url}?key=${apiKey}`, {
       method: HttpMethod.POST,

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

@@ -17,23 +17,11 @@
 
 import { FirebaseError, querystring } from '@firebase/util';
 
-<<<<<<< HEAD
-import {
-  AUTH_ERROR_FACTORY,
-  AuthErrorCode,
-  NamedErrorParams
-} from '../core/errors';
-import { fail } from '../core/util/assert';
-import { Delay } from '../core/util/delay';
-import { FetchProvider } from '../core/util/fetch_provider';
-import { AuthCore } from '../model/auth';
-=======
 import { AUTH_ERROR_FACTORY, AuthErrorCode, NamedErrorParams } from '../core/errors';
 import { fail } from '../core/util/assert';
 import { Delay } from '../core/util/delay';
 import { FetchProvider } from '../core/util/fetch_provider';
 import { Auth, AuthCore } from '../model/auth';
->>>>>>> be103af54 (Add hooks into emulator for auth-next)
 import { IdTokenResponse, TaggedWithTokenResponse } from '../model/id_token';
 import { IdTokenMfaResponse } from './authentication/mfa';
 import { SERVER_ERROR_MAP, ServerError, ServerErrorMap } from './errors';
@@ -107,7 +95,10 @@ export async function _performApiRequest<T, V>(
     }
 
     return FetchProvider.fetch()(
-      _getFinalTarget(auth, `${auth.config.apiScheme}://${auth.config.apiHost}${path}?${query}`),
+      _getFinalTarget(
+        auth,
+        `${auth.config.apiScheme}://${auth.config.apiHost}${path}?${query}`
+      ),
       {
         method,
         headers,
@@ -193,7 +184,7 @@ export async function _performSignInRequest<T, V extends IdTokenResponse>(
 }
 
 export function _getFinalTarget(auth: AuthCore, url: string): string {
-  const {emulator} = auth.config;
+  const { emulator } = auth.config;
   if (!emulator) {
     return url;
   }

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

@@ -18,7 +18,13 @@
 import { _FirebaseService, FirebaseApp } from '@firebase/app-types-exp';
 import * as externs from '@firebase/auth-types-exp';
 import {
-    CompleteFn, createSubscribe, ErrorFn, NextFn, Observer, Subscribe, Unsubscribe
+  CompleteFn,
+  createSubscribe,
+  ErrorFn,
+  NextFn,
+  Observer,
+  Subscribe,
+  Unsubscribe
 } from '@firebase/util';
 
 import { Auth, AuthCore } from '../../model/auth';
@@ -27,7 +33,8 @@ import { User, UserParameters } from '../../model/user';
 import { AuthErrorCode } from '../errors';
 import { Persistence } from '../persistence';
 import {
-    _REDIRECT_USER_KEY_NAME, PersistenceUserManager
+  _REDIRECT_USER_KEY_NAME,
+  PersistenceUserManager
 } from '../persistence/persistence_user_manager';
 import { _reloadWithoutSaving } from '../user/reload';
 import { UserImpl } from '../user/user_impl';
@@ -56,7 +63,7 @@ export class AuthImplCompat<T extends User> implements Auth, _FirebaseService {
   private idTokenSubscription = new Subscription<T>(this);
   private redirectUser: T | null = null;
   private isProactiveRefreshEnabled = false;
-  
+
   // Any network calls will set this to true and prevent subsequent emulator
   // initialization
   _canInitEmulator = true;

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

@@ -38,7 +38,13 @@ describe('core/auth/initialize', () => {
     user = testUser(_castAuth(auth), 'uid', 'email', true);
     fetch.setUp();
     normalEndpoint = mockEndpoint(Endpoint.DELETE_ACCOUNT, {});
-    emulatorEndpoint = fetch.mock(`http://localhost:2020/${endpointUrl(Endpoint.DELETE_ACCOUNT).replace(/^.*:\/\//, '')}`, {});
+    emulatorEndpoint = fetch.mock(
+      `http://localhost:2020/${endpointUrl(Endpoint.DELETE_ACCOUNT).replace(
+        /^.*:\/\//,
+        ''
+      )}`,
+      {}
+    );
   });
 
   afterEach(() => {
@@ -48,7 +54,10 @@ describe('core/auth/initialize', () => {
   context('useEmulator', () => {
     it('fails if a network request has already been made', async () => {
       await user.delete();
-      expect(() => useEmulator(auth, 'localhost', 2020)).to.throw(FirebaseError, 'auth/emulator-config-failed');
+      expect(() => useEmulator(auth, 'localhost', 2020)).to.throw(
+        FirebaseError,
+        'auth/emulator-config-failed'
+      );
     });
 
     it('updates the endpoint appropriately', async () => {
@@ -58,4 +67,4 @@ describe('core/auth/initialize', () => {
       expect(emulatorEndpoint.calls.length).to.eq(1);
     });
   });
-});
+});

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

@@ -39,7 +39,7 @@ export function initializeAuth(
 export function useEmulator(
   authExtern: externs.Auth,
   hostname: string,
-  port: number,
+  port: number
 ): void {
   const auth = _castAuth(authExtern);
   if (!auth._canInitEmulator) {

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

@@ -117,7 +117,7 @@ export const enum AuthErrorCode {
   USER_MISMATCH = 'user-mismatch',
   USER_SIGNED_OUT = 'user-signed-out',
   WEAK_PASSWORD = 'weak-password',
-  WEB_STORAGE_UNSUPPORTED = 'web-storage-unsupported',
+  WEB_STORAGE_UNSUPPORTED = 'web-storage-unsupported'
 }
 
 const ERRORS: ErrorMap<AuthErrorCode> = {

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

@@ -29,7 +29,7 @@ interface ConfigInternal extends externs.Config {
   emulator?: {
     hostname: string;
     port: number;
-  }
+  };
 }
 
 /**

packages-exp/auth-exp/test/helpers/api/helper.ts

@@ -19,7 +19,7 @@ import { Endpoint } from '../../../src/api';
 import { TEST_HOST, TEST_KEY, TEST_SCHEME } from '../mock_auth';
 import { mock, Route } from '../mock_fetch';
 
-export function endpointUrl(endpoint: Endpoint):string {
+export function endpointUrl(endpoint: Endpoint): string {
   return `${TEST_SCHEME}://${TEST_HOST}${endpoint}?key=${TEST_KEY}`;
 }
 
@@ -28,9 +28,5 @@ export function mockEndpoint(
   response: object,
   status = 200
 ): Route {
-  return mock(
-    endpointUrl(endpoint),
-    response,
-    status
-  );
+  return mock(endpointUrl(endpoint), response, status);
 }