[AUTOMATED]: Prettier Code Styling

Author: sam-gc

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

@@ -30,7 +30,11 @@ import { browserLocalPersistence } from '../persistence/browser';
 import { inMemoryPersistence } from '../persistence/in_memory';
 import { PersistenceUserManager } from '../persistence/persistence_user_manager';
 import { ClientPlatform, getClientVersion } from '../util/version';
-import { DEFAULT_API_HOST, DEFAULT_API_SCHEME, initializeAuth } from './auth_impl';
+import {
+  DEFAULT_API_HOST,
+  DEFAULT_API_SCHEME,
+  initializeAuth
+} from './auth_impl';
 
 use(sinonChai);
 
@@ -119,7 +123,7 @@ describe('AuthImpl', () => {
     // // Helpers to convert auth state change results to promise
     // function onAuthStateChange(callback: NextFn<User|null>)
 
-    it('immediately calls authStateChange if initialization finished', (done) => {
+    it('immediately calls authStateChange if initialization finished', done => {
       const user = testUser('uid');
       auth.currentUser = user;
       auth._isInitialized = true;
@@ -128,8 +132,8 @@ describe('AuthImpl', () => {
         done();
       });
     });
-  
-    it('immediately calls idTokenChange if initialization finished', (done) => {
+
+    it('immediately calls idTokenChange if initialization finished', done => {
       const user = testUser('uid');
       auth.currentUser = user;
       auth._isInitialized = true;

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

@@ -18,7 +18,13 @@
 import { getApp } from '@firebase/app-exp';
 import { FirebaseApp } from '@firebase/app-types-exp';
 import {
-    CompleteFn, createSubscribe, ErrorFn, NextFn, Observer, Subscribe, Unsubscribe
+  CompleteFn,
+  createSubscribe,
+  ErrorFn,
+  NextFn,
+  Observer,
+  Subscribe,
+  Unsubscribe
 } from '@firebase/util';
 
 import { Auth, Config, Dependencies, NextOrObserver } from '../../model/auth';
@@ -43,10 +49,10 @@ class AuthImpl implements Auth {
   private authStateSubscription = new Subscription<User>(this);
   private idTokenSubscription = new Subscription<User>(this);
   _isInitialized = false;
-  
+
   // Tracks the last notified UID for state change listeners to prevent
   // repeated calls to the callbacks
-  private lastNotifiedUid: string|undefined = undefined;
+  private lastNotifiedUid: string | undefined = undefined;
 
   constructor(
     public readonly name: string,
@@ -87,16 +93,30 @@ class AuthImpl implements Auth {
     });
   }
 
-  onAuthStateChanged(nextOrObserver: NextOrObserver<User>,
+  onAuthStateChanged(
+    nextOrObserver: NextOrObserver<User>,
     error?: ErrorFn,
-    completed?: CompleteFn): Unsubscribe {
-    return this.registerStateListener(this.authStateSubscription, nextOrObserver, error, completed);
+    completed?: CompleteFn
+  ): Unsubscribe {
+    return this.registerStateListener(
+      this.authStateSubscription,
+      nextOrObserver,
+      error,
+      completed
+    );
   }
 
-  onIdTokenChange(nextOrObserver: NextOrObserver<User>,
+  onIdTokenChange(
+    nextOrObserver: NextOrObserver<User>,
     error?: ErrorFn,
-    completed?: CompleteFn): Unsubscribe {
-    return this.registerStateListener(this.idTokenSubscription, nextOrObserver, error, completed);
+    completed?: CompleteFn
+  ): Unsubscribe {
+    return this.registerStateListener(
+      this.idTokenSubscription,
+      nextOrObserver,
+      error,
+      completed
+    );
   }
 
   _notifyStateListeners(): void {
@@ -112,16 +132,22 @@ class AuthImpl implements Auth {
     }
   }
 
-  private registerStateListener(subscription: Subscription<User>, nextOrObserver: NextOrObserver<User>,
+  private registerStateListener(
+    subscription: Subscription<User>,
+    nextOrObserver: NextOrObserver<User>,
     error?: ErrorFn,
-    completed?: CompleteFn): Unsubscribe {
+    completed?: CompleteFn
+  ): Unsubscribe {
     if (this._isInitialized) {
-      const cb = typeof nextOrObserver === 'function' ? nextOrObserver : nextOrObserver.next;
-      // The callback needs to be called asynchronously per the spec. 
+      const cb =
+        typeof nextOrObserver === 'function'
+          ? nextOrObserver
+          : nextOrObserver.next;
+      // The callback needs to be called asynchronously per the spec.
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       Promise.resolve().then(() => cb(this.currentUser));
     }
-    
+
     if (typeof nextOrObserver === 'function') {
       return subscription.addObserver(nextOrObserver, error, completed);
     } else {
@@ -180,15 +206,15 @@ export function initializeAuth(
 
 /** Helper class to wrap subscriber logic */
 class Subscription<T> {
-  private observer: Observer<T|null> | null = null;
-  readonly addObserver: Subscribe<T|null> = createSubscribe(
-    observer => this.observer = observer,
+  private observer: Observer<T | null> | null = null;
+  readonly addObserver: Subscribe<T | null> = createSubscribe(
+    observer => (this.observer = observer)
   );
 
   constructor(readonly auth: Auth) {}
 
-  get next(): NextFn<T|null> {
+  get next(): NextFn<T | null> {
     const observer = assert(this.observer, this.auth.name);
     return observer.next.bind(observer);
   }
-}
+}

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

@@ -24,7 +24,10 @@ import { mockEndpoint } from '../../../test/api/helper';
 import { testUser } from '../../../test/mock_auth';
 import * as fetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
-import { APIUserInfo, ProviderUserInfo } from '../../api/account_management/account';
+import {
+  APIUserInfo,
+  ProviderUserInfo
+} from '../../api/account_management/account';
 import { UserInfo } from '../../model/user';
 import { ProviderId } from '../providers';
 import { _reloadWithoutSaving, reload } from './reload';
@@ -38,7 +41,7 @@ const BASIC_USER_INFO: UserInfo = {
   email: 'email',
   displayName: 'displayName',
   phoneNumber: 'phoneNumber',
-  photoURL: 'photoURL',
+  photoURL: 'photoURL'
 };
 
 const BASIC_PROVIDER_USER_INFO: ProviderUserInfo = {
@@ -47,7 +50,7 @@ const BASIC_PROVIDER_USER_INFO: ProviderUserInfo = {
   email: 'email',
   displayName: 'displayName',
   phoneNumber: 'phoneNumber',
-  photoUrl: 'photoURL',
+  photoUrl: 'photoURL'
 };
 
 describe('reload()', () => {
@@ -64,11 +67,11 @@ describe('reload()', () => {
       phoneNumber: 'phoneNumber',
       tenantId: 'tenantId',
       createdAt: 123,
-      lastLoginAt: 456,
+      lastLoginAt: 456
     };
 
     mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
-      users: [serverUser],
+      users: [serverUser]
     });
 
     const user = testUser('abc', '', true);
@@ -82,22 +85,26 @@ describe('reload()', () => {
     expect(user.tenantId).to.eq('tenantId');
     expect(user.metadata).to.eql({
       creationTime: '123',
-      lastSignInTime: '456',
+      lastSignInTime: '456'
     });
   });
 
   it('adds missing provider data', async () => {
     const user = testUser('abc', '', true);
-    user.providerData = [{...BASIC_USER_INFO}];
+    user.providerData = [{ ...BASIC_USER_INFO }];
     mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
-      users: [{
-        providerUserInfo: [{...BASIC_PROVIDER_USER_INFO, providerId: ProviderId.FACEBOOK}],
-      }],
+      users: [
+        {
+          providerUserInfo: [
+            { ...BASIC_PROVIDER_USER_INFO, providerId: ProviderId.FACEBOOK }
+          ]
+        }
+      ]
     });
     await _reloadWithoutSaving(user);
     expect(user.providerData).to.eql([
-      {...BASIC_USER_INFO},
-      {...BASIC_USER_INFO, providerId: ProviderId.FACEBOOK},
+      { ...BASIC_USER_INFO },
+      { ...BASIC_USER_INFO, providerId: ProviderId.FACEBOOK }
     ]);
   });
 
@@ -107,32 +114,40 @@ describe('reload()', () => {
       {
         ...BASIC_USER_INFO,
         providerId: ProviderId.GITHUB,
-        uid: 'i-will-be-overwritten',
+        uid: 'i-will-be-overwritten'
       },
       {
         ...BASIC_USER_INFO
       }
     ];
     mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
-      users: [{
-        providerUserInfo: [{...BASIC_PROVIDER_USER_INFO, providerId: ProviderId.GITHUB, rawId: 'new-uid'}],
-      }],
+      users: [
+        {
+          providerUserInfo: [
+            {
+              ...BASIC_PROVIDER_USER_INFO,
+              providerId: ProviderId.GITHUB,
+              rawId: 'new-uid'
+            }
+          ]
+        }
+      ]
     });
     await _reloadWithoutSaving(user);
     console.warn(user.providerData);
     expect(user.providerData).to.eql([
-      {...BASIC_USER_INFO},
+      { ...BASIC_USER_INFO },
       {
         ...BASIC_USER_INFO,
         providerId: ProviderId.GITHUB,
-        uid: 'new-uid',
-      },
+        uid: 'new-uid'
+      }
     ]);
   });
 
   it('reload calls auth.updateCurrentUser after completion', async () => {
     mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
-      users: [{}],
+      users: [{}]
     });
 
     const user = testUser('user', '', true);

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

@@ -15,14 +15,15 @@
  * limitations under the License.
  */
 
-import { getAccountInfo, ProviderUserInfo } from '../../api/account_management/account';
+import {
+  getAccountInfo,
+  ProviderUserInfo
+} from '../../api/account_management/account';
 import { User, UserInfo } from '../../model/user';
 import { ProviderId } from '../providers';
 import { assert } from '../util/assert';
 
-export async function _reloadWithoutSaving(
-  user: User
-): Promise<void> {
+export async function _reloadWithoutSaving(user: User): Promise<void> {
   const auth = user.auth;
   const idToken = await user.getIdToken();
   const response = await getAccountInfo(auth, { idToken });

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

@@ -15,15 +15,21 @@
  * limitations under the License.
  */
 
-import { CompleteFn, ErrorFn, NextFn, Observer, Unsubscribe } from '@firebase/util';
+import {
+  CompleteFn,
+  ErrorFn,
+  NextFn,
+  Observer,
+  Unsubscribe
+} from '@firebase/util';
 
 import { Persistence } from '../core/persistence';
 import { User } from './user';
 
 export type AppName = string;
 export type ApiKey = string;
 export type AuthDomain = string;
-export type NextOrObserver<T> = NextFn<T|null> | Observer<T|null>;
+export type NextOrObserver<T> = NextFn<T | null> | Observer<T | null>;
 
 export interface Config {
   apiKey: ApiKey;
@@ -42,8 +48,16 @@ export interface Auth {
   setPersistence(persistence: Persistence): Promise<void>;
   updateCurrentUser(user: User | null): Promise<void>;
   signOut(): Promise<void>;
-  onAuthStateChanged(nextOrObserver: NextOrObserver<User>, error?: ErrorFn, completed?: CompleteFn): Unsubscribe;
-  onIdTokenChange(nextOrObserver: NextOrObserver<User>, error?: ErrorFn, completed?: CompleteFn): Unsubscribe;
+  onAuthStateChanged(
+    nextOrObserver: NextOrObserver<User>,
+    error?: ErrorFn,
+    completed?: CompleteFn
+  ): Unsubscribe;
+  onIdTokenChange(
+    nextOrObserver: NextOrObserver<User>,
+    error?: ErrorFn,
+    completed?: CompleteFn
+  ): Unsubscribe;
   _notifyStateListeners(): void;
 }
 

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

@@ -37,19 +37,27 @@ export const mockAuth: Auth = {
   async setPersistence() {},
   async updateCurrentUser() {},
   async signOut() {},
-  onAuthStateChanged() {return () => {};},
-  onIdTokenChange() { return () => {};},
-  _notifyStateListeners() {},
+  onAuthStateChanged() {
+    return () => {};
+  },
+  onIdTokenChange() {
+    return () => {};
+  },
+  _notifyStateListeners() {}
 };
 
-export function testUser(uid: string, email?: string, fakeTokens = false): User {
+export function testUser(
+  uid: string,
+  email?: string,
+  fakeTokens = false
+): User {
   // Create a token manager that's valid off the bat to avoid refresh calls
   const stsTokenManager = new StsTokenManager();
   if (fakeTokens) {
     Object.assign<StsTokenManager, Partial<StsTokenManager>>(stsTokenManager, {
       expirationTime: Date.now() + 100_000,
       accessToken: 'access-token',
-      refreshToken: 'refresh-token',
+      refreshToken: 'refresh-token'
     });
   }