Fix the registration workflow

Author: habarthierry-hue

src/IdServer/SimpleIdServer.IdServer/Helpers/WorkflowHelper.cs

@@ -44,7 +44,7 @@ public string GetNextAmr<TViewModel>(JsonObject input, WorkflowViewModel result,
 
     public string GetNextAmr<TViewModel>(JsonObject input, WorkflowRecord workflow, List<FormRecord> records, string activeLink)
     {
-        var targetFormRecordId = GetTargetFormRecordId(input, workflow, activeLink);
+        var targetFormRecordId = GetTargetFormRecordId(input, workflow, activeLink).FormRecordCorrelationId;
         if (targetFormRecordId == FormBuilder.Constants.EmptyStep.CorrelationId) return FormBuilder.Constants.EmptyStep.Name;
         var formRecord = records.Single(rec => rec.CorrelationId == targetFormRecordId);
         return formRecord.Name;
@@ -73,7 +73,7 @@ public string GetNextAmr(JsonObject input, WorkflowRecord workflow, List<FormRec
     public string GetTargetFormRecordId<TViewModel>(JsonObject input, WorkflowRecord workflow, TViewModel viewModel) 
         where TViewModel : ISidStepViewModel
     {
-        return GetTargetFormRecordId(input, workflow, viewModel.CurrentLink);
+        return GetTargetFormRecordId(input, workflow, viewModel.CurrentLink).Id;
     }
 
     public static List<string> ExtractAmrs(WorkflowRecord workflow, List<FormRecord> forms)
@@ -91,9 +91,9 @@ public static List<string> ExtractAmrs(WorkflowRecord workflow, List<FormRecord>
     public static bool IsLastStep(string stepName)
         => stepName == FormBuilder.Constants.EmptyStep.Name;
 
-    private string GetTargetFormRecordId(JsonObject input, WorkflowRecord workflow, string activeLink)
+    private WorkflowStep GetTargetFormRecordId(JsonObject input, WorkflowRecord workflow, string activeLink)
     {
         var stepId = _workflowLinkHelper.ResolveNextStep(input, workflow, activeLink);
-        return workflow.Steps.Single(s => s.Id == stepId).FormRecordCorrelationId;
+        return workflow.Steps.Single(s => s.Id == stepId);
     }
 }

src/IdServer/SimpleIdServer.IdServer/UI/RegistrationController.cs

@@ -61,7 +61,9 @@ public async Task<IActionResult> Index([FromRoute] string prefix, string? workfl
 		var cookieName = _options.GetRegistrationCookieName(_realmStore.Realm);
 		var allForms = await _formStore.GetLatestPublishedVersionByCategory(prefix, FormCategories.Registration, CancellationToken.None);
 		var registrationProgressId = Guid.NewGuid().ToString();
-		var workflowSteps = workflow.Steps.Select(s => allForms.Single(f => f.CorrelationId == s.FormRecordCorrelationId)).Where(s => s.ActAsStep);
+		var workflowSteps = workflow.Steps
+			.Where(s => s.FormRecordCorrelationId != FormBuilder.Constants.EmptyStep.CorrelationId)
+			.Select(s => allForms.Single(f => f.CorrelationId == s.FormRecordCorrelationId));
 		var amr = workflowSteps.First().Name;
         var registrationProgress = new UserRegistrationProgress 
 		{