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

Fix elevating TrnVerificationLevel when matching an existing account #778

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Fix elevating TrnVerificationLevel when matching an existing account #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/SignIn/TrnInUseChooseEmail.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,45 @@ public async Task<IActionResult> OnPost()
}

var authenticationState = _journey.AuthenticationState;
authenticationState.EnsureOAuthState();

var journeyTrnVerificationLevel = authenticationState.OAuthState.TrnMatchPolicy == TrnMatchPolicy.Strict ?
TrnVerificationLevel.Medium :
TrnVerificationLevel.Low;

var lookupState = await _dbContext.JourneyTrnLookupStates
.SingleOrDefaultAsync(s => s.JourneyId == authenticationState.JourneyId);

var user = await _dbContext.Users.SingleAsync(u => u.EmailAddress == authenticationState.TrnOwnerEmailAddress);

var emailChanged = user.EmailAddress != Email;

user.EmailAddress = Email;

bool trnVerificationLevelChanged = false;
if (user.TrnVerificationLevel < journeyTrnVerificationLevel)
{
user.TrnVerificationLevel = journeyTrnVerificationLevel;
trnVerificationLevelChanged = true;
}

if (lookupState is not null)
{
lookupState.Locked = _clock.UtcNow;
lookupState.UserId = user.UserId;
}

if (emailChanged)
var changes = Events.UserUpdatedEventChanges.None |
(emailChanged ? Events.UserUpdatedEventChanges.EmailAddress : 0) |
(trnVerificationLevelChanged ? Events.UserUpdatedEventChanges.TrnVerificationLevel : 0);

if (changes != Events.UserUpdatedEventChanges.None)
{
user.Updated = _clock.UtcNow;

_dbContext.AddEvent(new Events.UserUpdatedEvent()
{
Source = Events.UserUpdatedEventSource.TrnMatchedToExistingUser,
Changes = Events.UserUpdatedEventChanges.EmailAddress,
Changes = changes,
CreatedUtc = _clock.UtcNow,
User = user,
UpdatedByUserId = user.UserId,
Expand Down
38 changes: 31 additions & 7 deletions ...r/tests/TeacherIdentity.AuthServer.Tests/EndpointTests/SignIn/TrnInUseChooseEmailTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,19 +301,30 @@ public async Task Post_SubmittedEmailDoesNotMatchEnteredOrMatchedEmail_Rerenders
}

[Theory]
[InlineData(false)]
[InlineData(true)]
public async Task Post_ValidRequest_UpdatesUserAndRedirectsToNextPage(bool newEmailChosen)
[InlineData(false, TrnMatchPolicy.Default, TrnVerificationLevel.Low, TrnVerificationLevel.Low)]
[InlineData(false, TrnMatchPolicy.Default, TrnVerificationLevel.Medium, TrnVerificationLevel.Medium)]
[InlineData(false, TrnMatchPolicy.Strict, TrnVerificationLevel.Low, TrnVerificationLevel.Medium)]
[InlineData(false, TrnMatchPolicy.Strict, TrnVerificationLevel.Medium, TrnVerificationLevel.Medium)]
[InlineData(true, TrnMatchPolicy.Default, TrnVerificationLevel.Low, TrnVerificationLevel.Low)]
[InlineData(true, TrnMatchPolicy.Default, TrnVerificationLevel.Medium, TrnVerificationLevel.Medium)]
[InlineData(true, TrnMatchPolicy.Strict, TrnVerificationLevel.Low, TrnVerificationLevel.Medium)]
[InlineData(true, TrnMatchPolicy.Strict, TrnVerificationLevel.Medium, TrnVerificationLevel.Medium)]
public async Task Post_ValidRequest_UpdatesUserAndRedirectsToNextPage(
bool newEmailChosen,
TrnMatchPolicy trnMatchPolicy,
TrnVerificationLevel existingTrnVerificationLevel,
TrnVerificationLevel expectedNewTrnVerificationLevel)
{
// Arrange
var email = Faker.Internet.Email();
var existingTrnOwner = await TestData.CreateUser(hasTrn: true);
var existingTrnOwner = await TestData.CreateUser(hasTrn: true, trnVerificationLevel: existingTrnVerificationLevel);
var chosenEmail = newEmailChosen ? email : existingTrnOwner.EmailAddress;

var authStateHelper = await CreateAuthenticationStateHelper(
c => c.TrnLookupCompletedForExistingTrnAndOwnerEmailVerified(existingTrnOwner, email),
CustomScopes.Trn,
trnRequirementType: null);
trnRequirementType: null,
trnMatchPolicy: trnMatchPolicy);

var request = new HttpRequestMessage(HttpMethod.Post, $"/sign-in/trn/choose-email?{authStateHelper.ToQueryParam()}")
{
Expand All @@ -340,12 +351,13 @@ public async Task Post_ValidRequest_UpdatesUserAndRedirectsToNextPage(bool newEm

Assert.NotNull(user);
Assert.Equal(chosenEmail, user.EmailAddress);
Assert.Equal(expectedNewTrnVerificationLevel, user.TrnVerificationLevel);

return user.UserId;
});

// Should get a UserUpdatedEvent if the email address was changed
if (newEmailChosen)
// Should get a UserUpdatedEvent if the email address or TrnVerificationLevel was changed
if (newEmailChosen || existingTrnVerificationLevel != expectedNewTrnVerificationLevel)
{
EventObserver.AssertEventsSaved(
e =>
Expand All @@ -354,6 +366,18 @@ public async Task Post_ValidRequest_UpdatesUserAndRedirectsToNextPage(bool newEm
Assert.Equal(Clock.UtcNow, userUpdatedEvent.CreatedUtc);
Assert.Equal(UserUpdatedEventSource.TrnMatchedToExistingUser, userUpdatedEvent.Source);
Assert.Equal(userId, userUpdatedEvent.User.UserId);

if (newEmailChosen)
{
Assert.Equal(chosenEmail, userUpdatedEvent.User.EmailAddress);
Assert.True(userUpdatedEvent.Changes.HasFlag(UserUpdatedEventChanges.EmailAddress));
}

if (existingTrnVerificationLevel != expectedNewTrnVerificationLevel)
{
Assert.Equal(expectedNewTrnVerificationLevel, userUpdatedEvent.User.TrnVerificationLevel);
Assert.True(userUpdatedEvent.Changes.HasFlag(UserUpdatedEventChanges.TrnVerificationLevel));
}
});
}
else
Expand Down
Loading