From fc8a419a4d420b911d7a6690442a732b20a9c5e2 Mon Sep 17 00:00:00 2001
From: Daniel Egbers <daniel@egbers.dev>
Date: Wed, 10 Jul 2024 23:12:40 +0200
Subject: [PATCH 1/2] set AuthenticationType of JwtBearer
 TokenValidationParameters to SchemeName from the settings

---
 src/SimpleAuthentication/JwtBearer/JwtBearerService.cs     | 1 +
 src/SimpleAuthentication/SimpleAuthenticationExtensions.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs b/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs
index 1ecc564..e30a25e 100644
--- a/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs
+++ b/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs
@@ -37,6 +37,7 @@ public ClaimsPrincipal ValidateToken(string token, bool validateLifetime)
     {
         var tokenValidationParameters = new TokenValidationParameters
         {
+            AuthenticationType = jwtBearerSettings.SchemeName,
             NameClaimType = jwtBearerSettings.NameClaimType,
             RoleClaimType = jwtBearerSettings.RoleClaimType,
             ValidateIssuer = jwtBearerSettings.Issuers?.Any() ?? false,
diff --git a/src/SimpleAuthentication/SimpleAuthenticationExtensions.cs b/src/SimpleAuthentication/SimpleAuthenticationExtensions.cs
index a5723e8..af39e33 100644
--- a/src/SimpleAuthentication/SimpleAuthenticationExtensions.cs
+++ b/src/SimpleAuthentication/SimpleAuthenticationExtensions.cs
@@ -96,6 +96,7 @@ static void CheckAddJwtBearer(AuthenticationBuilder builder, IConfigurationSecti
             {
                 options.TokenValidationParameters = new()
                 {
+                    AuthenticationType = settings.SchemeName,
                     NameClaimType = settings.NameClaimType,
                     RoleClaimType = settings.RoleClaimType,
                     ValidateIssuer = settings.Issuers?.Any() ?? false,

From 418f63e532eb3f21614074a9c17e887291af6323 Mon Sep 17 00:00:00 2001
From: Marco Minerva <marco.minerva@gmail.com>
Date: Thu, 11 Jul 2024 09:59:25 +0200
Subject: [PATCH 2/2] Use collection initialier

---
 src/SimpleAuthentication/JwtBearer/JwtBearerService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs b/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs
index e30a25e..40e4bdb 100644
--- a/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs
+++ b/src/SimpleAuthentication/JwtBearer/JwtBearerService.cs
@@ -12,7 +12,7 @@ internal class JwtBearerService(IOptions<JwtBearerSettings> jwtBearerSettingsOpt
 
     public string CreateToken(string userName, IList<Claim>? claims = null, string? issuer = null, string? audience = null, DateTime? absoluteExpiration = null)
     {
-        claims ??= new List<Claim>();
+        claims ??= [];
         claims.Update(jwtBearerSettings.NameClaimType, userName);
         claims.Update(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString());
         claims.Remove(JwtRegisteredClaimNames.Aud);