[AUTOMATED]: Prettier Code Styling

Author: sam-gc

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

@@ -36,7 +36,7 @@ describe('requestStsToken', () => {
     const mock = fetch.mock(endpoint, {
       'access_token': 'new-access-token',
       'expires_in': '3600',
-      'refresh_token': 'new-refresh-token',
+      'refresh_token': 'new-refresh-token'
     });
 
     const response = await requestStsToken(mockAuth, 'old-refresh-token');
@@ -46,7 +46,7 @@ describe('requestStsToken', () => {
     const request = querystringDecode(`?${mock.calls[0].request}`);
     expect(request).to.eql({
       'grant_type': 'refresh_token',
-      'refresh_token': 'old-refresh-token',
+      'refresh_token': 'old-refresh-token'
     });
     expect(mock.calls[0].method).to.eq('POST');
     expect(mock.calls[0].headers).to.eql({
@@ -74,12 +74,12 @@ describe('requestStsToken', () => {
 
     await expect(requestStsToken(mockAuth, 'old-token')).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The user\'s credential is no longer valid. The user must sign in again. (auth/user-token-expired)'
+      "Firebase: The user's credential is no longer valid. The user must sign in again. (auth/user-token-expired)"
     );
     const request = querystringDecode(`?${mock.calls[0].request}`);
     expect(request).to.eql({
       'grant_type': 'refresh_token',
-      'refresh_token': 'old-token',
+      'refresh_token': 'old-token'
     });
   });
 });

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

@@ -26,7 +26,7 @@ const GRANT_TYPE = 'refresh_token';
 enum ServerField {
   ACCESS_TOKEN = 'access_token',
   EXPIRES_IN = 'expires_in',
-  REFRESH_TOKEN = 'refresh_token',
+  REFRESH_TOKEN = 'refresh_token'
 }
 
 export interface RequestStsTokenResponse {
@@ -35,27 +35,32 @@ export interface RequestStsTokenResponse {
   refreshToken?: string;
 }
 
-export async function requestStsToken(auth: Auth, refreshToken: string): Promise<RequestStsTokenResponse> {
-  const response = await performFetchWithErrorHandling<{[key: string]: string}>(auth, {}, () => {
+export async function requestStsToken(
+  auth: Auth,
+  refreshToken: string
+): Promise<RequestStsTokenResponse> {
+  const response = await performFetchWithErrorHandling<{
+    [key: string]: string;
+  }>(auth, {}, () => {
     const body = querystring({
       'grant_type': GRANT_TYPE,
-      'refresh_token': refreshToken,
+      'refresh_token': refreshToken
     }).slice(1);
 
     return fetch(`${_ENDPOINT}?key=${auth.config.apiKey}`, {
       method: 'POST',
       headers: {
         'X-Client-Version': auth.config.sdkClientVersion,
-        'Content-Type': 'application/x-www-form-urlencoded',
+        'Content-Type': 'application/x-www-form-urlencoded'
       },
-      body,
+      body
     });
   });
 
   // The response comes back in snake_case. Convert to camel:
   return {
     accessToken: response[ServerField.ACCESS_TOKEN],
     expiresIn: response[ServerField.EXPIRES_IN],
-    refreshToken: response[ServerField.REFRESH_TOKEN],
+    refreshToken: response[ServerField.REFRESH_TOKEN]
   };
-}
+}

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

@@ -57,7 +57,7 @@ export async function _performApiRequest<T, V>(
   method: HttpMethod,
   path: Endpoint,
   request?: T,
-  customErrorMap: Partial<ServerErrorMap<ServerError>> = {},
+  customErrorMap: Partial<ServerErrorMap<ServerError>> = {}
 ): Promise<V> {
   return performFetchWithErrorHandling(auth, customErrorMap, () => {
     let body = {};
@@ -77,31 +77,31 @@ export async function _performApiRequest<T, V>(
       ...params
     }).slice(1);
 
-   return fetch(
-        `${auth.config.apiScheme}://${auth.config.apiHost}${path}?${query}`,
-        {
-          method,
-          headers: {
-            'Content-Type': 'application/json',
-            'X-Client-Version': auth.config.sdkClientVersion
-          },
-          referrerPolicy: 'no-referrer',
-          ...body
-        }
-      );
-      });
+    return fetch(
+      `${auth.config.apiScheme}://${auth.config.apiHost}${path}?${query}`,
+      {
+        method,
+        headers: {
+          'Content-Type': 'application/json',
+          'X-Client-Version': auth.config.sdkClientVersion
+        },
+        referrerPolicy: 'no-referrer',
+        ...body
+      }
+    );
+  });
 }
 
 export async function performFetchWithErrorHandling<V>(
   auth: Auth,
   customErrorMap: Partial<ServerErrorMap<ServerError>>,
-  fetchFn: () => Promise<Response>,
+  fetchFn: () => Promise<Response>
 ): Promise<V> {
   const errorMap = { ...SERVER_ERROR_MAP, ...customErrorMap };
   try {
     const response: Response = await Promise.race<Promise<Response>>([
       fetchFn(),
-      makeNetworkTimeout(auth.name),
+      makeNetworkTimeout(auth.name)
     ]);
     if (response.ok) {
       return response.json();
@@ -155,12 +155,11 @@ export async function _performSignInRequest<T, V extends IdTokenResponse>(
 
 function makeNetworkTimeout<T>(appName: string): Promise<T> {
   return new Promise((_, reject) =>
-  setTimeout(() => {
-    return reject(
-      AUTH_ERROR_FACTORY.create(AuthErrorCode.TIMEOUT, {
-        appName,
-      })
-    );
-  }, DEFAULT_API_TIMEOUT_MS.get())
-)
+    setTimeout(() => {
+      return reject(
+        AUTH_ERROR_FACTORY.create(AuthErrorCode.TIMEOUT, {
+          appName,
+        })
+      );
+    }, DEFAULT_API_TIMEOUT_MS.get()));
 }

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

@@ -82,7 +82,7 @@ describe('core/user/token_manager', () => {
         mock = fetch.mock(endpoint, {
           'access_token': 'new-access-token',
           'refresh_token': 'new-refresh-token',
-          'expires_in': '3600',
+          'expires_in': '3600'
         });
       });
 
@@ -102,7 +102,7 @@ describe('core/user/token_manager', () => {
         expect(tokens).to.eql({
           accessToken: 'new-access-token',
           refreshToken: 'new-refresh-token',
-          wasRefreshed: true,
+          wasRefreshed: true
         });
       });
 
@@ -122,7 +122,7 @@ describe('core/user/token_manager', () => {
         expect(tokens).to.eql({
           accessToken: 'new-access-token',
           refreshToken: 'new-refresh-token',
-          wasRefreshed: true,
+          wasRefreshed: true
         });
       });
     });
@@ -139,7 +139,7 @@ describe('core/user/token_manager', () => {
 
       await expect(stsTokenManager.getToken(mockAuth)).to.be.rejectedWith(
         FirebaseError,
-        'Firebase: The user\'s credential is no longer valid. The user must sign in again. (auth/user-token-expired)'
+        "Firebase: The user's credential is no longer valid. The user must sign in again. (auth/user-token-expired)"
       );
     });
 
@@ -154,7 +154,7 @@ describe('core/user/token_manager', () => {
       expect(tokens).to.eql({
         accessToken: 'token',
         refreshToken: 'refresh',
-        wasRefreshed: false,
+        wasRefreshed: false
       });
     });
   });

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

@@ -54,18 +54,18 @@ export class StsTokenManager {
     this.updateTokensAndExpiration(idToken, refreshToken, expiresInSec);
   }
 
-  async getToken(auth: Auth, forceRefresh = false): Promise<Tokens|null> {
+  async getToken(auth: Auth, forceRefresh = false): Promise<Tokens | null> {
     if (!forceRefresh && this.accessToken && !this.isExpired) {
       return {
         accessToken: this.accessToken,
         refreshToken: this.refreshToken,
-        wasRefreshed: false,
+        wasRefreshed: false
       };
     }
 
     if (this.accessToken && !this.refreshToken) {
       throw AUTH_ERROR_FACTORY.create(AuthErrorCode.TOKEN_EXPIRED, {
-        appName: auth.name,
+        appName: auth.name
       });
     }
 
@@ -77,7 +77,7 @@ export class StsTokenManager {
     return {
       accessToken: this.accessToken!,
       refreshToken: this.refreshToken,
-      wasRefreshed: true,
+      wasRefreshed: true
     };
   }
 
@@ -90,14 +90,23 @@ export class StsTokenManager {
   }
 
   private async refresh(auth: Auth, oldToken: string): Promise<void> {
-    const {accessToken, refreshToken, expiresIn} = await requestStsToken(auth, oldToken);
+    const { accessToken, refreshToken, expiresIn } = await requestStsToken(
+      auth,
+      oldToken
+    );
     this.updateTokensAndExpiration(accessToken, refreshToken, expiresIn);
   }
 
-  private updateTokensAndExpiration(accessToken: string|undefined, refreshToken: string|undefined, expiresInSec: string|undefined): void {
+  private updateTokensAndExpiration(
+    accessToken: string | undefined,
+    refreshToken: string | undefined,
+    expiresInSec: string | undefined
+  ): void {
     this.refreshToken = refreshToken || null;
     this.accessToken = accessToken || null;
-    this.expirationTime = expiresInSec ? Date.now() + Number(expiresInSec) * 1000 : null;
+    this.expirationTime = expiresInSec
+      ? Date.now() + Number(expiresInSec) * 1000
+      : null;
   }
 
   static fromPlainObject(

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

@@ -79,7 +79,7 @@ export class UserImpl implements User {
     assert(tokens, this.auth.name);
 
     // TODO: remove ! after #2934 is merged --
-    const { refreshToken, accessToken, /* wasRefreshed */ } = tokens!;
+    const { refreshToken, accessToken /* wasRefreshed */ } = tokens!;
     this.refreshToken = refreshToken || '';
 
     // TODO: Uncomment after #2961 is merged

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

@@ -18,7 +18,7 @@
 import { SinonStub, stub } from 'sinon';
 
 export interface Call {
-  request?: object|string;
+  request?: object | string;
   method?: string;
   headers?: HeadersInit;
 }
@@ -45,8 +45,11 @@ const fakeFetch: typeof fetch = (input: RequestInfo, request?: RequestInit) => {
   // Bang-assertion is fine since we check for routes.has() above
   const { response, status, calls } = routes.get(input)!;
 
-  const requestBody = request?.body && (request?.headers as any)?.['Content-Type'] === 'application/json' ? 
-    JSON.parse(request.body as string) : request?.body;
+  const requestBody =
+    request?.body &&
+    (request?.headers as any)?.['Content-Type'] === 'application/json'
+      ? JSON.parse(request.body as string)
+      : request?.body;
 
   calls.push({
     request: requestBody,