Linter fixes

Author: sam-gc

packages-exp/auth-exp/src/core/strategies/anonymous.test.ts

@@ -17,11 +17,7 @@
 
 import { expect } from 'chai';
 
-import {
-  OperationType,
-  ProviderId,
-  SignInMethod
-} from '@firebase/auth-types-exp';
+import { OperationType } from '@firebase/auth-types-exp';
 
 import { mockEndpoint } from '../../../test/helpers/api/helper';
 import { testAuth, testUser } from '../../../test/helpers/mock_auth';

packages-exp/auth-exp/src/core/strategies/email_and_password.test.ts

@@ -19,12 +19,7 @@ import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as sinonChai from 'sinon-chai';
 
-import {
-  Operation,
-  OperationType,
-  ProviderId,
-  SignInMethod
-} from '@firebase/auth-types-exp';
+import { Operation, OperationType } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 
 import { mockEndpoint } from '../../../test/helpers/api/helper';
@@ -36,13 +31,8 @@ import { ServerError } from '../../api/errors';
 import { Auth } from '../../model/auth';
 import { UserCredential } from '../../model/user';
 import {
-  applyActionCode,
-  checkActionCode,
-  confirmPasswordReset,
-  createUserWithEmailAndPassword,
-  sendPasswordResetEmail,
-  signInWithEmailAndPassword,
-  verifyPasswordResetCode
+    applyActionCode, checkActionCode, confirmPasswordReset, createUserWithEmailAndPassword,
+    sendPasswordResetEmail, signInWithEmailAndPassword, verifyPasswordResetCode
 } from './email_and_password';
 
 use(chaiAsPromised);

packages-exp/auth-exp/src/core/strategies/email_link.test.ts

@@ -20,11 +20,7 @@ import * as chaiAsPromised from 'chai-as-promised';
 import * as sinonChai from 'sinon-chai';
 
 import * as externs from '@firebase/auth-types-exp';
-import {
-  OperationType,
-  ProviderId,
-  SignInMethod
-} from '@firebase/auth-types-exp';
+import { OperationType } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 
 import { mockEndpoint } from '../../../test/helpers/api/helper';
@@ -35,11 +31,7 @@ import { APIUserInfo } from '../../api/account_management/account';
 import { ServerError } from '../../api/errors';
 import { Auth } from '../../model/auth';
 import { UserCredential } from '../../model/user';
-import {
-  isSignInWithEmailLink,
-  sendSignInLinkToEmail,
-  signInWithEmailLink
-} from './email_link';
+import { isSignInWithEmailLink, sendSignInLinkToEmail, signInWithEmailLink } from './email_link';
 
 use(chaiAsPromised);
 use(sinonChai);

packages-exp/auth-exp/test/integration/flows/phone.test.ts

@@ -19,27 +19,13 @@ import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 
 import {
-  linkWithPhoneNumber,
-  PhoneAuthProvider,
-  reauthenticateWithPhoneNumber,
-  RecaptchaVerifier,
-  signInAnonymously,
-  signInWithPhoneNumber,
-  unlink,
-  updatePhoneNumber
+    linkWithPhoneNumber, PhoneAuthProvider, reauthenticateWithPhoneNumber, RecaptchaVerifier,
+    signInAnonymously, signInWithPhoneNumber, unlink, updatePhoneNumber
 } from '@firebase/auth-exp/index.browser';
-import {
-  Auth,
-  OperationType,
-  ProviderId,
-  UserCredential
-} from '@firebase/auth-types-exp';
+import { Auth, OperationType, ProviderId, UserCredential } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 
-import {
-  cleanUpTestInstance,
-  getTestInstance
-} from '../../helpers/integration/helpers';
+import { cleanUpTestInstance, getTestInstance } from '../../helpers/integration/helpers';
 
 use(chaiAsPromised);
 
@@ -51,12 +37,12 @@ use(chaiAsPromised);
 //   • +1 (555) 555-2000, SMS code 654321
 
 const PHONE_A = {
-  number: '+15555551000',
+  phoneNumber: '+15555551000',
   code: '123456'
 };
 
 const PHONE_B = {
-  number: '+15555552000',
+  phoneNumber: '+15555552000',
   code: '654321'
 };
 
@@ -78,7 +64,7 @@ describe('Integration test: phone auth', () => {
   });
 
   it('allows user to sign up', async () => {
-    const cr = await signInWithPhoneNumber(auth, PHONE_A.number, verifier);
+    const cr = await signInWithPhoneNumber(auth, PHONE_A.phoneNumber, verifier);
     const userCred = await cr.confirm(PHONE_A.code);
 
     expect(auth.currentUser).to.eq(userCred.user);
@@ -87,18 +73,18 @@ describe('Integration test: phone auth', () => {
     const user = userCred.user;
     expect(user.isAnonymous).to.be.false;
     expect(user.uid).to.be.a('string');
-    expect(user.phoneNumber).to.eq(PHONE_A.number);
+    expect(user.phoneNumber).to.eq(PHONE_A.phoneNumber);
   });
 
   it('anonymous users can link (and unlink) phone number', async () => {
     const { user } = await signInAnonymously(auth);
     const { uid: anonId } = user;
 
-    const cr = await linkWithPhoneNumber(user, PHONE_A.number, verifier);
+    const cr = await linkWithPhoneNumber(user, PHONE_A.phoneNumber, verifier);
     const linkResult = await cr.confirm(PHONE_A.code);
     expect(linkResult.operationType).to.eq(OperationType.LINK);
     expect(linkResult.user.uid).to.eq(user.uid);
-    expect(linkResult.user.phoneNumber).to.eq(PHONE_A.number);
+    expect(linkResult.user.phoneNumber).to.eq(PHONE_A.phoneNumber);
 
     await unlink(user, ProviderId.PHONE);
     expect(auth.currentUser!.uid).to.eq(anonId);
@@ -115,65 +101,65 @@ describe('Integration test: phone auth', () => {
     }
 
     beforeEach(async () => {
-      const cr = await signInWithPhoneNumber(auth, PHONE_A.number, verifier);
+      const cr = await signInWithPhoneNumber(auth, PHONE_A.phoneNumber, verifier);
       signUpCred = await cr.confirm(PHONE_A.code);
       resetVerifier();
       await auth.signOut();
     });
 
     it('allows the user to sign in again', async () => {
-      const cr = await signInWithPhoneNumber(auth, PHONE_A.number, verifier);
+      const cr = await signInWithPhoneNumber(auth, PHONE_A.phoneNumber, verifier);
       const signInCred = await cr.confirm(PHONE_A.code);
 
       expect(signInCred.user.uid).to.eq(signUpCred.user.uid);
     });
 
     it('allows the user to update their phone number', async () => {
-      let cr = await signInWithPhoneNumber(auth, PHONE_A.number, verifier);
+      let cr = await signInWithPhoneNumber(auth, PHONE_A.phoneNumber, verifier);
       const { user } = await cr.confirm(PHONE_A.code);
 
       resetVerifier();
 
       const provider = new PhoneAuthProvider(auth);
       const verificationId = await provider.verifyPhoneNumber(
-        PHONE_B.number,
+        PHONE_B.phoneNumber,
         verifier
       );
 
       await updatePhoneNumber(
         user,
         PhoneAuthProvider.credential(verificationId, PHONE_B.code)
       );
-      expect(user.phoneNumber).to.eq(PHONE_B.number);
+      expect(user.phoneNumber).to.eq(PHONE_B.phoneNumber);
 
       await auth.signOut();
       resetVerifier();
 
-      cr = await signInWithPhoneNumber(auth, PHONE_B.number, verifier);
+      cr = await signInWithPhoneNumber(auth, PHONE_B.phoneNumber, verifier);
       const { user: secondSignIn } = await cr.confirm(PHONE_B.code);
       expect(secondSignIn.uid).to.eq(user.uid);
     });
 
     it('allows the user to reauthenticate with phone number', async () => {
-      let cr = await signInWithPhoneNumber(auth, PHONE_A.number, verifier);
+      let cr = await signInWithPhoneNumber(auth, PHONE_A.phoneNumber, verifier);
       const { user } = await cr.confirm(PHONE_A.code);
       const oldToken = user.refreshToken;
 
       resetVerifier();
 
-      cr = await reauthenticateWithPhoneNumber(user, PHONE_A.number, verifier);
+      cr = await reauthenticateWithPhoneNumber(user, PHONE_A.phoneNumber, verifier);
       await cr.confirm(PHONE_A.code);
 
       expect(user.refreshToken).not.to.eq(oldToken);
     });
 
     it('prevents reauthentication with wrong phone number', async () => {
-      let cr = await signInWithPhoneNumber(auth, PHONE_A.number, verifier);
+      let cr = await signInWithPhoneNumber(auth, PHONE_A.phoneNumber, verifier);
       const { user } = await cr.confirm(PHONE_A.code);
 
       resetVerifier();
 
-      cr = await reauthenticateWithPhoneNumber(user, PHONE_B.number, verifier);
+      cr = await reauthenticateWithPhoneNumber(user, PHONE_B.phoneNumber, verifier);
       await expect(cr.confirm(PHONE_B.code)).to.be.rejectedWith(
         FirebaseError,
         'auth/user-mismatch'
@@ -182,7 +168,7 @@ describe('Integration test: phone auth', () => {
       // We need to manually delete PHONE_B number since a failed
       // reauthenticateWithPhoneNumber does not trigger a state change
       resetVerifier();
-      cr = await signInWithPhoneNumber(auth, PHONE_B.number, verifier);
+      cr = await signInWithPhoneNumber(auth, PHONE_B.phoneNumber, verifier);
       const { user: otherUser } = await cr.confirm(PHONE_B.code);
       await otherUser.delete();
     });