fix tests

aws-amplify · Sep 13, 2023 · e1f2471 · e1f2471
1 parent 25ad04c
commit e1f2471
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 42 deletions.
diff --git a/packages/auth/__tests__/providers/cognito/confirmSignInErrorCases.test.ts b/packages/auth/__tests__/providers/cognito/confirmSignInErrorCases.test.ts
@@ -3,7 +3,6 @@ import { AuthValidationErrorCode } from '../../../src/errors/types/validation';
 import { authAPITestParams } from './testUtils/authApiTestParams';
 import { signIn } from '../../../src/providers/cognito/apis/signIn';
 import * as signInHelpers from '../../../src/providers/cognito/utils/signInHelpers';
-import { AuthSignInStep } from '../../../src/types';
 import { confirmSignIn } from '../../../src/providers/cognito/apis/confirmSignIn';
 import { RespondToAuthChallengeException } from '../../../src/providers/cognito/types/errors';
 import { RespondToAuthChallengeCommandOutput } from '../../../src/providers/cognito/utils/clients/CognitoIdentityProvider/types';
@@ -54,7 +53,7 @@ describe('confirmSignIn API error path cases:', () => {
 	});
 
 	test(`confirmSignIn API should throw a validation AuthError when sign-in step is
-     ${AuthSignInStep.CONTINUE_SIGN_IN_WITH_MFA_SELECTION} and challengeResponse is not "SMS" or "TOTP" `, async () => {
+     ${'CONTINUE_SIGN_IN_WITH_MFA_SELECTION'} and challengeResponse is not "SMS" or "TOTP" `, async () => {
 		expect.assertions(2);
 		try {
 			await signIn({ username, password });

diff --git a/packages/auth/__tests__/providers/cognito/confirmSignInHappyCases.test.ts b/packages/auth/__tests__/providers/cognito/confirmSignInHappyCases.test.ts
@@ -5,7 +5,6 @@ import { Amplify } from '@aws-amplify/core';
 import { authAPITestParams } from './testUtils/authApiTestParams';
 import { signIn } from '../../../src/providers/cognito/apis/signIn';
 import * as signInHelpers from '../../../src/providers/cognito/utils/signInHelpers';
-import { AuthSignInStep } from '../../../src/types';
 import { confirmSignIn } from '../../../src/providers/cognito/apis/confirmSignIn';
 import { RespondToAuthChallengeCommandOutput } from '../../../src/providers/cognito/utils/clients/CognitoIdentityProvider/types';
 import { cognitoCredentialsProvider } from '../../../src/providers/cognito/credentialsProvider';
@@ -84,7 +83,7 @@ describe('confirmSignIn API happy path cases', () => {
 		expect(signInResult).toEqual({
 			isSignedIn: false,
 			nextStep: {
-				signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_SMS_CODE,
+				signInStep: 'CONFIRM_SIGN_IN_WITH_SMS_CODE',
 				codeDeliveryDetails: {
 					deliveryMedium: 'SMS',
 					destination: '*******9878',
@@ -94,7 +93,7 @@ describe('confirmSignIn API happy path cases', () => {
 		expect(confirmSignInResult).toEqual({
 			isSignedIn: true,
 			nextStep: {
-				signInStep: AuthSignInStep.DONE,
+				signInStep: 'DONE',
 			},
 		});
 
@@ -128,13 +127,13 @@ describe('confirmSignIn API happy path cases', () => {
 		expect(signInResult).toEqual({
 			isSignedIn: false,
 			nextStep: {
-				signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_TOTP_CODE,
+				signInStep: 'CONFIRM_SIGN_IN_WITH_TOTP_CODE',
 			},
 		});
 		expect(confirmSignInResult).toEqual({
 			isSignedIn: true,
 			nextStep: {
-				signInStep: AuthSignInStep.DONE,
+				signInStep: 'DONE',
 			},
 		});
 
@@ -185,15 +184,15 @@ describe('confirmSignIn API happy path cases', () => {
 		expect(signInResult).toEqual({
 			isSignedIn: false,
 			nextStep: {
-				signInStep: AuthSignInStep.CONTINUE_SIGN_IN_WITH_MFA_SELECTION,
+				signInStep: 'CONTINUE_SIGN_IN_WITH_MFA_SELECTION',
 				allowedMFATypes: ['SMS', 'TOTP'],
 			},
 		});
 
 		expect(confirmSignInResult).toEqual({
 			isSignedIn: false,
 			nextStep: {
-				signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_SMS_CODE,
+				signInStep: 'CONFIRM_SIGN_IN_WITH_SMS_CODE',
 				codeDeliveryDetails: {
 					deliveryMedium: 'SMS',
 					destination: '*******9878',

diff --git a/packages/auth/__tests__/providers/cognito/signInWithSRP.test.ts b/packages/auth/__tests__/providers/cognito/signInWithSRP.test.ts
@@ -1,8 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
-import { AmplifyErrorString } from '@aws-amplify/core/internals/utils';
-
 import { AuthError } from '../../../src/errors/AuthError';
 import { AuthValidationErrorCode } from '../../../src/errors/types/validation';
 import { authAPITestParams } from './testUtils/authApiTestParams';
@@ -14,7 +11,6 @@ import { RespondToAuthChallengeCommandOutput } from '../../../src/providers/cogn
 import { Amplify } from 'aws-amplify';
 import { fetchTransferHandler } from '@aws-amplify/core/internals/aws-client-utils';
 import { buildMockErrorResponse, mockJsonResponse } from './testUtils/data';
-import { cognitoCredentialsProvider } from '../../../src/providers/cognito/credentialsProvider';
 import { CognitoUserPoolsTokenProvider } from '../../../src/providers/cognito/tokenProvider';
 jest.mock('@aws-amplify/core/lib/clients/handlers/fetch');
 

diff --git a/packages/auth/__tests__/providers/cognito/testUtils/authApiTestParams.ts b/packages/auth/__tests__/providers/cognito/testUtils/authApiTestParams.ts
@@ -5,7 +5,6 @@ import { decodeJWT } from '@aws-amplify/core/internals/utils';
 import {
 	AuthResetPasswordStep,
 	AuthSignInResult,
-	AuthSignInStep,
 } from '../../../../src/types';
 
 export const authAPITestParams = {
@@ -202,15 +201,15 @@ export const authAPITestParams = {
 		return {
 			isSignedIn: false,
 			nextStep: {
-				signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_CUSTOM_CHALLENGE,
+				signInStep: 'CONFIRM_SIGN_IN_WITH_CUSTOM_CHALLENGE',
 			},
 		};
 	},
 	signInResult: (): AuthSignInResult => {
 		return {
 			isSignedIn: true,
 			nextStep: {
-				signInStep: AuthSignInStep.DONE,
+				signInStep: 'DONE',
 			},
 		};
 	},

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -25,7 +25,7 @@
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint '{src}/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 91.23"
+		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 91.22"
 	},
 	"typesVersions": {
 		">=3.8": {

diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts
@@ -24,7 +24,6 @@ export {
 } from './providers/cognito';
 export {
 	AuthResetPasswordStep,
-	AuthSignInStep,
 	AuthSignUpStep,
 	AuthUpdateAttributeStep
 } from './types/enums';

diff --git a/packages/auth/src/providers/cognito/apis/confirmSignIn.ts b/packages/auth/src/providers/cognito/apis/confirmSignIn.ts
@@ -8,7 +8,6 @@ import {
 } from '../types/errors';
 import {
 	AuthSignInResult,
-	AuthSignInStep,
 	ConfirmSignInRequest,
 } from '../../../types';
 import { CognitoConfirmSignInOptions } from '../types';
@@ -119,7 +118,7 @@ export async function confirmSignIn(
 			await cacheCognitoTokens(AuthenticationResult);
 			return {
 				isSignedIn: true,
-				nextStep: { signInStep: AuthSignInStep.DONE },
+				nextStep: { signInStep: 'DONE' },
 			};
 		}
 

diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
@@ -6,7 +6,6 @@ import { assertValidationError } from '../../../errors/utils/assertValidationErr
 import {
 	SignInRequest,
 	AuthSignInResult,
-	AuthSignInStep,
 } from '../../../types';
 import { assertServiceError } from '../../../errors/utils/assertServiceError';
 import {
@@ -74,7 +73,7 @@ export async function signInWithCustomAuth(
 			await cacheCognitoTokens(AuthenticationResult);
 			return {
 				isSignedIn: true,
-				nextStep: { signInStep: AuthSignInStep.DONE },
+				nextStep: { signInStep: 'DONE' },
 			};
 		}
 

diff --git a/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts b/packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
@@ -18,7 +18,6 @@ import {
 import {
 	SignInRequest,
 	AuthSignInResult,
-	AuthSignInStep,
 } from '../../../types';
 import { CognitoSignInOptions } from '../types';
 import {
@@ -78,7 +77,7 @@ export async function signInWithCustomSRPAuth(
 			cleanActiveSignInState();
 			return {
 				isSignedIn: true,
-				nextStep: { signInStep: AuthSignInStep.DONE },
+				nextStep: { signInStep: 'DONE' },
 			};
 		}
 

diff --git a/packages/auth/src/providers/cognito/apis/signInWithSRP.ts b/packages/auth/src/providers/cognito/apis/signInWithSRP.ts
@@ -23,7 +23,6 @@ import { CognitoSignInOptions } from '../types';
 import {
 	SignInRequest,
 	AuthSignInResult,
-	AuthSignInStep,
 } from '../../../types';
 import {
 	setActiveSignInState,
@@ -83,7 +82,7 @@ export async function signInWithSRP(
 			await cacheCognitoTokens(AuthenticationResult);
 			return {
 				isSignedIn: true,
-				nextStep: { signInStep: AuthSignInStep.DONE },
+				nextStep: { signInStep: 'DONE' },
 			};
 		}
 

diff --git a/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts b/packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
@@ -4,11 +4,7 @@
 import { AuthValidationErrorCode } from '../../../errors/types/validation';
 import { assertServiceError } from '../../../errors/utils/assertServiceError';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
-import {
-	AuthSignInResult,
-	AuthSignInStep,
-	SignInRequest,
-} from '../../../types';
+import { AuthSignInResult, SignInRequest } from '../../../types';
 import {
 	ChallengeName,
 	ChallengeParameters,
@@ -79,7 +75,7 @@ export async function signInWithUserPassword(
 			cleanActiveSignInState();
 			return {
 				isSignedIn: true,
-				nextStep: { signInStep: AuthSignInStep.DONE },
+				nextStep: { signInStep: 'DONE' },
 			};
 		}
 

diff --git a/packages/auth/src/providers/cognito/utils/signInHelpers.ts b/packages/auth/src/providers/cognito/utils/signInHelpers.ts
@@ -16,7 +16,6 @@ import { ClientMetadata, CognitoConfirmSignInOptions } from '../types';
 import {
 	AdditionalInfo,
 	AuthSignInResult,
-	AuthSignInStep,
 	DeliveryMedium,
 } from '../../../types';
 import { AuthError } from '../../../errors/AuthError';
@@ -385,7 +384,7 @@ export async function getSignInResult(params: {
 			return {
 				isSignedIn: false,
 				nextStep: {
-					signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_CUSTOM_CHALLENGE,
+					signInStep: 'CONFIRM_SIGN_IN_WITH_CUSTOM_CHALLENGE',
 					additionalInfo: challengeParameters as AdditionalInfo,
 				},
 			};
@@ -413,15 +412,15 @@ export async function getSignInResult(params: {
 			return {
 				isSignedIn: false,
 				nextStep: {
-					signInStep: AuthSignInStep.CONTINUE_SIGN_IN_WITH_TOTP_SETUP,
+					signInStep: 'CONTINUE_SIGN_IN_WITH_TOTP_SETUP',
 					totpSetupDetails: getTOTPSetupDetails(secretCode!, username),
 				},
 			};
 		case 'NEW_PASSWORD_REQUIRED':
 			return {
 				isSignedIn: false,
 				nextStep: {
-					signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIRED,
+					signInStep: 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIRED',
 					missingAttributes: parseAttributes(
 						challengeParameters.requiredAttributes
 					),
@@ -431,7 +430,7 @@ export async function getSignInResult(params: {
 			return {
 				isSignedIn: false,
 				nextStep: {
-					signInStep: AuthSignInStep.CONTINUE_SIGN_IN_WITH_MFA_SELECTION,
+					signInStep: 'CONTINUE_SIGN_IN_WITH_MFA_SELECTION',
 					allowedMFATypes: getMFATypes(
 						parseMFATypes(challengeParameters.MFAS_CAN_CHOOSE)
 					),
@@ -441,7 +440,7 @@ export async function getSignInResult(params: {
 			return {
 				isSignedIn: false,
 				nextStep: {
-					signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_SMS_CODE,
+					signInStep: 'CONFIRM_SIGN_IN_WITH_SMS_CODE',
 					codeDeliveryDetails: {
 						deliveryMedium:
 							challengeParameters.CODE_DELIVERY_DELIVERY_MEDIUM as DeliveryMedium,
@@ -453,7 +452,7 @@ export async function getSignInResult(params: {
 			return {
 				isSignedIn: false,
 				nextStep: {
-					signInStep: AuthSignInStep.CONFIRM_SIGN_IN_WITH_TOTP_CODE,
+					signInStep: 'CONFIRM_SIGN_IN_WITH_TOTP_CODE',
 				},
 			};
 		case 'ADMIN_NO_SRP_AUTH':
@@ -496,12 +495,12 @@ export function getSignInResultFromError(
 	if (errorName === InitiateAuthException.PasswordResetRequiredException) {
 		return {
 			isSignedIn: false,
-			nextStep: { signInStep: AuthSignInStep.RESET_PASSWORD },
+			nextStep: { signInStep: 'RESET_PASSWORD' },
 		};
 	} else if (errorName === InitiateAuthException.UserNotConfirmedException) {
 		return {
 			isSignedIn: false,
-			nextStep: { signInStep: AuthSignInStep.CONFIRM_SIGN_UP },
+			nextStep: { signInStep: 'CONFIRM_SIGN_UP' },
 		};
 	}
 }

diff --git a/packages/auth/src/types/index.ts b/packages/auth/src/types/index.ts
@@ -7,7 +7,6 @@ export * from './Auth';
 export {
 	AuthSignUpStep,
 	AuthResetPasswordStep,
-	AuthSignInStep,
 	AuthUpdateAttributeStep,
 } from './enums';