🛠️ Scoping authentication scripts security own pages

🔼 Updating dependencies
xxnickles · Feb 12, 2024 · 64550cc · 64550cc
1 parent 0135a64
commit 64550cc
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 30 deletions.
diff --git a/src/AnimeFeedManager.Features.Tests/AnimeFeedManager.Features.Tests.csproj b/src/AnimeFeedManager.Features.Tests/AnimeFeedManager.Features.Tests.csproj
@@ -17,7 +17,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.16">
+        <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/AnimeFeedManager.Functions/AnimeFeedManager.Functions.csproj b/src/AnimeFeedManager.Functions/AnimeFeedManager.Functions.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="6.3.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.3.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.4" OutputItemType="Analyzer" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.0" OutputItemType="Analyzer" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.21.0" />    
     <PackageReference Include="SendGrid" Version="9.29.1" />    
   </ItemGroup>

diff --git a/src/AnimeFeedManager.Web/Features/App.razor b/src/AnimeFeedManager.Web/Features/App.razor
@@ -1,8 +1,4 @@
-@using Passwordless.Net
-@using Microsoft.Extensions.Options
-@inject IOptions<PasswordlessOptions> PasswordlessOptions
-
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -14,6 +10,8 @@
     <link rel="icon" type="image/png" href="favicon.png"/>
     <script defer src="lib/htmx/htmx.min.js"></script>
     <script defer src="lib/alpinejs/cdn.min.js"></script>
+    @* <script defer src="_framework/blazor.web.js"></script> *@
+    <SectionOutlet SectionName="additional-scripts"/>
     <HeadOutlet/>
 </head>
 
@@ -24,18 +22,6 @@
 <div id="toast-panel" class="toast"></div>
 
 <HtmxConfirm></HtmxConfirm>
-@* <script src="_framework/blazor.web.js"></script> *@
-<script>
-    const PASSWORDLESS_API_URL = "https://v4.passwordless.dev"; // For self-hosting, change this. This is always the default value.
-    const API_KEY = "@PasswordlessOptions.Value.ApiKey"; // Replace this value with your API Key
-</script>
-
-<script
-    defer
-    src="https://cdn.passwordless.dev/dist/1.1.0/umd/passwordless.umd.min.js"
-    crossorigin="anonymous"></script>
 
-<script defer src="scripts/client-signin.js" type="module"></script>
 </body>
-
 </html>
diff --git a/src/AnimeFeedManager.Web/Features/Security/Login.razor b/src/AnimeFeedManager.Web/Features/Security/Login.razor
@@ -4,10 +4,13 @@
 @using AnimeFeedManager.Features.Users.IO
 @using Microsoft.AspNetCore.Authentication
 @using Microsoft.AspNetCore.Authentication.Cookies
+@using Microsoft.Extensions.Options
+@using Passwordless.Net
 
 @inject IPasswordlessLogin PasswordlessLogin;
 @inject NavigationManager NavigationManager;
 @inject ILogger<Login> Logger;
+@inject IOptions<PasswordlessOptions> PasswordlessOptions
 
 <PageTitle>@PageTitle("Login")</PageTitle>
 
@@ -72,6 +75,19 @@
     </div>
 </section>
 
+<SectionContent SectionName="additional-scripts">
+    <script defer>    
+        const PASSWORDLESS_API_URL = "https://v4.passwordless.dev"; // For self-hosting, change this. This is always the default value.
+        const API_KEY = "@PasswordlessOptions.Value.ApiKey"; // Replace this value with your API Key
+    </script>
+    <script
+        defer
+        src="https://cdn.passwordless.dev/dist/1.1.0/umd/passwordless.umd.min.js"
+        crossorigin="anonymous"></script>
+    <script defer src="scripts/client-signin.js" type="module"></script>
+    <script src="./Features/Security/Login.razor.js" type="text/javascript"></script>
+</SectionContent>
+
 
 @code {
     [SupplyParameterFromForm] public string? Id { get; set; }
@@ -97,7 +113,7 @@
 
     private async Task CompleteLogin(ClaimsPrincipal principal)
     {
-        await HttpContext.SignInAsync(principal, new AuthenticationProperties {IsPersistent = true});
+        await HttpContext.SignInAsync(principal, new AuthenticationProperties { IsPersistent = true });
         NavigationManager.NavigateTo("/");
     }
 
@@ -115,7 +131,7 @@
             new(ClaimTypes.Name, user),
             new(ClaimTypes.Email, user),
             new(CustomClaimTypes.Sub, id),
-            new (ClaimTypes.Role, role)
+            new(ClaimTypes.Role, role)
         };
 
         return
@@ -124,4 +140,3 @@
 
 }
 
-<script src="./Features/Security/Login.razor.js" type="text/javascript"></script>
diff --git a/src/AnimeFeedManager.Web/Features/Security/Register.razor b/src/AnimeFeedManager.Web/Features/Security/Register.razor
@@ -1,4 +1,9 @@
-@page "/Register"
+@using Passwordless.Net
+@using Microsoft.Extensions.Options
+
+@inject IOptions<PasswordlessOptions> PasswordlessOptions
+@page "/Register"
+
 
 <PageTitle>@PageTitle("Registration")</PageTitle>
 
@@ -63,5 +68,14 @@
     </div>
 </section>
 
-
-<script src="./Features/Security/Register.razor.js" type="text/javascript"></script>
+<SectionContent SectionName="additional-scripts">
+    <script defer>    
+        const PASSWORDLESS_API_URL = "https://v4.passwordless.dev"; // For self-hosting, change this. This is always the default value.
+        const API_KEY = "@PasswordlessOptions.Value.ApiKey"; // Replace this value with your API Key
+    </script>
+    <script
+        defer
+        src="https://cdn.passwordless.dev/dist/1.1.0/umd/passwordless.umd.min.js"
+        crossorigin="anonymous"></script>
+    <script src="./Features/Security/Register.razor.js" type="text/javascript"></script>
+</SectionContent>
diff --git a/src/AnimeFeedManager.Web/Features/Tv/TvGrid.razor b/src/AnimeFeedManager.Web/Features/Tv/TvGrid.razor
@@ -4,12 +4,13 @@
 @inject TvLibraryGetter LibraryGetter;
 @inject IUserProvider UserProvider;
 @inject ILogger<TvGrid> Logger;
-@* @attribute [StreamRendering] *@
+@* @attribute [StreamRendering(true)] *@
 
 <PageTitle>@PageTitleForSeason(SeriesType.Tv, _selectedSeason)</PageTitle>
 
 <SeriesGrid Series="_animes" SeriesType="SeriesType.Tv" CurrentSeason="_selectedSeason"></SeriesGrid>
 
+
 @code {
 
     [CascadingParameter] public HttpContext context { get; set; } = default!;
@@ -31,7 +32,7 @@
         var results = await LibraryGetter.GetForSeason(_selectedSeason.Season, _selectedSeason.Year)
             .MapAsync(lib => MapForUser(lib, user))
             .LogErrors(Logger);
-        
+
         _animes = results.Match(
             collection => collection,
             _ => []
@@ -62,4 +63,5 @@
         };
     }
 
-}
+}
+
diff --git a/src/AnimeFeedManager.Web/Features/_Imports.razor b/src/AnimeFeedManager.Web/Features/_Imports.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Authorization
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Sections
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 @using AnimeFeedManager.Web
@@ -25,4 +25,5 @@
 @using LanguageExt;
 @using static LanguageExt.Prelude;
 @using static AnimeFeedManager.Web.Features.Common.Utils;
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
 
diff --git a/src/AnimeFeedManager.WebApp/AnimeFeedManager.WebApp.csproj b/src/AnimeFeedManager.WebApp/AnimeFeedManager.WebApp.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
+        <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />