Merge pull request #45 from dragonfruitnetwork/fix-obsolete-symbols

fix redirections not taking place
dragonfruitnetwork · Nov 26, 2022 · 6881c2f · 6881c2f
2 parents 3bfe8d2 + 8cbc4c9
commit 6881c2f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/DragonFruit.Sakura/Administration/AdminLayout.razor b/DragonFruit.Sakura/Administration/AdminLayout.razor
@@ -1,4 +1,6 @@
-@inherits LayoutComponentBase
+@using Microsoft.Extensions.Options
+@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
+@inherits LayoutComponentBase
 @layout DefaultLayout
 
 <SakuraJumbotron>
@@ -34,9 +36,13 @@
     [Inject]
     private NavigationManager Navigation { get; set; }
 
+    [Inject]
+    private IOptionsSnapshot<RemoteAuthenticationOptions<OidcProviderOptions>> OptionsContainer { get; set; }
+
     private void RedirectToLoginPage()
     {
-        Navigation.NavigateTo($"/auth/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
+        var path = OptionsContainer.Get(Options.DefaultName).AuthenticationPaths.LogInPath;
+        Navigation.NavigateToLogin(path);
     }
 
 }
diff --git a/DragonFruit.Sakura/Administration/Index.razor b/DragonFruit.Sakura/Administration/Index.razor
@@ -5,10 +5,17 @@
 <MudContainer MaxWidth="MaxWidth.Large">
     <MudStack>
         <MudPaper Elevation="0" Class="p-4">
-            <MudStack Row="true" AlignItems="AlignItems.Center">
-                <MudText>Welcome Back</MudText>
+            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
+                @if (string.IsNullOrEmpty(Name))
+                {
+                    <MudText>Welcome Back</MudText>
+                }
+                else
+                {
+                    <MudText>Welcome Back, @Name</MudText>
+                }
                 <MudSpacer/>
-                <MudButton EndIcon="@Icons.Rounded.KeyboardArrowRight" Color="Color.Primary" Href="/admin/keychain">Manage Keychain</MudButton>
+                <MudButton EndIcon="@Icons.Rounded.VpnKey" Color="Color.Primary" Href="/admin/keychain">Manage Keychain</MudButton>
             </MudStack>
         </MudPaper>
 

diff --git a/DragonFruit.Sakura/Administration/Index.razor.cs b/DragonFruit.Sakura/Administration/Index.razor.cs
@@ -5,6 +5,7 @@
 using DragonFruit.Sakura.Network;
 using DragonFruit.Sakura.Network.Requests;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Authorization;
 
 namespace DragonFruit.Sakura.Administration
 {
@@ -15,6 +16,10 @@ public partial class Index
         [Inject]
         private ApiClient Client { get; set; }
 
+        [Inject]
+        private AuthenticationStateProvider AuthenticationStateProvider { get; set; }
+
+        private string Name { get; set; }
         private IReadOnlyList<ApiAppInfo> Apps { get; set; }
 
         private AppFeatures SelectedAppFeature
@@ -37,6 +42,7 @@ private AppFeatures SelectedAppFeature
         protected override async Task OnInitializedAsync()
         {
             Apps = await Client.PerformAsync<IReadOnlyList<ApiAppInfo>>(new AdminApiAppsListingRequest()).ConfigureAwait(false);
+            Name = await AuthenticationStateProvider.GetAuthenticationStateAsync().ContinueWith(t => t.Result.User.Identity?.Name).ConfigureAwait(false);
         }
     }
 }
diff --git a/DragonFruit.Sakura/Program.cs b/DragonFruit.Sakura/Program.cs
@@ -49,6 +49,7 @@ public static async Task Main(string[] args)
                 o.ProviderOptions.RedirectUri = "https://dragonfruit.network/auth/login-callback";
 #endif
 
+                o.ProviderOptions.PostLogoutRedirectUri = "/";
                 o.ProviderOptions.DefaultScopes.Add("delegate");
 
                 o.AuthenticationPaths.LogInPath = "/auth/login";