Ticket #885 : Fix "reset password"

Fix the URL generated by "ResetController"

Author: habarthierry-hue

formbuilder/FormBuilder/Extensions/HttpRequestExtensions.cs

@@ -13,5 +13,13 @@ public static string GetAbsoluteUriWithVirtualPath(this HttpRequest requestMessa
             var relativePath = requestMessage.PathBase.Value;
             return http + host + relativePath;
         }
+
+        public static string GetAbsoluteUri(this HttpRequest requestMessage)
+        {
+            var host = requestMessage.Host.Value;
+            var http = "http://";
+            if (requestMessage.IsHttps) http = "https://";
+            return http + host;
+        }
     }
 }

formbuilder/FormBuilder/UIs/BaseWorkflowController.cs

@@ -34,7 +34,7 @@ protected async Task<WorkflowViewModel> Get(string realm, string workflowId, str
         var tokenSet = _antiforgery.GetAndStoreTokens(HttpContext);
         return new WorkflowViewModel
         {
-            CurrentStepId= step.Id,
+            CurrentStepId = step.Id,
             Workflow = workflow,
             Template = template,
             AntiforgeryToken = new AntiforgeryTokenRecord

src/IdServer/SimpleIdServer.IdServer.Pwd/UI/ResetController.cs

@@ -3,6 +3,7 @@
 
 using FormBuilder;
 using FormBuilder.Builders;
+using FormBuilder.Helpers;
 using FormBuilder.Models;
 using FormBuilder.Repositories;
 using FormBuilder.Stores;
@@ -45,6 +46,7 @@ public class ResetController : BaseController
     private readonly IRealmStore _realmStore;
     private readonly ITemplateStore _templateStore;
     private readonly IWorkflowHelper _workflowHelper;
+    private readonly IWorkflowLinkHelper _workflowLinkHelper;
     private readonly ILogger<ResetController> _logger;
     private readonly FormBuilderOptions _formBuilderOptions;
 
@@ -65,6 +67,7 @@ public ResetController(
         IRealmStore realmStore,
         ITemplateStore templateStore,
         IWorkflowHelper workflowHelper,
+        IWorkflowLinkHelper workflowLinkHelper,
         ILogger<ResetController> logger,
         IOptions<FormBuilderOptions> formBuilderOptions) : base(tokenRepository, jwtBuilder)
     {
@@ -82,6 +85,7 @@ public ResetController(
         _realmStore = realmStore;
         _templateStore = templateStore;
         _workflowHelper = workflowHelper;
+        _workflowLinkHelper = workflowLinkHelper;
         _logger = logger;
         _formBuilderOptions = formBuilderOptions.Value;
     }
@@ -113,7 +117,7 @@ public async Task<IActionResult> Index([FromRoute] string prefix, [FromQuery] Re
         };
         var result = await BuildWorkflowViewModel(prefix, vm, cancellationToken);
         result.SetInput(viewModel);
-        result.CurrentStepId = _workflowHelper.GetNextAmr(null, result, vm);
+        result.CurrentStepId = _workflowLinkHelper.ResolveNextStep(null, result.Workflow, vm.CurrentLink);
         return View(result);
     }
 
@@ -164,7 +168,7 @@ public async Task<IActionResult> Index([FromRoute] string prefix, ResetPasswordV
         {
             area = Constants.AreaPwd
         });
-        var issuer = Request.GetAbsoluteUriWithVirtualPath();
+        var issuer = Request.GetAbsoluteUri();
         var parameter = new ResetPasswordParameter(
             $"{issuer}{url}", 
             user,