Merge pull request #87 from NerosoftDev/develop

Add more properties to JwtAuthenticationOptions.

Author: Codespilot

Source/Euonia.Hosting/Authentication/JwtAuthenticationOptions.cs

@@ -5,38 +5,48 @@ namespace Microsoft.AspNetCore.Authentication;
 /// </summary>
 public class JwtAuthenticationOptions
 {
-    /// <summary>
-    /// Gets or sets the scheme.
-    /// </summary>
-    public string Scheme { get; set; }
-
-    /// <summary>
-    /// Gets or sets the token issuers.
-    /// </summary>
-    public IEnumerable<string> Issuer { get; set; }
-
-    /// <summary>
-    /// Gets or sets the signing key.
-    /// </summary>
-    public string SigningKey { get; set; }
-
-    /// <summary>
-    /// Gets or sets the authority url.
-    /// </summary>
-    public string Authority { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the HTTPS metadata is required.
-    /// </summary>
-    public bool RequireHttpsMetadata { get; set; }
-
-    /// <summary>
-    /// Gets or sets the audience.
-    /// </summary>
-    public string Audience { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating if the policy should be used.
-    /// </summary>
-    public bool UsePolicy { get; set; } = true;
+	/// <summary>
+	/// Gets or sets the scheme.
+	/// </summary>
+	public string Scheme { get; set; }
+
+	/// <summary>
+	/// Gets or sets the token issuers.
+	/// </summary>
+	public IEnumerable<string> Issuer { get; set; }
+
+	/// <summary>
+	/// Gets or sets the signing key.
+	/// </summary>
+	public string SigningKey { get; set; }
+
+	/// <summary>
+	/// Gets or sets the authority url.
+	/// </summary>
+	public string Authority { get; set; }
+
+	/// <summary>
+	/// Gets or sets a value indicating whether the HTTPS metadata is required.
+	/// </summary>
+	public bool RequireHttpsMetadata { get; set; }
+
+	/// <summary>
+	/// Gets or sets the audience.
+	/// </summary>
+	public string Audience { get; set; }
+
+	/// <summary>
+	/// Gets or sets a value indicating if the policy should be used.
+	/// </summary>
+	public bool UsePolicy { get; set; } = true;
+
+	/// <summary>
+	/// Gets or sets a value indicating if the issuer should be validated.
+	/// </summary>
+	public bool ValidateIssuer { get; set; } = true;
+
+	/// <summary>
+	/// Gets or sets a value indicating if the audience should be validated.
+	/// </summary>
+	public bool ValidateAudience { get; set; } = true;
 }

Source/Euonia.Hosting/Extensions/ServiceCollectionExtensions.cs

@@ -41,6 +41,29 @@ public static IServiceCollection AddJwtAuthentication(this IServiceCollection se
 		var bearerOptions = new JwtAuthenticationOptions();
 		optionsAction?.Invoke(bearerOptions);
 
+		return services.AddJwtAuthentication(bearerOptions);
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <param name="services"></param>
+	/// <param name="configurationSectionName"></param>
+	/// <returns></returns>
+	public static IServiceCollection AddJwtAuthentication(this IServiceCollection services, string configurationSectionName)
+	{
+		var bearerOptions = services.GetConfiguration().GetSection(configurationSectionName).Get<JwtAuthenticationOptions>();
+		return services.AddJwtAuthentication(bearerOptions);
+	}
+
+	/// <summary>
+	/// Adds Jwt authentication to the DI container.
+	/// </summary>
+	/// <param name="services"></param>
+	/// <param name="bearerOptions"></param>
+	/// <returns></returns>
+	public static IServiceCollection AddJwtAuthentication(this IServiceCollection services, JwtAuthenticationOptions bearerOptions)
+	{
 		JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
 
 		var key = Encoding.UTF8.GetBytes(bearerOptions.SigningKey);
@@ -107,33 +130,14 @@ public static IServiceCollection AddJwtAuthentication(this IServiceCollection se
 				        RoleClaimType = JwtClaimTypes.Role,
 				        ValidIssuers = bearerOptions.Issuer,
 				        //ValidAudience = "api",
-				        ValidateIssuer = false,
-				        ValidateAudience = false,
+				        ValidateIssuer = bearerOptions.ValidateIssuer,
+				        ValidateAudience = bearerOptions.ValidateAudience,
 				        IssuerSigningKey = new SymmetricSecurityKey(key)
 			        };
 		        });
 		return services;
 	}
 
-	/// <summary>
-	/// 
-	/// </summary>
-	/// <param name="services"></param>
-	/// <param name="configurationSectionName"></param>
-	/// <returns></returns>
-	public static IServiceCollection AddJwtAuthentication(this IServiceCollection services, string configurationSectionName)
-	{
-		var bearerOptions = services.GetConfiguration().GetSection(configurationSectionName).Get<JwtAuthenticationOptions>();
-		return services.AddJwtAuthentication(options =>
-		{
-			options.Audience = bearerOptions.Audience;
-			options.Authority = bearerOptions.Authority;
-			options.Issuer = bearerOptions.Issuer;
-			options.RequireHttpsMetadata = bearerOptions.RequireHttpsMetadata;
-			options.SigningKey = bearerOptions.SigningKey;
-		});
-	}
-
 	/// <summary>
 	/// 
 	/// </summary>

project.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>8.1.27</Version>
+        <Version>8.1.28</Version>
         <Authors>damon</Authors>
         <Company>Nerosoft Ltd.</Company>
         <Product>Euonia</Product>