Fix front end authorization being non-existent

CorruptComputer · Nov 9, 2024 · 7db5d5d · 7db5d5d
1 parent 111a123
commit 7db5d5d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 17 deletions.
diff --git a/Docs/Bones Docs/.obsidian/workspace.json b/Docs/Bones Docs/.obsidian/workspace.json
@@ -13,12 +13,12 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Development/Deployment of Frontend on Cloudflare Pages.md",
+                "file": "Development/Deployment of Backend on Fedora Server.md",
                 "mode": "source",
                 "source": true
               },
               "icon": "lucide-file",
-              "title": "Deployment of Frontend on Cloudflare Pages"
+              "title": "Deployment of Backend on Fedora Server"
             }
           }
         ]
@@ -166,8 +166,8 @@
   },
   "active": "63538227fcb0a17d",
   "lastOpenFiles": [
-    "Development/Deployment of Backend on Fedora Server.md",
     "Development/Deployment of Frontend on Cloudflare Pages.md",
+    "Development/Deployment of Backend on Fedora Server.md",
     "Development/Feature Areas/Account Management.md",
     "Development/Overview.md",
     "Development/Feature Areas/Asset Management.md",

diff --git a/Frontend/Bones.WebUI.Leaflet/Models/GridLayer.cs b/Frontend/Bones.WebUI.Leaflet/Models/GridLayer.cs
@@ -36,5 +36,5 @@ public abstract class GridLayer : Layer
     /// <summary>
     /// If set, tiles will only be loaded inside the set.
     /// </summary>
-    public ValueTuple<LatLon, LatLon>? Bounds { get; set; }
+    public (LatLon, LatLon)? Bounds { get; set; }
 }
diff --git a/Frontend/Bones.WebUI/Components/Auth/RedirectToLogin.razor b/Frontend/Bones.WebUI/Components/Auth/RedirectToLogin.razor
@@ -1,5 +1,3 @@
-<!-- Adding this here lets us use it on any page or component -->
-
 @code {
     /// <inheritdoc />
     protected override void OnInitialized()
@@ -12,6 +10,6 @@
             loginUrl += $"?returnUrl={Uri.EscapeDataString(baseRelativePath)}";
         }
 
-        NavManager.NavigateTo(loginUrl, true);
+        NavManager.NavigateTo(loginUrl, false);
     }
 }
diff --git a/Frontend/Bones.WebUI/Infrastructure/BonesAuthenticationStateProvider.cs b/Frontend/Bones.WebUI/Infrastructure/BonesAuthenticationStateProvider.cs
@@ -18,17 +18,15 @@ public override async Task<AuthenticationState> GetAuthenticationStateAsync()
 
         if (currentUser == null)
         {
-            return new(new(new ClaimsIdentity()));
+            return new(new());
         }
 
         Claim[] claims = [
             new(BonesClaimTypes.User.EMAIL, currentUser.Email ?? string.Empty),
             new(BonesClaimTypes.User.DISPLAY_NAME, currentUser.DisplayName ?? string.Empty)
         ];
-
-        AuthenticationState authenticationState = new(new(new ClaimsIdentity(claims, authenticationType: nameof(BonesAuthenticationStateProvider))));
-
-        return authenticationState;
+
+        return new(new(new ClaimsIdentity(claims, authenticationType: nameof(BonesAuthenticationStateProvider))));
     }
 
     /// <summary>

diff --git a/Frontend/Bones.WebUI/Pages/Account/ChangeEmailPage.razor b/Frontend/Bones.WebUI/Pages/Account/ChangeEmailPage.razor
@@ -1,5 +1,5 @@
 @attribute [Route(FrontEndUrls.Account.CHANGE_EMAIL)]
-@layout MainLayout
+@layout AuthenticatedLayout
 
 <h3>ChangeEmailPage</h3>
 

diff --git a/Frontend/Bones.WebUI/Pages/Account/ChangePasswordPage.razor b/Frontend/Bones.WebUI/Pages/Account/ChangePasswordPage.razor
@@ -1,5 +1,5 @@
 @attribute [Route(FrontEndUrls.Account.CHANGE_PASSWORD)]
-@layout MainLayout
+@layout AuthenticatedLayout
 
 <h3>ChangePasswordPage</h3>
 

diff --git a/Frontend/Bones.WebUI/Pages/Account/MyProfilePage.razor b/Frontend/Bones.WebUI/Pages/Account/MyProfilePage.razor
@@ -1,4 +1,5 @@
 @attribute [Route(FrontEndUrls.Account.MY_PROFILE)]
+@layout AuthenticatedLayout
 
 <h3>MyProfile</h3>
 

diff --git a/Frontend/Bones.WebUI/Pages/RequiresLogin.razor b/Frontend/Bones.WebUI/Pages/RequiresLogin.razor
@@ -1,5 +1,5 @@
 @page "/RequiresLogin"
-@layout MainLayout
+@layout AuthenticatedLayout
 
 <h3>RequiresLogin</h3>
 

diff --git a/Frontend/Bones.WebUI/Pages/SystemAdmin/SysAdminDashboard.razor b/Frontend/Bones.WebUI/Pages/SystemAdmin/SysAdminDashboard.razor
@@ -1,5 +1,5 @@
 @attribute [Route(FrontEndUrls.SystemAdmin.DASHBOARD)]
-@layout MainLayout
+@layout AuthenticatedLayout
 
 <h3>SysAdminDashboard</h3>
 

diff --git a/Frontend/Bones.WebUI/Pages/TestMapPage.razor b/Frontend/Bones.WebUI/Pages/TestMapPage.razor
@@ -1,6 +1,6 @@
 @page "/TestMapPage"
 @using Bones.WebUI.Components.Leaflet
-@layout MainLayout
+@layout AuthenticatedLayout
 
 <PageTitle>Test Map Page</PageTitle>
 <MudText Typo="Typo.h5">Test Map Page</MudText>