Skip to content

last round of fixes for now #1007

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

Merged
StuartFerguson merged 4 commits into from
Oct 8, 2025
Merged

last round of fixes for now #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee85608
last round of fixes for now
StuartFerguson Oct 7, 2025
cfd0ddf
Merge branch 'master' into codacy/todo_fixes
StuartFerguson Oct 8, 2025
a316b75
fix broken tests
StuartFerguson Oct 8, 2025
f15e6c6
Merge branch 'codacy/todo_fixes' of ssh://github.com/TransactionProce…
StuartFerguson Oct 8, 2025
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
8 changes: 4 additions & 4 deletions SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
confirmationToken = UrlEncoder.Default.Encode(confirmationToken);
String uri = $"{this.ServiceOptions.PublicOrigin}/Account/EmailConfirmation/Confirm?userName={newIdentityUser.UserName}&confirmationToken={confirmationToken}";

TokenResponse token = await this.GetToken(cancellationToken);
TokenResponse token = await this.GetToken();
SendEmailRequest emailRequest = this.BuildEmailConfirmationRequest(newIdentityUser, uri);
sendEmailResult = await this.MessagingServiceClient.SendEmail(token.AccessToken, emailRequest, cancellationToken);
if (sendEmailResult.IsFailed)
Expand Down Expand Up @@ -368,7 +368,7 @@
resetToken = UrlEncoder.Default.Encode(resetToken);
String uri = $"{this.ServiceOptions.PublicOrigin}/Account/ForgotPassword/Confirm?userName={user.UserName}&resetToken={resetToken}&clientId={command.ClientId}";

TokenResponse token = await this.GetToken(cancellationToken);
TokenResponse token = await this.GetToken();
SendEmailRequest emailRequest = this.BuildPasswordResetEmailRequest(user, uri);

Result result = await this.MessagingServiceClient.SendEmail(token.AccessToken, emailRequest, cancellationToken);
Expand All @@ -387,7 +387,7 @@
await this.UserManager.AddPasswordAsync(i, generatedPasswordResult.Data);

// Send Email
TokenResponse token = await this.GetToken(cancellationToken);
TokenResponse token = await this.GetToken();
SendEmailRequest emailRequest = this.BuildWelcomeEmail(i.Email, generatedPasswordResult.Data);
Result result = await this.MessagingServiceClient.SendEmail(token.AccessToken, emailRequest, cancellationToken);
if (result.IsFailed)
Expand Down Expand Up @@ -497,7 +497,7 @@
return roles.ToList();
}

private async Task<TokenResponse> GetToken(CancellationToken cancellationToken){
private async Task<TokenResponse> GetToken(){
// Get a token to talk to the estate service
String clientId = this.ServiceOptions.ClientId;
String clientSecret = this.ServiceOptions.ClientSecret;
Expand Down Expand Up @@ -527,7 +527,7 @@

public static class PasswordGenerator
{
public static Result<string> GenerateRandomPassword(PasswordOptions? opts = null)

Check warning on line 530 in SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

View workflow job for this annotation

GitHub Actions / Build and Unit Test Pull Requests - Firefox UI 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 530 in SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

View workflow job for this annotation

GitHub Actions / Build and Unit Test Pull Requests - Non UI 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
{
opts ??= DefaultOptions();

Expand Down
6 changes: 4 additions & 2 deletions SecurityService.UnitTests/ModelFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,8 @@ public void ModelFactory_ConvertFrom_ListUserDetails_ListIsEmpty_NullReturned()

List<DataTransferObjects.Responses.UserDetails> userDetailsDtoList = modelFactory.ConvertFrom(userDetailsModelList);

userDetailsDtoList.ShouldBeNull();
userDetailsDtoList.ShouldNotBeNull();
userDetailsDtoList.ShouldBeEmpty();
}

[Fact]
Expand All @@ -435,7 +436,8 @@ public void ModelFactory_ConvertFrom_ListUserDetails_ListIsNull_NullReturned()

List<DataTransferObjects.Responses.UserDetails> userDetailsDtoList = modelFactory.ConvertFrom(userDetailsModelList);

userDetailsDtoList.ShouldBeNull();
userDetailsDtoList.ShouldNotBeNull();
userDetailsDtoList.ShouldBeEmpty();
}

[Fact]
Expand Down
1 change: 1 addition & 0 deletions SecurityService.UserInterface/Pages/Account/AccessDenied.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ public class AccessDeniedModel : PageModel
{
public void OnGet()
{
// No special processing required
}
}
2 changes: 1 addition & 1 deletion SecurityService.UserInterface/Pages/Account/Login/Index.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public async Task<IActionResult> OnPost()
else
{
// user might have clicked on a malicious link - should be logged
throw new Exception("invalid return URL");
throw new ArgumentException("invalid return URL");
}
}

Expand Down
2 changes: 1 addition & 1 deletion SecurityService/Factories/ModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public List<UserDetails> ConvertFrom(List<Models.UserDetails> model)
{
if (model == null || model.Any() == false)
{
return null;
return new List<UserDetails>();
}

List<UserDetails> userDetailsList = new List<UserDetails>();
Expand Down
Loading