Move to package license expression (#104)

JasperFx · Feb 6, 2022 · 27fbdc3 · 27fbdc3
1 parent c2627c0
commit 27fbdc3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Alba/Alba.csproj b/src/Alba/Alba.csproj
@@ -8,7 +8,7 @@
     <AssemblyName>Alba</AssemblyName>
     <PackageId>Alba</PackageId>
     <PackageProjectUrl>http://jasperfx.github.io/alba/</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/JasperFx/alba/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/JasperFx/alba</RepositoryUrl>
     <OutputType>library</OutputType>

diff --git a/src/Alba/Security/OpenConnectExtension.cs b/src/Alba/Security/OpenConnectExtension.cs
@@ -42,7 +42,7 @@ async Task IAlbaExtension.Start(IAlbaHost host)
 
             // This seems to be necessary to "bake" in the JwtBearerOptions modifications
             var options = host.Services.GetRequiredService<IOptionsMonitor<JwtBearerOptions>>()
-                .Get("Bearer");
+                .Get(JwtBearerDefaults.AuthenticationScheme);
 
             var authorityUrl = options.Authority;
             _disco = await _client.GetDiscoveryDocumentAsync(authorityUrl);

diff --git a/src/WebAppSecuredWithJwt/Startup.cs b/src/WebAppSecuredWithJwt/Startup.cs
@@ -4,6 +4,7 @@
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpsPolicy;
@@ -35,9 +36,9 @@ public void ConfigureServices(IServiceCollection services)
                 c.SwaggerDoc("v1", new OpenApiInfo {Title = "WebAppSecuredWithJwt", Version = "v1"});
             });
 
-            services.AddAuthentication("Bearer")
+            services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
 
-                .AddJwtBearer("Bearer", options =>
+                .AddJwtBearer(options =>
                 {
                     // A real application would pull all this information from configuration
                     // of course, but I'm hardcoding it in testing