Ticket #890 : It is now possible to change the language, when an error occured during the authentication

Author: habarthierry-hue

formbuilder/FormBuilder/Models/FormRecord.cs

@@ -109,7 +109,19 @@ public override BaseVersionRecord NewDraft(DateTime currentDateTime)
             Status = RecordVersionStatus.Draft,
             Realm = Realm,
             VersionNumber = VersionNumber + 1,
-            Elements = new ObservableCollection<IFormElementRecord>(clonedElements)
+            Elements = new ObservableCollection<IFormElementRecord>(clonedElements),
+            SuccessMessageTranslations = SuccessMessageTranslations?.Select(s => new FormMessageTranslation
+            {
+                Code = s.Code,
+                Language = s.Language,
+                Value = s.Value
+            }).ToList() ?? new List<FormMessageTranslation>(),
+            ErrorMessageTranslations = ErrorMessageTranslations?.Select(s => new FormMessageTranslation
+            {
+                Code = s.Code,
+                Language = s.Language,
+                Value = s.Value
+            }).ToList() ?? new List<FormMessageTranslation>()
         };
     }
 

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

@@ -55,14 +55,15 @@ public WorkflowLayout Get()
                     {
                         Method = HttpMethods.POST,
                         IsAntiforgeryEnabled = true,
-                        Target = "/{realm}/pwd/Authenticate",
+                        Target = "/{realm}/pwd/Authenticate?returnUrl={returnUrl}",
                         Transformers = new List<ITransformerParameters>
                         {
                             new RegexTransformerParameters()
                             {
                                 Rules = new ObservableCollection<MappingRule>
                                 {
-                                    new MappingRule { Source = "$.Realm", Target = "realm" }
+                                    new MappingRule { Source = "$.Realm", Target = "realm" },
+                                    new MappingRule { Source = "$.ReturnUrl", Target = "returnUrl" }
                                 }
                             },
                             new RelativeUrlTransformerParameters()

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

@@ -51,14 +51,15 @@ public static WorkflowBuilder AddPwdAuth(this WorkflowBuilder builder, FormRecor
             {
                 Method = HttpMethods.POST,
                 IsAntiforgeryEnabled = true,
-                Target = "/{realm}/pwd/Authenticate",
+                Target = "/{realm}/pwd/Authenticate?returnUrl={returnUrl}",
                 Transformers = new List<ITransformerParameters>
                 {
                     new RegexTransformerParameters()
                     {
                         Rules = new ObservableCollection<MappingRule>
                         {
-                            new MappingRule { Source = "$.Realm", Target = "realm" }
+                            new MappingRule { Source = "$.Realm", Target = "realm" },
+                            new MappingRule { Source = "$.ReturnUrl", Target = "returnUrl" }
                         }
                     },
                     new RelativeUrlTransformerParameters()

src/IdServer/SimpleIdServer.IdServer/UI/BaseAuthenticateController.cs

@@ -124,7 +124,7 @@ protected bool IsProtected(string returnUrl)
 
     protected string GetClientId(string returnUrl)
     {
-        if(string.IsNullOrWhiteSpace(returnUrl) || IsProtected(returnUrl))
+        if(string.IsNullOrWhiteSpace(returnUrl) || !IsProtected(returnUrl))
         {
             return null;
         }