Skip to content

Commit

Permalink
Apply Feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@jjarvisp
jjarvisp committed Aug 28, 2024
1 parent 2cdfe15 commit 7b30970
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 204 deletions.
2 changes: 0 additions & 2 deletions packages/auth/src/providers/cognito/apis/confirmSignIn.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import {
} from '../utils/clients/CognitoIdentityProvider/types';
import { tokenOrchestrator } from '../tokenProvider';
import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
import { resetMfaSetupState } from '../utils/mfaSetupStore';

/**
* Continues or completes the sign in process when required by the initial call to `signIn`.
Expand Down Expand Up @@ -111,7 +110,6 @@ export async function confirmSignIn(

if (AuthenticationResult) {
cleanActiveSignInState();
resetMfaSetupState();
await cacheCognitoTokens({
username,
...AuthenticationResult,
Expand Down
2 changes: 0 additions & 2 deletions packages/auth/src/providers/cognito/apis/signInWithCustomAuth.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import {
} from '../utils/clients/CognitoIdentityProvider/types';
import { tokenOrchestrator } from '../tokenProvider';
import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
import { resetMfaSetupState } from '../utils/mfaSetupStore';

/**
* Signs a user in using a custom authentication flow without password
Expand Down Expand Up @@ -65,7 +64,6 @@ export async function signInWithCustomAuth(
);

try {
resetMfaSetupState();
const {
ChallengeName: retriedChallengeName,
ChallengeParameters: retiredChallengeParameters,
Expand Down
2 changes: 0 additions & 2 deletions packages/auth/src/providers/cognito/apis/signInWithCustomSRPAuth.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import {
} from '../utils/clients/CognitoIdentityProvider/types';
import { tokenOrchestrator } from '../tokenProvider';
import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
import { resetMfaSetupState } from '../utils/mfaSetupStore';

/**
* Signs a user in using a custom authentication flow with SRP
Expand Down Expand Up @@ -68,7 +67,6 @@ export async function signInWithCustomSRPAuth(
);

try {
resetMfaSetupState();
const {
ChallengeName: handledChallengeName,
ChallengeParameters: handledChallengeParameters,
Expand Down
2 changes: 0 additions & 2 deletions packages/auth/src/providers/cognito/apis/signInWithSRP.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import {
import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
import { tokenOrchestrator } from '../tokenProvider';
import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
import { resetMfaSetupState } from '../utils/mfaSetupStore';

/**
* Signs a user in
Expand Down Expand Up @@ -68,7 +67,6 @@ export async function signInWithSRP(
);

try {
resetMfaSetupState();
const {
ChallengeName: handledChallengeName,
ChallengeParameters: handledChallengeParameters,
Expand Down
2 changes: 0 additions & 2 deletions packages/auth/src/providers/cognito/apis/signInWithUserPassword.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import {
import { cacheCognitoTokens } from '../tokenProvider/cacheTokens';
import { tokenOrchestrator } from '../tokenProvider';
import { dispatchSignedInHubEvent } from '../utils/dispatchSignedInHubEvent';
import { resetMfaSetupState } from '../utils/mfaSetupStore';

/**
* Signs a user in using USER_PASSWORD_AUTH AuthFlowType
Expand Down Expand Up @@ -65,7 +64,6 @@ export async function signInWithUserPassword(
);

try {
resetMfaSetupState();
const {
ChallengeName: retiredChallengeName,
ChallengeParameters: retriedChallengeParameters,
Expand Down
77 changes: 0 additions & 77 deletions packages/auth/src/providers/cognito/utils/mfaSetupStore.ts
View file

This file was deleted.

173 changes: 56 additions & 117 deletions packages/auth/src/providers/cognito/utils/signInHelpers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ import {
import { BigInteger } from './srp/BigInteger';
import { AuthenticationHelper } from './srp/AuthenticationHelper';
import { getUserContextData } from './userContextData';
import { mfaSetupStore } from './mfaSetupStore';

const USER_ATTRIBUTES = 'userAttributes.';

Expand Down Expand Up @@ -150,76 +149,74 @@ export async function handleMFASetupChallenge({
}: HandleAuthChallengeRequest): Promise<RespondToAuthChallengeCommandOutput> {
const { userPoolId, userPoolClientId } = config;

const mfaSetupState = mfaSetupStore.getState();

if (mfaSetupState?.status === 'IN_PROGRESS') {
if (
(challengeResponse === 'EMAIL' || challengeResponse === 'TOTP') &&
mfaSetupState.options.includes(challengeResponse)
) {
mfaSetupStore.dispatch({ type: 'COMPLETE', value: challengeResponse });

return {
ChallengeName: 'MFA_SETUP',
Session: session,
$metadata: {},
};
}
if (challengeResponse === 'EMAIL') {
return {
ChallengeName: 'MFA_SETUP',
Session: session,
ChallengeParameters: {
MFAS_CAN_SETUP: '["EMAIL_MFA"]',
},
$metadata: {},
};
}

if (mfaSetupState?.status === 'COMPLETE') {
const challengeResponses: Record<string, string> = {
USERNAME: username,
if (challengeResponse === 'TOTP') {
return {
ChallengeName: 'MFA_SETUP',
Session: session,
ChallengeParameters: {
MFAS_CAN_SETUP: '["SOFTWARE_TOKEN_MFA"]',
},
$metadata: {},
};
}

if (mfaSetupState.value === 'EMAIL') {
challengeResponses.EMAIL = challengeResponse;
const isTOTPCode = /^\d+$/.test(challengeResponse.trim());

const jsonReq: RespondToAuthChallengeCommandInput = {
ChallengeName: 'MFA_SETUP',
ChallengeResponses: challengeResponses,
const challengeResponses: Record<string, string> = {
USERNAME: username,
};

if (isTOTPCode) {
const { Session } = await verifySoftwareToken(
{
region: getRegion(userPoolId),
userAgentValue: getAuthUserAgentValue(AuthAction.ConfirmSignIn),
},
{
UserCode: challengeResponse,
Session: session,
ClientMetadata: clientMetadata,
ClientId: userPoolClientId,
};
FriendlyDeviceName: deviceName,
},
);

return respondToAuthChallenge({ region: getRegion(userPoolId) }, jsonReq);
}
signInStore.dispatch({
type: 'SET_SIGN_IN_SESSION',
value: Session,
});

if (mfaSetupState.value === 'TOTP') {
const { Session } = await verifySoftwareToken(
{
region: getRegion(userPoolId),
userAgentValue: getAuthUserAgentValue(AuthAction.ConfirmSignIn),
},
{
UserCode: challengeResponse,
Session: session,
FriendlyDeviceName: deviceName,
},
);
const jsonReq: RespondToAuthChallengeCommandInput = {
ChallengeName: 'MFA_SETUP',
ChallengeResponses: challengeResponses,
Session,
ClientMetadata: clientMetadata,
ClientId: userPoolClientId,
};

signInStore.dispatch({
type: 'SET_SIGN_IN_SESSION',
value: Session,
});
return respondToAuthChallenge({ region: getRegion(userPoolId) }, jsonReq);
}

const jsonReq: RespondToAuthChallengeCommandInput = {
ChallengeName: 'MFA_SETUP',
ChallengeResponses: challengeResponses,
Session,
ClientMetadata: clientMetadata,
ClientId: userPoolClientId,
};
challengeResponses.EMAIL = challengeResponse;

return respondToAuthChallenge({ region: getRegion(userPoolId) }, jsonReq);
}
}
const jsonReq: RespondToAuthChallengeCommandInput = {
ChallengeName: 'MFA_SETUP',
ChallengeResponses: challengeResponses,
Session: session,
ClientMetadata: clientMetadata,
ClientId: userPoolClientId,
};

throw new AuthError({
name: AuthErrorCodes.SignInException,
message: `Cannot initiate MFA setup from available types: ${mfaSetupState?.options}`,
});
return respondToAuthChallenge({ region: getRegion(userPoolId) }, jsonReq);
}

export async function handleSelectMFATypeChallenge({
Expand Down Expand Up @@ -732,43 +729,6 @@ export async function getSignInResult(params: {
};
case 'MFA_SETUP': {
const { signInSession, username } = signInStore.getState();
const mfaSetupState = mfaSetupStore.getState();

if (mfaSetupState?.status === 'COMPLETE') {
if (mfaSetupState.value === 'EMAIL') {
return {
isSignedIn: false,
nextStep: {
signInStep: 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP',
},
};
}
if (mfaSetupState.value === 'TOTP') {
const { Session, SecretCode: secretCode } =
await associateSoftwareToken(
{ region: getRegion(authConfig.userPoolId) },
{
Session: signInSession,
},
);
signInStore.dispatch({
type: 'SET_SIGN_IN_SESSION',
value: Session,
});

return {
isSignedIn: false,
nextStep: {
signInStep: 'CONTINUE_SIGN_IN_WITH_TOTP_SETUP',
totpSetupDetails: getTOTPSetupDetails(secretCode!, username),
},
};
}
throw new AuthError({
name: AuthErrorCodes.SignInException,
message: `Cannot initiate MFA setup from available types: ${mfaSetupState.options}`,
});
}

const allowedMfaSetupTypes = getAllowedMfaSetupTypes(
challengeParameters.MFAS_CAN_SETUP,
Expand All @@ -778,11 +738,6 @@ export async function getSignInResult(params: {
const isEmailMfaSetupAvailable = allowedMfaSetupTypes.includes('EMAIL');

if (isTotpMfaSetupAvailable && isEmailMfaSetupAvailable) {
mfaSetupStore.dispatch({
type: 'IN_PROGRESS',
value: allowedMfaSetupTypes,
});

return {
isSignedIn: false,
nextStep: {
Expand All @@ -793,14 +748,6 @@ export async function getSignInResult(params: {
}

if (isEmailMfaSetupAvailable) {
mfaSetupStore.dispatch({
type: 'AUTO',
value: {
value: 'EMAIL',
options: allowedMfaSetupTypes,
},
});

return {
isSignedIn: false,
nextStep: {
Expand All @@ -810,14 +757,6 @@ export async function getSignInResult(params: {
}

if (isTotpMfaSetupAvailable) {
mfaSetupStore.dispatch({
type: 'AUTO',
value: {
value: 'TOTP',
options: allowedMfaSetupTypes,
},
});

const { Session, SecretCode: secretCode } =
await associateSoftwareToken(
{ region: getRegion(authConfig.userPoolId) },
Expand Down

0 comments on commit 7b30970

Please sign in to comment.