Formatting

Author: sam-gc

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

@@ -18,7 +18,8 @@
 import * as externs from '@firebase/auth-types-exp';
 
 import {
-    updateEmailPassword as apiUpdateEmailPassword, UpdateEmailPasswordRequest
+  updateEmailPassword as apiUpdateEmailPassword,
+  UpdateEmailPasswordRequest
 } from '../../api/account_management/email_and_password';
 import { updateProfile as apiUpdateProfile } from '../../api/account_management/profile';
 import { User } from '../../model/user';
@@ -41,7 +42,10 @@ export async function updateProfile(
   const user = externUser as User;
   const idToken = await user.getIdToken();
   const profileRequest = { idToken, displayName, photoUrl };
-  const response = await _logoutIfInvalidated(user, apiUpdateProfile(user.auth, profileRequest));
+  const response = await _logoutIfInvalidated(
+    user,
+    apiUpdateProfile(user.auth, profileRequest)
+  );
 
   user.displayName = response.displayName || null;
   user.photoURL = response.photoUrl || null;
@@ -91,6 +95,9 @@ async function updateEmailOrPassword(
     request.password = password;
   }
 
-  const response = await _logoutIfInvalidated(user, apiUpdateEmailPassword(auth, request));
+  const response = await _logoutIfInvalidated(
+    user,
+    apiUpdateEmailPassword(auth, request)
+  );
   await user._updateTokensIfNecessary(response, /* reload */ true);
 }

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

@@ -1,3 +1,20 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
@@ -22,12 +39,14 @@ describe('src/core/user/invalidation', () => {
   });
 
   function makeError(code: AuthErrorCode): FirebaseError {
-    return AUTH_ERROR_FACTORY.create(code, {appName: auth.name});
+    return AUTH_ERROR_FACTORY.create(code, { appName: auth.name });
   }
 
   it('leaves non-invalidation errors alone', async () => {
     const error = makeError(AuthErrorCode.TOO_MANY_ATTEMPTS_TRY_LATER);
-    await expect(_logoutIfInvalidated(user, Promise.reject(error))).to.be.rejectedWith(error);
+    await expect(
+      _logoutIfInvalidated(user, Promise.reject(error))
+    ).to.be.rejectedWith(error);
     expect(auth.currentUser).to.eq(user);
   });
 
@@ -38,13 +57,17 @@ describe('src/core/user/invalidation', () => {
 
   it('logs out the user if the error is user_disabled', async () => {
     const error = makeError(AuthErrorCode.USER_DISABLED);
-    await expect(_logoutIfInvalidated(user, Promise.reject(error))).to.be.rejectedWith(error);
+    await expect(
+      _logoutIfInvalidated(user, Promise.reject(error))
+    ).to.be.rejectedWith(error);
     expect(auth.currentUser).to.be.null;
   });
 
   it('logs out the user if the error is token_expired', async () => {
     const error = makeError(AuthErrorCode.TOKEN_EXPIRED);
-    await expect(_logoutIfInvalidated(user, Promise.reject(error))).to.be.rejectedWith(error);
+    await expect(
+      _logoutIfInvalidated(user, Promise.reject(error))
+    ).to.be.rejectedWith(error);
     expect(auth.currentUser).to.be.null;
   });
 
@@ -58,8 +81,10 @@ describe('src/core/user/invalidation', () => {
 
     it('does not log out user2 if the error is user_disabled', async () => {
       const error = makeError(AuthErrorCode.USER_DISABLED);
-      await expect(_logoutIfInvalidated(user, Promise.reject(error))).to.be.rejectedWith(error);
+      await expect(
+        _logoutIfInvalidated(user, Promise.reject(error))
+      ).to.be.rejectedWith(error);
       expect(auth.currentUser).to.eq(user2);
     });
   });
-});
+});

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

@@ -1,9 +1,29 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { FirebaseError } from '@firebase/util';
 
 import { User } from '../../model/user';
 import { AuthErrorCode } from '../errors';
 
-export async function _logoutIfInvalidated<T>(user: User, promise: Promise<T>): Promise<T> {
+export async function _logoutIfInvalidated<T>(
+  user: User,
+  promise: Promise<T>
+): Promise<T> {
   try {
     return await promise;
   } catch (e) {
@@ -17,7 +37,9 @@ export async function _logoutIfInvalidated<T>(user: User, promise: Promise<T>):
   }
 }
 
-function isUserInvalidated({code}: FirebaseError): boolean {
-  return code === `auth/${AuthErrorCode.USER_DISABLED}` ||
-    code === `auth/${AuthErrorCode.TOKEN_EXPIRED}`;
-}
+function isUserInvalidated({ code }: FirebaseError): boolean {
+  return (
+    code === `auth/${AuthErrorCode.USER_DISABLED}` ||
+    code === `auth/${AuthErrorCode.TOKEN_EXPIRED}`
+  );
+}

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

@@ -62,10 +62,10 @@ export async function _link(
   user: User,
   credential: AuthCredential
 ): Promise<UserCredential> {
-  const response = await _logoutIfInvalidated(user, credential._linkToIdToken(
-    user.auth,
-    await user.getIdToken()
-  ));
+  const response = await _logoutIfInvalidated(
+    user,
+    credential._linkToIdToken(user.auth, await user.getIdToken())
+  );
   return UserCredentialImpl._forOperation(
     user,
     externs.OperationType.LINK,

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

@@ -34,12 +34,15 @@ export async function _reauthenticate(
   const operationType = OperationType.REAUTHENTICATE;
 
   try {
-    const response = await _logoutIfInvalidated(user, _processCredentialSavingMfaContextIfNecessary(
-      user.auth,
-      operationType,
-      credential,
-      user
-    ));
+    const response = await _logoutIfInvalidated(
+      user,
+      _processCredentialSavingMfaContextIfNecessary(
+        user.auth,
+        operationType,
+        credential,
+        user
+      )
+    );
     assert(response.idToken, AuthErrorCode.INTERNAL_ERROR, { appName });
     const parsed = _parseToken(response.idToken);
     assert(parsed, AuthErrorCode.INTERNAL_ERROR, { appName });

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

@@ -17,7 +17,10 @@
 
 import * as externs from '@firebase/auth-types-exp';
 
-import { getAccountInfo, ProviderUserInfo } from '../../api/account_management/account';
+import {
+  getAccountInfo,
+  ProviderUserInfo
+} from '../../api/account_management/account';
 import { User } from '../../model/user';
 import { AuthErrorCode } from '../errors';
 import { assert } from '../util/assert';
@@ -27,7 +30,10 @@ import { UserMetadata } from './user_metadata';
 export async function _reloadWithoutSaving(user: User): Promise<void> {
   const auth = user.auth;
   const idToken = await user.getIdToken();
-  const response = await _logoutIfInvalidated(user, getAccountInfo(auth, { idToken }));
+  const response = await _logoutIfInvalidated(
+    user,
+    getAccountInfo(auth, { idToken })
+  );
 
   assert(response?.users.length, AuthErrorCode.INTERNAL_ERROR, {
     appName: auth.name

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

@@ -18,7 +18,10 @@
 import * as externs from '@firebase/auth-types-exp';
 import { NextFn } from '@firebase/util';
 
-import { APIUserInfo, deleteAccount } from '../../api/account_management/account';
+import {
+  APIUserInfo,
+  deleteAccount
+} from '../../api/account_management/account';
 import { FinalizeMfaResponse } from '../../api/authentication/mfa';
 import { Auth } from '../../model/auth';
 import { IdTokenResponse } from '../../model/id_token';
@@ -82,10 +85,10 @@ export class UserImpl implements User {
   }
 
   async getIdToken(forceRefresh?: boolean): Promise<string> {
-    const accessToken = await _logoutIfInvalidated(this, this.stsTokenManager.getToken(
-      this.auth,
-      forceRefresh
-    ));
+    const accessToken = await _logoutIfInvalidated(
+      this,
+      this.stsTokenManager.getToken(this.auth, forceRefresh)
+    );
     assert(accessToken, AuthErrorCode.INTERNAL_ERROR, {
       appName: this.auth.name
     });

packages-exp/auth-exp/src/mfa/mfa_user.ts

@@ -51,11 +51,10 @@ export class MultiFactorUser implements externs.MultiFactorUser {
   ): Promise<void> {
     const assertion = assertionExtern as MultiFactorAssertion;
     const session = (await this.getSession()) as MultiFactorSession;
-    const finalizeMfaResponse = await _logoutIfInvalidated(this.user, assertion._process(
-      this.user.auth,
-      session,
-      displayName
-    ));
+    const finalizeMfaResponse = await _logoutIfInvalidated(
+      this.user,
+      assertion._process(this.user.auth, session, displayName)
+    );
     // New tokens will be issued after enrollment of the new second factors.
     // They need to be updated on the user.
     await this.user._updateTokensIfNecessary(finalizeMfaResponse);
@@ -69,10 +68,13 @@ export class MultiFactorUser implements externs.MultiFactorUser {
     const mfaEnrollmentId =
       typeof infoOrUid === 'string' ? infoOrUid : infoOrUid.uid;
     const idToken = await this.user.getIdToken();
-    const idTokenResponse = await _logoutIfInvalidated(this.user, withdrawMfa(this.user.auth, {
-      idToken,
-      mfaEnrollmentId
-    }));
+    const idTokenResponse = await _logoutIfInvalidated(
+      this.user,
+      withdrawMfa(this.user.auth, {
+        idToken,
+        mfaEnrollmentId
+      })
+    );
     // Remove the second factor from the user's list.
     this.enrolledFactors = this.enrolledFactors.filter(
       ({ uid }) => uid !== mfaEnrollmentId