Changed BaseAddress to string fro Uri.

Author: eben-roux

Shuttle.Access.RestClient/AccessClientOptions.cs

@@ -6,7 +6,7 @@ public class AccessClientOptions
 {
     public const string SectionName = "Shuttle:Access:Client";
 
-    public Uri? BaseAddress { get; set; }
+    public string BaseAddress { get; set; } = string.Empty;
     public string IdentityName { get; set; } = string.Empty;
     public string Password { get; set; } = string.Empty;
     public TimeSpan RenewToleranceTimeSpan { get; set; } = TimeSpan.FromMinutes(5);

Shuttle.Access.RestClient/AccessClientOptionsValidator.cs

@@ -0,0 +1,32 @@
+using System;
+using Microsoft.Extensions.Options;
+
+namespace Shuttle.Access.RestClient;
+
+public class AccessClientOptionsValidator : IValidateOptions<AccessClientOptions>
+{
+    public ValidateOptionsResult Validate(string? name, AccessClientOptions options)
+    {
+        if (string.IsNullOrWhiteSpace(options.BaseAddress))
+        {
+            return ValidateOptionsResult.Fail(string.Format(Resources.OptionMissingException, "BaseAddress"));
+        }
+
+        if (!Uri.TryCreate(options.BaseAddress, UriKind.Absolute, out _))
+        {
+            return ValidateOptionsResult.Fail(string.Format(Resources.OptionUriException, "BaseAddress"));
+        }
+
+        if (string.IsNullOrWhiteSpace(options.IdentityName))
+        {
+            return ValidateOptionsResult.Fail(string.Format(Resources.OptionMissingException, "IdentityName"));
+        }
+
+        if (string.IsNullOrWhiteSpace(options.Password))
+        {
+            return ValidateOptionsResult.Fail(string.Format(Resources.OptionMissingException, "Password"));
+        }
+
+        return ValidateOptionsResult.Success;
+    }
+}

Shuttle.Access.RestClient/Resources.Designer.cs

@@ -117,7 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ClientSectionException" xml:space="preserve">
-    <value>Could not find a configuration section with name "accessClient" or "shuttle/accessClient".</value>
+  <data name="OptionUriException" xml:space="preserve">
+    <value>Option '{0}' is not a valid URI.</value>
+    <comment>0 = option name</comment>
+  </data>
+  <data name="OptionMissingException" xml:space="preserve">
+    <value>Option `{0}` may not be empty.</value>
+    <comment>0 = option name</comment>
   </data>
 </root>

Shuttle.Access.RestClient/Resources.resx

@@ -16,19 +16,21 @@ public static IServiceCollection AddAccessClient(this IServiceCollection service
 
         builder?.Invoke(accessRestClientBuilder);
 
-        services.AddOptions<AccessClientOptions>().Configure(options =>
+        services.Configure<AccessClientOptions>(options =>
         {
             options.BaseAddress = accessRestClientBuilder.Options.BaseAddress;
             options.IdentityName = accessRestClientBuilder.Options.IdentityName;
             options.Password = accessRestClientBuilder.Options.Password;
         });
 
+        services.AddSingleton<IValidateOptions<AccessClientOptions>, AccessClientOptionsValidator>();
+
         services.AddTransient<AuthenticationHeaderHandler>();
         services.AddHttpClient<IAccessClient, AccessClient>("AccessClient", (serviceProvider, client) =>
             {
                 var options = serviceProvider.GetRequiredService<IOptions<AccessClientOptions>>().Value;
 
-                client.BaseAddress = options.BaseAddress;
+                client.BaseAddress = new(options.BaseAddress);
             })
             .AddHttpMessageHandler<AuthenticationHeaderHandler>();