Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

INC-760: Do not return an mfa method when none exists #4361

Closed
wants to merge 2 commits into from
Closed

INC-760: Do not return an mfa method when none exists #4361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba690c
BAU: Correct MFA method in test helper
BeckaL Apr 26, 2024
855bda6
INC-760: Do not return an mfa method when none exists
BeckaL Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions frontend-api/src/test/java/uk/gov/di/authentication/frontendapi/lambda/LoginHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
import static uk.gov.di.authentication.frontendapi.lambda.StartHandlerTest.CLIENT_SESSION_ID;
import static uk.gov.di.authentication.frontendapi.lambda.StartHandlerTest.CLIENT_SESSION_ID_HEADER;
import static uk.gov.di.authentication.shared.entity.CredentialTrustLevel.LOW_LEVEL;
import static uk.gov.di.authentication.shared.entity.MFAMethodType.AUTH_APP;
import static uk.gov.di.authentication.shared.entity.MFAMethodType.NONE;
import static uk.gov.di.authentication.shared.entity.MFAMethodType.SMS;
import static uk.gov.di.authentication.shared.services.AuditService.MetadataPair.pair;
import static uk.gov.di.authentication.sharedtest.helper.JsonArrayHelper.jsonArrayOf;
Expand Down Expand Up @@ -277,7 +279,7 @@ void shouldReturn200IfLoginIsSuccessfulAndTermsAndConditionsNotAccepted(
}

@Test
void shouldReturn200WithCorrectMfaMethodVerifiedStatus() throws Json.JsonException {
void shouldReturn200WithCorrectMfaDetailsWhenAVerifiedMethodExists() throws Json.JsonException {
var userProfile = generateUserProfile(null);
var userCredentials =
new UserCredentials()
Expand All @@ -286,7 +288,7 @@ void shouldReturn200WithCorrectMfaMethodVerifiedStatus() throws Json.JsonExcepti
.setMfaMethod(
new MFAMethod()
.withMfaMethodType(MFAMethodType.AUTH_APP.getValue())
.withMethodVerified(false)
.withMethodVerified(true)
.withEnabled(true));
when(authenticationService.login(userCredentials, PASSWORD)).thenReturn(true);
when(authenticationService.getUserProfileByEmailMaybe(EMAIL))
Expand All @@ -303,15 +305,40 @@ void shouldReturn200WithCorrectMfaMethodVerifiedStatus() throws Json.JsonExcepti
assertThat(result, hasStatus(200));

var response = objectMapper.readValue(result.getBody(), LoginResponse.class);
assertThat(response.getMfaMethodType(), equalTo(SMS));
assertThat(response.getMfaMethodType(), equalTo(AUTH_APP));
assertThat(response.isMfaMethodVerified(), equalTo(true));
}

assertAuditServiceCalledWith(
FrontendAuditableEvent.LOG_IN_SUCCESS,
pair("internalSubjectId", INTERNAL_SUBJECT_ID.getValue()));
verifyNoInteractions(cloudwatchMetricsService);
@Test
void shouldReturn200WithCorrectMfaDetailsWhenNoVerifiedMethodExists()
throws Json.JsonException {
var userProfile = generateUserProfile(null);
var userCredentials =
new UserCredentials()
.withEmail(EMAIL)
.withPassword(PASSWORD)
.setMfaMethod(
new MFAMethod()
.withMfaMethodType(MFAMethodType.AUTH_APP.getValue())
.withMethodVerified(false)
.withEnabled(true));
when(authenticationService.login(userCredentials, PASSWORD)).thenReturn(true);
when(authenticationService.getUserProfileByEmailMaybe(EMAIL))
.thenReturn(Optional.of(userProfile));
when(authenticationService.getUserCredentialsFromEmail(EMAIL)).thenReturn(userCredentials);
when(clientSession.getAuthRequestParams()).thenReturn(generateAuthRequest().toParameters());
usingValidSession();

verifySessionIsSaved();
usingDefaultVectorOfTrust();

var event = eventWithHeadersAndBody(VALID_HEADERS, validBodyWithEmailAndPassword);
APIGatewayProxyResponseEvent result = handler.handleRequest(event, context);

assertThat(result, hasStatus(200));

var response = objectMapper.readValue(result.getBody(), LoginResponse.class);
assertThat(response.getMfaMethodType(), equalTo(NONE));
assertThat(response.isMfaMethodVerified(), equalTo(false));
}

@ParameterizedTest
Expand Down
2 changes: 1 addition & 1 deletion ...tion-tests/src/test/java/uk/gov/di/authentication/api/CheckUserExistsIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void shouldCallUserExistsEndpointAndReturnAuthenticationRequestStateWhenUserExis
userStore.signUp(emailAddress, "password-1");

if (MFAMethodType.SMS == mfaMethodType) {
userStore.addMfaMethod(emailAddress, mfaMethodType, false, true, "credential");
userStore.addMfaMethod(emailAddress, mfaMethodType, true, true, "credential");
userStore.addVerifiedPhoneNumber(emailAddress, "+44987654321");
} else {
userStore.addMfaMethod(emailAddress, mfaMethodType, true, true, "credential");
Expand Down
5 changes: 2 additions & 3 deletions shared/src/main/java/uk/gov/di/authentication/shared/conditions/MfaHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ public static UserMfaDetail getUserMFADetail(
String phoneNumber,
boolean isPhoneNumberVerified) {
var isMfaRequired = mfaRequired(userContext.getClientSession().getAuthRequestParams());
var mfaMethodVerified = isPhoneNumberVerified;

var mfaMethodVerified = false;
var mfaMethodType = MFAMethodType.NONE;
var mfaMethod = getPrimaryMFAMethod(userCredentials);
var mfaMethodType = MFAMethodType.SMS;
if (mfaMethod.filter(MFAMethod::isMethodVerified).isPresent()) {
mfaMethodVerified = true;
mfaMethodType = MFAMethodType.valueOf(mfaMethod.get().getMfaMethodType());
Expand Down
2 changes: 1 addition & 1 deletion shared/src/main/java/uk/gov/di/authentication/shared/services/DynamoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ public void updateMFAMethod(
String dateTime = NowHelper.toTimestampString(NowHelper.now());
MFAMethod mfaMethod =
new MFAMethod(
MFAMethodType.AUTH_APP.getValue(),
mfaMethodType.getValue(),
credentialValue,
methodVerified,
enabled,
Expand Down
Loading