Resolve merge conflicts

Author: avolkovi

packages-exp/auth-exp/src/api/account_management/account.test.ts

@@ -67,7 +67,7 @@ describe('deleteAccount', () => {
 
     await expect(deleteAccount(mockAuth, request)).to.be.rejectedWith(
       FirebaseError,
-      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with]: or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
+      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with, or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
     );
     expect(mock.calls[0].request).to.eql(request);
   });
@@ -176,7 +176,7 @@ describe('getAccountInfo', () => {
 
     await expect(getAccountInfo(mockAuth, request)).to.be.rejectedWith(
       FirebaseError,
-      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with]: or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
+      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with, or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
     );
     expect(mock.calls[0].request).to.eql(request);
   });

packages-exp/auth-exp/src/api/account_management/mfa.test.ts

@@ -75,7 +75,7 @@ describe('startEnrollPhoneMfa', () => {
 
     await expect(startEnrollPhoneMfa(mockAuth, request)).to.be.rejectedWith(
       FirebaseError,
-      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with]: or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
+      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with, or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
     );
     expect(mock.calls[0].request).to.eql(request);
   });
@@ -181,7 +181,7 @@ describe('withdrawMfa', () => {
 
     await expect(withdrawMfa(mockAuth, request)).to.be.rejectedWith(
       FirebaseError,
-      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with]: or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
+      "Firebase: This user's credential isn't valid for this project. This can happen if the user's token has been tampered with, or if the user isn't for the project associated with this API key. (auth/invalid-user-token)."
     );
     expect(mock.calls[0].request).to.eql(request);
   });

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

@@ -78,7 +78,7 @@ describe('sendPhoneVerificationCode', () => {
       sendPhoneVerificationCode(mockAuth, request)
     ).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The format of the phone number provided is incorrect. Please enter the phone number in a format that can be parsed into E.164 format. E.164 phone numbers are written in the format [+,[country code,[subscriber number including area code,. (auth/invalid-phone-number).'
+      'Firebase: The format of the phone number provided is incorrect. Please enter the phone number in a format that can be parsed into E.164 format. E.164 phone numbers are written in the format [+][country code][subscriber number including area code]. (auth/invalid-phone-number).'
     );
     expect(mock.calls[0].request).to.eql(request);
   });

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

@@ -197,7 +197,7 @@ describe('performApiRequest', () => {
       );
       await expect(promise).to.be.rejectedWith(
         FirebaseError,
-        'Firebase: A network AuthError (such as timeout]: interrupted connection or unreachable host) has occurred. (auth/network-request-failed).'
+        'Firebase: A network AuthError (such as timeout, interrupted connection or unreachable host) has occurred. (auth/network-request-failed).'
       );
     });
   });

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

@@ -198,7 +198,7 @@ const ERRORS: ErrorMap<AuthErrorCode> = {
   [AuthErrorCode.INVALID_PHONE_NUMBER]:
     'The format of the phone number provided is incorrect. Please enter the ' +
     'phone number in a format that can be parsed into E.164 format. E.164 ' +
-    'phone numbers are written in the format [+],[country code],[subscriber ' +
+    'phone numbers are written in the format [+][country code][subscriber ' +
     'number including area code].',
   [AuthErrorCode.INVALID_PROVIDER_ID]: 'The specified provider ID is invalid.',
   [AuthErrorCode.INVALID_RECIPIENT_EMAIL]:

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

@@ -25,11 +25,10 @@ import { mockAuth, testUser } from '../../../test/mock_auth';
 import * as mockFetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { ServerError } from '../../api/errors';
-import { Operation } from '../../model/action_code_info';
+import { Operation  } from '../../model/action_code_info';
 import { ProviderId } from '../providers';
 import * as location from '../util/location';
 import { fetchSignInMethodsForEmail, sendEmailVerification } from './email';
-import { Operation } from '../../model/action_code_info';
 
 use(chaiAsPromised);
 use(sinonChai);

packages-exp/auth-exp/src/core/strategies/email.ts

@@ -28,7 +28,7 @@ import {
 import { Auth } from '../../model/auth';
 import { User } from '../../model/user';
 import { getCurrentUrl, isHttpOrHttps } from '../util/location';
-import { Operation } from '../../model/action_code_info';
+
 
 export async function fetchSignInMethodsForEmail(
   auth: Auth,

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

@@ -160,7 +160,7 @@ describe('confirmPasswordReset', () => {
       confirmPasswordReset(mockAuth, oobCode, newPassword)
     ).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The action code is invalid. This can happen if the code is malformed]: expired]: or has already been used. (auth/invalid-action-code).'
+      'Firebase: The action code is invalid. This can happen if the code is malformed, expired, or has already been used. (auth/invalid-action-code).'
     );
     expect(mock.calls.length).to.eq(1);
   });
@@ -235,7 +235,7 @@ describe('checkActionCode', () => {
     );
     await expect(checkActionCode(mockAuth, oobCode)).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The action code is invalid. This can happen if the code is malformed]: expired]: or has already been used. (auth/invalid-action-code).'
+      'Firebase: The action code is invalid. This can happen if the code is malformed, expired, or has already been used. (auth/invalid-action-code).'
     );
     expect(mock.calls.length).to.eq(1);
   });
@@ -284,7 +284,7 @@ describe('verifyPasswordResetCode', () => {
     );
     await expect(verifyPasswordResetCode(mockAuth, oobCode)).to.be.rejectedWith(
       FirebaseError,
-      'Firebase: The action code is invalid. This can happen if the code is malformed]: expired]: or has already been used. (auth/invalid-action-code).'
+      'Firebase: The action code is invalid. This can happen if the code is malformed, expired, or has already been used. (auth/invalid-action-code).'
     );
     expect(mock.calls.length).to.eq(1);
   });