Ticket #896 : Pass the returnUrl

Author: habarthierry-hue

formbuilder/FormBuilder/Link/Services/WorkflowLinkHttpRequestService.cs

@@ -31,12 +31,32 @@ public WorkflowLinkHttpRequestService(ITransformerFactory transformerFactory, IM
             result.Add(antiforgeryToken.FormField, antiforgeryToken.FormValue);
 
         var target = parameter.Target;
-        if(parameter.Transformers != null)
+        if (parameter.Transformers != null)
         {
             foreach (var transformer in parameter.Transformers)
                 target = _transformerFactory.Transform(target, transformer, json)?.ToString();
         }
 
+        if (Uri.TryCreate(target, UriKind.RelativeOrAbsolute, out var uri))
+        {
+            var query = uri.Query;
+            if (!string.IsNullOrEmpty(query))
+            {
+                var queryParams = System.Web.HttpUtility.ParseQueryString(query);
+                foreach (string key in queryParams.AllKeys)
+                {
+                    if (!string.IsNullOrEmpty(key))
+                    {
+                        result[key] = queryParams[key];
+                    }
+                }
+
+                target = uri.IsAbsoluteUri
+                    ? $"{uri.Scheme}://{uri.Authority}{uri.AbsolutePath}"
+                    : uri.GetLeftPart(UriPartial.Path);
+            }
+        }
+
         result.Add(nameof(IStepViewModel.StepId), stepId);
         result.Add(nameof(IStepViewModel.WorkflowId), workflowId);
         result.Add(nameof(IStepViewModel.CurrentLink), currentLink);

src/IdServer/SimpleIdServer.IdServer.Pwd/IdServerBuilderExtensions.cs

@@ -40,6 +40,9 @@ public static IdServerBuilder AddPwdAuthentication(this IdServerBuilder idServer
         idServerBuilder.Services.AddTransient<IDataSeeder, UpdatePwdTranslationsDataseeder>();
         idServerBuilder.Services.AddTransient<IDataSeeder, InitPwdConfigurationDefDataseeder>();
         idServerBuilder.Services.AddTransient<IDataSeeder, UpdatePwdFormDataseeder>();
+        idServerBuilder.Services.AddTransient<IDataSeeder, UpdatePwdWorkflows4Dataseeder>();
+        idServerBuilder.Services.AddTransient<IDataSeeder, AddMissingResetTmpPwdAuthDataseeder>();
+        idServerBuilder.Services.AddTransient<IDataSeeder, TransformNulltranslationToEmptyArrayDataseeder>();
         idServerBuilder.Services.AddTransient<IFakerDataService, PwdAuthFakerService>();
         idServerBuilder.Services.AddTransient<IPasswordValidationService, PasswordValidationService>();
         idServerBuilder.AutomaticConfigurationOptions.Add(typeof(IdServerPasswordOptions));

src/IdServer/SimpleIdServer.IdServer.Pwd/Migrations/AddMissingResetTmpPwdAuthDataseeder.cs

@@ -0,0 +1,41 @@
+// Copyright (c) SimpleIdServer. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+using DataSeeder;
+using FormBuilder.Repositories;
+using FormBuilder.Stores;
+using SimpleIdServer.IdServer.DataSeeder;
+using SimpleIdServer.IdServer.Stores;
+
+namespace SimpleIdServer.IdServer.Pwd.Migrations
+{
+    public class AddMissingResetTmpPwdAuthDataseeder : BaseAuthDataSeeder
+    {
+        private readonly ITransactionBuilder _transactionBuilder;
+
+        public AddMissingResetTmpPwdAuthDataseeder(
+            ITransactionBuilder transactionBuilder,
+            IRegistrationWorkflowRepository registrationWorkflowRepository,
+            IAuthenticationContextClassReferenceRepository acrRepository,
+            IDataSeederExecutionHistoryRepository dataSeederExecutionHistoryRepository,
+            IFormStore formStore,
+            IWorkflowStore workflowStore,
+            IRealmRepository realmRepository) : base(acrRepository, dataSeederExecutionHistoryRepository, formStore, workflowStore, realmRepository)
+        {
+            _transactionBuilder = transactionBuilder;
+        }
+
+
+        public override string Name => nameof(AddMissingResetTmpPwdAuthDataseeder);
+
+        protected override async Task Execute(CancellationToken cancellationToken)
+        {
+            using (var transaction = _transactionBuilder.Build())
+            {
+                await TryAddForm(Constants.DefaultRealm, StandardPwdAuthForms.ResetTemporaryPasswordForm, cancellationToken);
+                await transaction.Commit(cancellationToken);
+                await Commit(cancellationToken);
+            }
+        }
+    }
+}

src/IdServer/SimpleIdServer.IdServer.Pwd/Migrations/TransformNulltranslationToEmptyArrayDataseeder.cs

@@ -0,0 +1,50 @@
+// Copyright (c) SimpleIdServer. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+using DataSeeder;
+using FormBuilder.Models;
+using FormBuilder.Stores;
+using SimpleIdServer.IdServer.Stores;
+
+namespace SimpleIdServer.IdServer.Pwd.Migrations
+{
+    public class TransformNulltranslationToEmptyArrayDataseeder : BaseAfterDeploymentDataSeeder
+    {
+        private readonly ITransactionBuilder _transactionBuilder;
+        private readonly IFormStore _formStore;
+
+        public TransformNulltranslationToEmptyArrayDataseeder(
+            ITransactionBuilder transactionBuilder,
+            IFormStore formStore,
+            IDataSeederExecutionHistoryRepository dataSeederExecutionHistoryRepository) : base(dataSeederExecutionHistoryRepository)
+        {
+            _transactionBuilder = transactionBuilder;
+            _formStore = formStore;
+        }
+
+
+        public override string Name => nameof(TransformNulltranslationToEmptyArrayDataseeder);
+
+        protected override async Task Execute(CancellationToken cancellationToken)
+        {
+            using (var transaction = _transactionBuilder.Build())
+            {
+                var forms = await _formStore.GetAll(Constants.DefaultRealm, cancellationToken);
+                foreach (var form in forms)
+                {
+                    if (form.SuccessMessageTranslations == null)
+                    {
+                        form.SuccessMessageTranslations = new List<FormMessageTranslation>();
+                    }
+
+                    if(form.ErrorMessageTranslations == null)
+                    {
+                        form.ErrorMessageTranslations = new List<FormMessageTranslation>();
+                    }
+                }
+
+                await transaction.Commit(cancellationToken);
+                await _formStore.SaveChanges(cancellationToken);
+            }
+        }
+    }
+}

src/IdServer/SimpleIdServer.IdServer.Pwd/Migrations/UpdatePwdWorkflowsDataseeder.cs

@@ -0,0 +1,53 @@
+// Copyright (c) SimpleIdServer. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+using DataSeeder;
+using FormBuilder.Builders;
+using FormBuilder.Models;
+using FormBuilder.Repositories;
+using SimpleIdServer.IdServer.Stores;
+
+namespace SimpleIdServer.IdServer.Pwd.Migrations
+{
+    public class UpdatePwdWorkflowsDataseeder : BaseAfterDeploymentDataSeeder
+    {
+        private readonly ITransactionBuilder _transactionBuilder;
+        private readonly IWorkflowStore _workflowStore;
+
+        public UpdatePwdWorkflowsDataseeder(
+            ITransactionBuilder transactionBuilder,
+            IWorkflowStore workflowStore,
+            IDataSeederExecutionHistoryRepository dataSeederExecutionHistoryRepository) : base(dataSeederExecutionHistoryRepository)
+        {
+            _transactionBuilder = transactionBuilder;
+            _workflowStore = workflowStore;
+        }
+
+
+        public override string Name => nameof(UpdatePwdWorkflowsDataseeder);
+
+        protected override async Task Execute(CancellationToken cancellationToken)
+        {
+            using (var transaction = _transactionBuilder.Build())
+            {
+                await TryUpdate(Constants.DefaultRealm, StandardPwdAuthWorkflows.DefaultPwdWorkflow, cancellationToken);
+                await TryUpdate(Constants.DefaultRealm, StandardPwdAuthWorkflows.DefaultConfirmResetPwdWorkflow, cancellationToken);
+                await TryUpdate(Constants.DefaultRealm, StandardPwdAuthWorkflows.DefaultCompletePwdAuthWorkflow, cancellationToken);
+                await transaction.Commit(cancellationToken);
+            }
+        }
+
+        private async Task TryUpdate(string realm, WorkflowRecord workflowRecord, CancellationToken cancellationToken)
+        {
+            var existingWorkflow = await _workflowStore.Get(realm, workflowRecord.Id, cancellationToken);
+            if (existingWorkflow == null)
+            {
+                return;
+            }
+
+            existingWorkflow.Steps = workflowRecord.Steps;
+            existingWorkflow.Links = workflowRecord.Links;
+            await _workflowStore.SaveChanges(cancellationToken);
+        }
+    }
+}

src/IdServer/SimpleIdServer.IdServer.Pwd/PwdAuthWorkflowLayout.cs

@@ -147,7 +147,7 @@ public WorkflowLayout Get()
                     ActionParameter = JsonSerializer.Serialize(new WorkflowLinkHttpRequestParameter
                     {
                         Method = HttpMethods.GET,
-                        Target = "/{realm}/pwd/Reset",
+                        Target = "/{realm}/pwd/Reset?returnUrl={returnUrl}",
                         Transformers = new List<ITransformerParameters>
                         {
                             new RegexTransformerParameters()

src/IdServer/SimpleIdServer.IdServer.Pwd/StandardPwdAuthWorkflows.cs

@@ -95,7 +95,7 @@ public static WorkflowBuilder AddPwdAuth(this WorkflowBuilder builder, FormRecor
             .AddLinkHttpRequestAction(StandardPwdAuthForms.PwdForm, resetStep ?? FormBuilder.Constants.EmptyStep, StandardPwdAuthForms.pwdForgetBtnId, "Forget", new WorkflowLinkHttpRequestParameter
             {
                 Method = HttpMethods.GET,
-                Target = "/{realm}/pwd/Reset",
+                Target = "/{realm}/pwd/Reset?returnUrl={returnUrl}",
                 Transformers = new List<ITransformerParameters>
                 {
                     new RegexTransformerParameters()