fix verification flow

josxha · Nov 3, 2023 · 56374c0 · 56374c0
1 parent de660c4
commit 56374c0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/KratosSelfService/Controllers/VerificationController.cs b/KratosSelfService/Controllers/VerificationController.cs
@@ -1,3 +1,4 @@
+using KratosSelfService.Models;
 using KratosSelfService.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -43,7 +44,7 @@ public async Task<IActionResult> Verification(
         }
 
         // check for custom messages in the query string
-        if (string.IsNullOrWhiteSpace(jsonMessages))
+        if (!string.IsNullOrWhiteSpace(jsonMessages))
             try
             {
                 var messages = JsonConvert.DeserializeObject<List<KratosUiText>>(jsonMessages);
@@ -55,6 +56,7 @@ public async Task<IActionResult> Verification(
                     jsonMessages);
             }
 
-        return View("Verification", flow);
+        var model = new VerificationModel(flow);
+        return View("Verification", model);
     }
 }
diff --git a/KratosSelfService/Models/models.cs b/KratosSelfService/Models/models.cs
@@ -41,6 +41,16 @@ public record VerificationModel(
     KratosVerificationFlow flow
 );
 
+public enum FlowType
+{
+    Settings,
+    Login,
+    Logout,
+    Registration,
+    Recovery,
+    Verification
+}
+
 public record KratosUiTextMessageModel(
     KratosUiText UiText,
     string Content,
@@ -53,12 +63,3 @@ public record KratosUiNodeModel(
     string? forgotPasswordUrl = null
 );
 
-public enum FlowType
-{
-    Settings,
-    Login,
-    Logout,
-    Registration,
-    Recovery,
-    Verification
-}
diff --git a/KratosSelfService/Views/Verification/Verification.cshtml b/KratosSelfService/Views/Verification/Verification.cshtml
@@ -1,20 +1,20 @@
-@model KratosVerificationFlow
+@model VerificationModel
 @{
     ViewData["Title"] = OryTranslator.Get("verification.title");
     Layout = "_CardLayout";
 }
 
 <h1 class="title has-text-centered">@OryTranslator.Get("verification.title")</h1>
 <hr/>
-<form method="@Model.Ui.Method.ToLower()" action="@Model.Ui.Action">
-    @if (Model.Ui.Messages != null)
+<form method="@Model.flow.Ui.Method.ToLower()" action="@Model.flow.Ui.Action">
+    @if (Model.flow.Ui.Messages != null)
     {
-        foreach (var message in Model.Ui.Messages)
+        foreach (var message in Model.flow.Ui.Messages)
         {
             @await Component.InvokeAsync("KratosUiTextMessage", message)
         }
     }
-    @foreach (var node in Model.Ui.Nodes)
+    @foreach (var node in Model.flow.Ui.Nodes)
     {
         var model = new KratosUiNodeModel(node, FlowType.Verification);
         @await Component.InvokeAsync("KratosUiNodeInput", model)