Make the Blazor Server sample project be able to test the DisableClie…

…ntScriptAutoInjection option
jsakamoto · Dec 13, 2023 · 1050244 · 1050244
1 parent 54cdfcd
commit 1050244
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/SampleSites/Components/SampleSite.Components.csproj b/SampleSites/Components/SampleSite.Components.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Toolbelt.Blazor.Gamepad" Version="9.0.0-preview.2" />
+    <!--<PackageReference Include="Toolbelt.Blazor.Gamepad" Version="9.0.0-preview.2" />-->
     <PackageReference Include="Toolbelt.Blazor.HeadElement" Version="7.3.1" />
-    <!--<ProjectReference Include="..\..\Toolbelt.Blazor.Gamepad\Toolbelt.Blazor.Gamepad.csproj" />-->
+    <ProjectReference Include="..\..\Toolbelt.Blazor.Gamepad\Toolbelt.Blazor.Gamepad.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/SampleSites/Server/Pages/_Host.cshtml b/SampleSites/Server/Pages/_Host.cshtml
@@ -2,6 +2,10 @@
 @namespace SampleSite.Server
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @using SampleSite.Components
+@using Microsoft.Extensions.Options
+@using Toolbelt.Blazor.Gamepad
+
+@inject IOptions<GamepadOptions> GamepadOptions
 
 <!DOCTYPE html>
 <html>
@@ -13,6 +17,7 @@
     <base href="~/" />
     <!-- style for blazor-error-ui -->
     <link rel="stylesheet" href="data:text/css,%23blazor-error-ui%7Bbackground%3A%23ffffe0%3Bbottom%3A0%3Bbox-shadow%3A0%20-1px%202px%20rgba(0%2C0%2C0%2C.2)%3Bdisplay%3Anone%3Bleft%3A0%3Bpadding%3A.6rem%201.25rem%20.7rem%201.25rem%3Bposition%3Afixed%3Bright%3A0%3Bz-index%3A1000%7D%23blazor-error-ui%20.dismiss%7Bcursor%3Apointer%3Bposition%3Aabsolute%3Bright%3A.75rem%3Btop%3A.5rem%7D" />
+    <link rel="stylesheet" href="_content/SampleSite.Components/styles.css" />
 </head>
 
 <body>
@@ -32,7 +37,10 @@
     </div>
 
     <script src="_framework/blazor.server.js"></script>
-    @*<script src="_content/Toolbelt.Blazor.Gamepad/script.min.js"></script>*@
+    @if (GamepadOptions.Value.DisableClientScriptAutoInjection)
+    {
+        <script src="_content/Toolbelt.Blazor.Gamepad/script.min.js"></script>
+    }
 </body>
 
 </html>
diff --git a/SampleSites/Server/Program.cs b/SampleSites/Server/Program.cs
@@ -1,14 +1,18 @@
+using Microsoft.Extensions.Options;
 using Toolbelt.Blazor.Extensions.DependencyInjection;
+using Toolbelt.Blazor.Gamepad;
 
 var builder = WebApplication.CreateBuilder(args);
+builder.Services.Configure<GamepadOptions>(builder.Configuration.GetSection("Gamepad"));
 
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
 builder.Services.AddHeadElementHelper();
-builder.Services.AddGamepadList(options =>
+builder.Services.AddGamepadList((services, options) =>
 {
-    //options.DisableClientScriptAutoInjection = true;
+    var config = services.GetRequiredService<IOptions<GamepadOptions>>();
+    options.DisableClientScriptAutoInjection = config.Value.DisableClientScriptAutoInjection;
 });
 
 var app = builder.Build();

diff --git a/SampleSites/Server/appsettings.json b/SampleSites/Server/appsettings.json
@@ -6,5 +6,8 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "Gamepad": {
+    "DisableClientScriptAutoInjection": false
+  }
 }
diff --git a/Toolbelt.Blazor.Gamepad/GamepadExtensions.cs b/Toolbelt.Blazor.Gamepad/GamepadExtensions.cs
@@ -15,19 +15,32 @@ public static class GamepadExtensions
     /// <param name="services">The Microsoft.Extensions.DependencyInjection.IServiceCollection to add the service to.</param>
     public static IServiceCollection AddGamepadList(this IServiceCollection services)
     {
-        return services.AddGamepadList(configure: null);
+        return services.AddGamepadList(configure: (_) => { });
     }
 
     /// <summary>
     ///  Adds a gamepad list service to the specified Microsoft.Extensions.DependencyInjection.IServiceCollection.
     /// </summary>
     /// <param name="services">The Microsoft.Extensions.DependencyInjection.IServiceCollection to add the service to.</param>
-    /// <param name="configure"></param>
+    /// <param name="configure">A delegate that is used to configure the Microsoft.Extensions.DependencyInjection.Options.GamepadOptions.</param>
     public static IServiceCollection AddGamepadList(this IServiceCollection services, Action<GamepadOptions>? configure)
     {
-        var options = new GamepadOptions();
-        configure?.Invoke(options);
-        services.AddScoped(serviceProvider => new GamepadList(serviceProvider.GetRequiredService<IJSRuntime>(), options));
+        return services.AddGamepadList(configure: (_, options) => { configure?.Invoke(options); });
+    }
+
+    /// <summary>
+    ///  Adds a gamepad list service to the specified Microsoft.Extensions.DependencyInjection.IServiceCollection.
+    /// </summary>
+    /// <param name="services">The Microsoft.Extensions.DependencyInjection.IServiceCollection to add the service to.</param>
+    /// <param name="configure">A delegate that is used to configure the Microsoft.Extensions.DependencyInjection.Options.GamepadOptions.</param>
+    public static IServiceCollection AddGamepadList(this IServiceCollection services, Action<IServiceProvider, GamepadOptions> configure)
+    {
+        services.AddScoped(serviceProvider =>
+        {
+            var options = new GamepadOptions();
+            configure?.Invoke(serviceProvider, options);
+            return new GamepadList(serviceProvider.GetRequiredService<IJSRuntime>(), options);
+        });
         return services;
     }
 }