fix failing specflow

Author: StuartFerguson

SecurityService.BusinessLogic/RequestHandlers/UserRequestHandler.cs

@@ -90,7 +90,7 @@ public async Task<Result> Handle(SecurityServiceCommands.CreateUserCommand comma
             };
 
             String passwordValue = String.IsNullOrEmpty(command.Password) ? UserRequestHandler.GenerateRandomPassword(this.UserManager.Options.Password) : command.Password;
-
+            
             // Hash the default password
             newIdentityUser.PasswordHash = this.PasswordHasher.HashPassword(newIdentityUser, passwordValue);
 
@@ -281,6 +281,7 @@ public async Task<Result<ChangeUserPasswordResult>> Handle(SecurityServiceComman
                 return Result.Invalid($"Client not found for clientId {command.ClientId}");
             }
 
+            Logger.LogWarning($"Client uri: {client.ClientUri}");
             return Result.Success(new ChangeUserPasswordResult { IsSuccessful = true, RedirectUri = client.ClientUri});
         }
 
@@ -343,7 +344,6 @@ public async Task<Result<String>> Handle(SecurityServiceCommands.ProcessPassword
                 return Result.Invalid($"Client not found for clientId {command.ClientId}");
             }
 
-            Logger.LogWarning($"Client uri {client.ClientUri}");
             return Result.Success<String>(client.ClientUri);
         }
 

SecurityService.OpenIdConnect.IntegrationTests/ChangePassword/ChangePassword.feature

@@ -25,8 +25,8 @@ Background:
 @PRTest
 Scenario: Change Passwword
 	Given I create the following users
-	| Email Address                | Phone Number | Given Name | Middle Name | Family Name | Claims     | Roles  |
-	| estateuser@testestate1.co.uk | 123456789    | Test       |             | User 1      | EstateId:1 | Estate |
+	| Email Address                | Phone Number | Given Name | Middle Name | Family Name | Claims     | Roles  | Password |
+	| estateuser@testestate1.co.uk | 123456789    | Test       |             | User 1      | EstateId:1 | Estate | 123456   |
 	Then I get an email with a confirm email address link
 	When I navigate to the confirm email address
 	Then I am presented with the confirm email address successful screen
@@ -38,7 +38,7 @@ Scenario: Change Passwword
 	Then I am presented with the privacy screen
 	When I click the 'ChangePassword' link
 	Then I am presented with a change password screen
-	When I enter my old password '123456'
+	When I enter my old password
 	When I enter my new password 'Pa55word!'
 	And I confirm my new password 'Pa55word!'
 	And I click the change password button

SecurityService.OpenIdConnect.IntegrationTests/ChangePassword/ChangePassword.feature.cs

@@ -44,10 +44,16 @@ public async Task ThenIAmPresentedWithAChangePasswordScreen()
             changePasswordButton.ShouldNotBeNull();
         }
 
-        [When(@"I enter my old password '([^']*)'")]
-        public async Task WhenIEnterMyOldPassword(string oldPassword)
+        //[When(@"I enter my old password '([^']*)'")]
+        //public async Task WhenIEnterMyOldPassword(string oldPassword)
+        //{
+        //    this.WebDriver.FillIn("Input.CurrentPassword", oldPassword);
+        //}
+
+        [When("I enter my old password")]
+        public void WhenIEnterMyOldPassword()
         {
-            this.WebDriver.FillIn("Input.CurrentPassword", oldPassword);
+            this.WebDriver.FillIn("Input.CurrentPassword", this.TestingContext.Password);
         }
 
         [When(@"I enter my new password '([^']*)'")]

SecurityService.OpenIdConnect.IntegrationTests/ChangePassword/ChangePasswordSteps.cs

@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using SecurityService.Models;
+using SimpleResults;
 
 namespace IdentityServerHost.Pages.ChangePassword;
 
@@ -64,17 +65,13 @@ public async Task<IActionResult> OnPost(CancellationToken cancellationToken)
             return this.Page();
         }
         SecurityServiceCommands.ChangeUserPasswordCommand command = new(Input.Username, Input.CurrentPassword, Input.NewPassword, Input.ClientId);
-        ChangeUserPasswordResult? result = await this.Mediator.Send(command, cancellationToken);
-
-        Logger.LogDebug(Input.ClientId);
-        Logger.LogDebug(result.IsSuccessful.ToString());
-        Logger.LogDebug(result.RedirectUri);
-        if (result.IsSuccessful== false) {
+        Result<ChangeUserPasswordResult>? result= await this.Mediator.Send(command, cancellationToken);
+        
+        if (result.IsFailed) {
             ModelState.AddModelError(String.Empty, ErrorChangingPassword);
             return this.Page();
         }
-
-        return this.Redirect(result.RedirectUri);
+        return this.Redirect(result.Data.RedirectUri);
     }
 
     private async Task BuildModelAsync(String returnUrl)