fix warnings

josxha · Jan 10, 2024 · 133ddcd · 133ddcd
1 parent 0ccc6d4
commit 133ddcd
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 54 deletions.
diff --git a/KratosSelfService/Controllers/LoginController.cs b/KratosSelfService/Controllers/LoginController.cs
@@ -35,7 +35,7 @@ public async Task<IActionResult> Login(
 
                 Console.WriteLine(cookie);
             }
-            if (Request.Headers.Cookie.Any(s => s.Contains("ory_kratos_session=")))
+            if (Request.Headers.Cookie.Any(s => s?.Contains("ory_kratos_session=") ?? false))
                 return Redirect("logout");
             // initiate flow
             return Redirect(GetInitFlowUrl(aal, refresh, returnTo, organization, loginChallenge));
@@ -122,16 +122,14 @@ private async Task<IActionResult> RedirectToVerificationFlow(KratosLoginFlow flo
                 .CreateBrowserVerificationFlowWithHttpInfoAsync(flow.ReturnTo);
             var verificationFlow = response.Data;
             // we need the csrf cookie from the verification flow
-            Response.Headers.Add(HeaderNames.SetCookie, response.Headers[HeaderNames.SetCookie].ToString());
+            Response.Headers.Append(HeaderNames.SetCookie, response.Headers[HeaderNames.SetCookie].ToString());
             // encode the verification flow id in the query parameters
             var paramDict = new Dictionary<string, string?>
             {
                 ["flow"] = verificationFlow.Id,
                 ["message"] = flow.Ui.Messages.ToString()
             };
             var parameters = paramDict.EncodeQueryString();
-            var segments = new Uri(Request.Path).Segments;
-            var baseUrl = string.Join("/", segments[..^1]);
 
             var url = $"{Request.PathBase}/verification?{parameters}";
             return Redirect(url);

diff --git a/KratosSelfService/Extensions/TraitsExt.cs b/KratosSelfService/Extensions/TraitsExt.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json.Linq;
 
-namespace OryAdmin.Extensions;
+namespace KratosSelfService.Extensions;
 
 public static class TraitsExt
 {

diff --git a/KratosSelfService/OryElementsTranslator.cs b/KratosSelfService/OryElementsTranslator.cs
@@ -1,5 +1,4 @@
-using System.Globalization;
-using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Localization;
 using Newtonsoft.Json.Linq;
 using Ory.Kratos.Client.Model;
 

diff --git a/KratosSelfService/ViewComponents/KratosUiComponent.cs b/KratosSelfService/ViewComponents/KratosUiComponent.cs
@@ -7,7 +7,7 @@ namespace KratosSelfService.ViewComponents;
 
 public class KratosUiComponent : ViewComponent
 {
-    public async Task<ViewViewComponentResult> InvokeAsync(KratosUiArgs args)
+    public Task<ViewViewComponentResult> InvokeAsync(KratosUiArgs args)
     {
         var nodeGroups = new Dictionary<KratosUiNode.GroupEnum, List<KratosUiNode>>();
         foreach (var node in args.ui.Nodes)
@@ -22,11 +22,11 @@ public async Task<ViewViewComponentResult> InvokeAsync(KratosUiArgs args)
         foreach (var hiddenGroup in args.hiddenGroups ?? [])
             nodeGroups.Remove(hiddenGroup);
 
-        return View("Default", new KratosUiModel(
+        return Task.FromResult(View("Default", new KratosUiModel(
             args.ui,
             args.flowType,
             nodeGroups,
             defaultGroup,
-            args.forgotPasswordUrl));
+            args.forgotPasswordUrl)));
     }
 }
diff --git a/KratosSelfService/ViewComponents/KratosUiNodeComponent.cs b/KratosSelfService/ViewComponents/KratosUiNodeComponent.cs
@@ -7,12 +7,12 @@ namespace KratosSelfService.ViewComponents;
 
 public class KratosUiNodeComponent : ViewComponent
 {
-    public async Task<ViewViewComponentResult> InvokeAsync(KratosUiNodeArgs args)
+    public Task<ViewViewComponentResult> InvokeAsync(KratosUiNodeArgs args)
     {
         switch (args.node.Type)
         {
             case KratosUiNode.TypeEnum.Text:
-                return View("Text", args);
+                return Task.FromResult(View("Text", args));
             case KratosUiNode.TypeEnum.Input:
                 switch (args.node.Attributes.GetKratosUiNodeInputAttributes().Type)
                 {
@@ -25,29 +25,29 @@ public async Task<ViewViewComponentResult> InvokeAsync(KratosUiNodeArgs args)
                     case KratosUiNodeInputAttributes.TypeEnum.DatetimeLocal:
                     case KratosUiNodeInputAttributes.TypeEnum.Date:
                     case KratosUiNodeInputAttributes.TypeEnum.Url:
-                        return View("InputField", args);
+                        return Task.FromResult(View("InputField", args));
                     case KratosUiNodeInputAttributes.TypeEnum.Checkbox:
-                        return View("InputCheckbox", args);
+                        return Task.FromResult(View("InputCheckbox", args));
                     case KratosUiNodeInputAttributes.TypeEnum.Submit:
                         var inputAttr = args.node.Attributes.GetKratosUiNodeInputAttributes();
                         if (args.FlowType != FlowType.Settings 
                             && inputAttr.Type == KratosUiNodeInputAttributes.TypeEnum.Submit
                             && inputAttr.Name == "provider") 
-                            return View("InputSubmitOidc", args);
-                        return View("InputSubmit", args);
+                            return Task.FromResult(View("InputSubmitOidc", args));
+                        return Task.FromResult(View("InputSubmit", args));
                     case KratosUiNodeInputAttributes.TypeEnum.Button:
-                        return View("InputButton", args);
+                        return Task.FromResult(View("InputButton", args));
                     default:
-                        return View("InputDefault", args);
+                        return Task.FromResult(View("InputDefault", args));
                 }
             case KratosUiNode.TypeEnum.Img:
-                return View("Image", args);
+                return Task.FromResult(View("Image", args));
             case KratosUiNode.TypeEnum.A:
-                return View("Anchor", args);
+                return Task.FromResult(View("Anchor", args));
             case KratosUiNode.TypeEnum.Script:
-                return View("Script", args);
+                return Task.FromResult(View("Script", args));
             default:
-                return View("Default", args);
+                return Task.FromResult(View("Default", args));
         }
     }
 }
diff --git a/KratosSelfService/ViewComponents/KratosUiTextMessageComponent.cs b/KratosSelfService/ViewComponents/KratosUiTextMessageComponent.cs
@@ -7,11 +7,11 @@ namespace KratosSelfService.ViewComponents;
 
 public class KratosUiTextMessageComponent(IOryElementsTranslator oryTranslator) : ViewComponent
 {
-    public async Task<ViewViewComponentResult> InvokeAsync(KratosUiText uiText)
+    public Task<ViewViewComponentResult> InvokeAsync(KratosUiText uiText)
     {
         var content = oryTranslator.ForUiText(uiText);
         var model = new KratosUiTextMessageModel(uiText, content!, GetCssClass(uiText.Type));
-        return View("Default", model);
+        return Task.FromResult(View("Default", model));
     }
 
     private static string GetCssClass(KratosUiText.TypeEnum type)

diff --git a/KratosSelfService/ViewComponents/KratosUiTextMessages.cs b/KratosSelfService/ViewComponents/KratosUiTextMessages.cs
@@ -6,8 +6,8 @@ namespace KratosSelfService.ViewComponents;
 
 public class KratosUiTextMessages : ViewComponent
 {
-    public async Task<ViewViewComponentResult> InvokeAsync(List<KratosUiText>? model)
+    public Task<ViewViewComponentResult> InvokeAsync(List<KratosUiText>? model)
     {
-        return View("Default", model);
+        return Task.FromResult(View("Default", model));
     }
 }
diff --git a/KratosSelfService/Views/Home/Profile.cshtml b/KratosSelfService/Views/Home/Profile.cshtml
@@ -1,5 +1,5 @@
 @using Newtonsoft.Json.Linq
-@using OryAdmin.Extensions
+@using KratosSelfService.Extensions
 @model ProfileModel
 @{
     ViewData["Title"] = CustomTranslator.Get("profile.title");

diff --git a/KratosSelfService/Views/Shared/Components/KratosUiComponent/Default.cshtml b/KratosSelfService/Views/Shared/Components/KratosUiComponent/Default.cshtml
@@ -1,6 +1,6 @@
 @model KratosUiModel
 
-@foreach (var (group, nodes) in Model.nodeGroups)
+@foreach (var (_, nodes) in Model.nodeGroups)
 {
     <form class="mb-3" action="@Model.ui.Action" method="@Model.ui.Method">
         @foreach (var node in Model.defaultGroup)

diff --git a/KratosSelfService/Views/Shared/Components/KratosUiNodeComponent/InputSubmitOidc.cshtml b/KratosSelfService/Views/Shared/Components/KratosUiNodeComponent/InputSubmitOidc.cshtml
@@ -2,7 +2,6 @@
 
 @{
     var attributes = Model.node.Attributes.GetKratosUiNodeInputAttributes();
-    var uiText = attributes.Label ?? Model.node.Meta.Label;
 }
 
 <div class="column is-half">

diff --git a/OryAdmin/Components/Pages/Identities/Messages/Index.razor b/OryAdmin/Components/Pages/Identities/Messages/Index.razor
@@ -1,6 +1,5 @@
 @page "/identities/messages"
 @rendermode InteractiveServer
-@inject NavigationManager nav
 
 <PageTitle>Message Log | OryAdmin</PageTitle>
 
@@ -28,7 +27,7 @@ else
             </tr>
             </thead>
             <tbody>
-            @foreach (var message in _messages!)
+            @foreach (var message in _messages)
             {
                 <tr>
                     <td>

diff --git a/OryAdmin/Components/Pages/Identities/Messages/Index.razor.cs b/OryAdmin/Components/Pages/Identities/Messages/Index.razor.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Web;
 using Ory.Kratos.Client.Model;
 using OryAdmin.Services;
 
@@ -8,13 +7,12 @@ namespace OryAdmin.Components.Pages.Identities.Messages;
 public partial class Index : ComponentBase
 {
     private bool _isLoading = true;
-    private List<KratosMessage> _messages;
+    private List<KratosMessage>? _messages;
 
     [SupplyParameterFromQuery(Name = "page")]
     // ReSharper disable once AutoPropertyCanBeMadeGetOnly.Local
     private int PageNr { get; set; } = 1;
 
-    [Inject] private IdentitySchemaService SchemaService { get; set; } = default!;
     [Inject] private ApiService ApiService { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
@@ -24,9 +22,4 @@ protected override async Task OnInitializedAsync()
 
         _isLoading = false;
     }
-
-    private void RefreshPage(MouseEventArgs arg)
-    {
-        nav.Refresh(true);
-    }
 }
diff --git a/OryAdmin/Components/Pages/Identities/Schemas/Index.razor.cs b/OryAdmin/Components/Pages/Identities/Schemas/Index.razor.cs
@@ -16,7 +16,6 @@ public partial class Index
     private string? SchemaId { get; set; }
 
     [Inject] private ApiService ApiService { get; set; } = default!;
-    [Inject] private IdentitySchemaService SchemaService { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
@@ -33,6 +32,6 @@ protected override async Task OnInitializedAsync()
 
     protected override void OnParametersSet()
     {
-        _selectedSchema = _schemas?.First(schema => schema.Id == SchemaId);
+        _selectedSchema = _schemas?.FirstOrDefault(schema => schema.Id == SchemaId);
     }
 }
diff --git a/OryAdmin/Components/Pages/Identities/Users/Edit.razor.cs b/OryAdmin/Components/Pages/Identities/Users/Edit.razor.cs
@@ -26,11 +26,6 @@ protected override async Task OnInitializedAsync()
         _isLoading = false;
     }
 
-    private void Cancel()
-    {
-        nav.NavigateTo($"identities/users/{UserId}");
-    }
-
     private async Task SubmitForm()
     {
         var updateBody = new KratosUpdateIdentityBody(traits: _json, schemaId: _identity!.SchemaId);
@@ -46,8 +41,4 @@ private async Task SubmitForm()
 
         nav.NavigateTo($"identities/users/{UserId}");
     }
-
-    private void UpdateValue(JSchema schema, ChangeEventArgs args)
-    {
-    }
 }
diff --git a/OryAdmin/Components/Pages/Identities/Users/Index.razor.cs b/OryAdmin/Components/Pages/Identities/Users/Index.razor.cs
@@ -13,7 +13,6 @@ public partial class Index
     // ReSharper disable once UnusedAutoPropertyAccessor.Local
     private int PageNr { get; set; }
 
-    [Inject] private IdentitySchemaService SchemaService { get; set; } = default!;
     [Inject] private ApiService ApiService { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()

diff --git a/OryAdmin/Components/Pages/Identities/Users/Sessions.razor b/OryAdmin/Components/Pages/Identities/Users/Sessions.razor
@@ -1,7 +1,6 @@
 @page "/identities/users/{UserId}/sessions"
 @using UAParser
 @rendermode InteractiveServer
-@inject NavigationManager nav
 
 <PageTitle>View Identity | OryAdmin</PageTitle>
 

diff --git a/OryAdmin/Components/Pages/Identities/Users/Sessions.razor.cs b/OryAdmin/Components/Pages/Identities/Users/Sessions.razor.cs
@@ -14,7 +14,6 @@ public partial class Sessions
     private bool _showDeleteSessionsModal;
     [Parameter] public string? UserId { get; set; }
     [Inject] private ApiService ApiService { get; set; } = default!;
-    [Inject] private EnvService EnvService { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {

diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor b/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor
@@ -1,6 +1,5 @@
 @page "/oauth2/clients/create"
 @rendermode InteractiveServer
-@inject NavigationManager nav
 
 <PageTitle>Create Client | OryAdmin</PageTitle>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     @{
         var attributes = Model.node.Attributes.GetKratosUiNodeInputAttributes();
-        var uiText = attributes.Label ?? Model.node.Meta.Label;
     }
     <div class="column is-half">
@@ Expand Down @@