Use Options Pattern for AzureAd config

gordon-cs · Aug 5, 2024 · b9c9344 · b9c9344
1 parent d9073e8
commit b9c9344
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 16 deletions.
diff --git a/Gordon360/Authorization/AzureAdConfig.cs b/Gordon360/Authorization/AzureAdConfig.cs
diff --git a/Gordon360/Documentation/Gordon360.xml b/Gordon360/Documentation/Gordon360.xml
diff --git a/Gordon360/Options/AzureAdOptions.cs b/Gordon360/Options/AzureAdOptions.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Options;
+using System.ComponentModel.DataAnnotations;
+
+namespace Gordon360.Options;
+
+public sealed record AzureAdOptions
+{
+ public const string AzureAd = "AzureAd";
+
+ [Required]
+ public required string Instance { get; set; }
+ [Required]
+ public required string ClientId { get; set; }
+ [Required]
+ public required string TenantId { get; set; }
+ [Required]
+ public required string Audience { get; set; }
+}
+
+[OptionsValidator]
+public partial class ValidateAzureAdOptions : IValidateOptions<AzureAdOptions> { }
+
diff --git a/Gordon360/Options/OptionsExtensions.cs b/Gordon360/Options/OptionsExtensions.cs
@@ -8,6 +8,11 @@ public static class OptionsExtensions
 {
  public static IServiceCollection Add360Options(this IServiceCollection services)
  {
+ services.AddSingleton<IValidateOptions<AzureAdOptions>, ValidateAzureAdOptions>();
+ services.AddOptions<AzureAdOptions>()
+ .BindConfiguration(AzureAdOptions.AzureAd)
+ .ValidateOnStart();
+
  services.AddSingleton<IValidateOptions<BonAppetitOptions>, ValidateBonAppetitOptions>();
  services.AddOptions<BonAppetitOptions>()
  .BindConfiguration(BonAppetitOptions.BonAppetit)

diff --git a/Gordon360/Program.cs b/Gordon360/Program.cs
@@ -26,6 +26,8 @@
 {
  var builder = WebApplication.CreateBuilder(args);
 
+ builder.Services.Add360Options();
+
  builder.Services.AddSerilog((services, lc) => lc
  .ReadFrom.Configuration(builder.Configuration)
  .ReadFrom.Services(services)
@@ -41,7 +43,7 @@
 
  builder.Services.AddEndpointsApiExplorer();
 
- var azureConfig = builder.Configuration.GetSection("AzureAd").Get<AzureAdConfig>();
+ var azureOptions = builder.Configuration.GetSection("AzureAd").Get<AzureAdOptions>();
 
  builder.Services.AddSwaggerGen(c =>
  {
@@ -52,11 +54,11 @@
  {
  AuthorizationCode = new OpenApiOAuthFlow()
  {
- AuthorizationUrl = new Uri($"https://login.microsoftonline.com/{azureConfig.TenantId}/oauth2/v2.0/authorize"),
- TokenUrl = new Uri($"https://login.microsoftonline.com/{azureConfig.TenantId}/oauth2/v2.0/token"),
+ AuthorizationUrl = new Uri($"https://login.microsoftonline.com/{azureOptions.TenantId}/oauth2/v2.0/authorize"),
+ TokenUrl = new Uri($"https://login.microsoftonline.com/{azureOptions.TenantId}/oauth2/v2.0/token"),
  Scopes = new Dictionary<string, string> {
  {
- $"{azureConfig.Audience}/access_as_user",
+ $"{azureOptions.Audience}/access_as_user",
  "Access 360 as you."
  }
  }
@@ -92,7 +94,6 @@
  options.UseSqlServer(builder.Configuration.GetConnectionString("webSQL"))
  );
 
- builder.Services.Add360Options();
  builder.Services.Add360Services();
  builder.Services.AddHostedService<EventCacheRefreshService>();
  builder.Services.AddScoped<ServerUtils, ServerUtils>();
@@ -106,8 +107,8 @@
  app.UseSwagger();
  app.UseSwaggerUI(c =>
  {
- c.OAuthClientId(azureConfig.ClientId);
- c.OAuthScopes($"{azureConfig.Audience}/access_as_user");
+ c.OAuthClientId(azureOptions.ClientId);
+ c.OAuthScopes($"{azureOptions.Audience}/access_as_user");
  c.OAuthUsePkce();
  });