From c65eefb9540b8f8bcef9e911cd2c55f5827261a4 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Mon, 25 Nov 2024 10:30:33 +0100
Subject: [PATCH] =?UTF-8?q?feat(IHttpClientOptions):=20Abfrage-Parameter?=
 =?UTF-8?q?=20und=20Header=20hinzugef=C3=BCgt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - Geordnete DI-Erweiterungen.
---
 .../Client/IHttpClientOptions.cs              |  8 ++++--
 DigitalData.Core.Client/DIExtensions.cs       | 26 ++++---------------
 .../DigitalData.Core.Client.csproj            |  3 ++-
 DigitalData.Core.Client/HttpClientOptions.cs  |  8 +++---
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/DigitalData.Core.Abstractions/Client/IHttpClientOptions.cs b/DigitalData.Core.Abstractions/Client/IHttpClientOptions.cs
index ba6a311..5600249 100644
--- a/DigitalData.Core.Abstractions/Client/IHttpClientOptions.cs
+++ b/DigitalData.Core.Abstractions/Client/IHttpClientOptions.cs
@@ -2,8 +2,12 @@
 {
     public interface IHttpClientOptions
     {
-        public string Uri { get; set; }
+        string Uri { get; init; }
 
-        public string Path { get; set; }
+        string? Path { get; init; }
+
+        IEnumerable<KeyValuePair<string, object>>? Headers { get; init; }
+
+        IEnumerable<KeyValuePair<string, object?>>? QueryParams { get; init; }
     }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Client/DIExtensions.cs b/DigitalData.Core.Client/DIExtensions.cs
index 8291df2..4ec3b4c 100644
--- a/DigitalData.Core.Client/DIExtensions.cs
+++ b/DigitalData.Core.Client/DIExtensions.cs
@@ -1,4 +1,5 @@
 using DigitalData.Core.Abstractions.Client;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System.Net;
@@ -7,30 +8,13 @@ namespace DigitalData.Core.Client
 {
     public static class DIExtensions
     {
-        public static IServiceCollection AddHttpClientService(this IServiceCollection services, string uri, string path = "")
+        public static IServiceCollection AddHttpClientService(this IServiceCollection services, IConfigurationSection? section)
         {
             services.TryAddSingleton<HttpClient>();
             services.TryAddSingleton<CookieContainer>();
-            services.AddSingleton<IBaseHttpClientService, BaseHttpClientService>();
-            services.Configure<HttpClientOptions>(opt =>
-            {
-                opt.Uri = uri;
-                opt.Path = path;
-            });
-
-            return services;
-        }
-
-        public static IServiceCollection AddHttpClientService<TClientOptions>(this IServiceCollection services, Action<TClientOptions>? clientOptions = null, bool setAsDefaultBase = false)
-            where TClientOptions : HttpClientOptions
-        {
-            services.TryAddSingleton<HttpClient>();
-            services.TryAddSingleton<CookieContainer>();
-            services.TryAddSingleton<IHttpClientService<TClientOptions>, HttpClientService<TClientOptions>>();
-            services.Configure(clientOptions ?? (_ => { }));
-
-            if (setAsDefaultBase)
-                services.TryAddSingleton<IBaseHttpClientService, HttpClientService<TClientOptions>>();
+            services.TryAddSingleton<IBaseHttpClientService, BaseHttpClientService>();
+            if(section is not null)
+                services.Configure<HttpClientOptions>(section);
 
             return services;
         }
diff --git a/DigitalData.Core.Client/DigitalData.Core.Client.csproj b/DigitalData.Core.Client/DigitalData.Core.Client.csproj
index 34f4596..9baa91b 100644
--- a/DigitalData.Core.Client/DigitalData.Core.Client.csproj
+++ b/DigitalData.Core.Client/DigitalData.Core.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
@@ -29,6 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
diff --git a/DigitalData.Core.Client/HttpClientOptions.cs b/DigitalData.Core.Client/HttpClientOptions.cs
index 050855c..da859e9 100644
--- a/DigitalData.Core.Client/HttpClientOptions.cs
+++ b/DigitalData.Core.Client/HttpClientOptions.cs
@@ -4,12 +4,12 @@ namespace DigitalData.Core.Client
 {
     public class HttpClientOptions : IHttpClientOptions
     {
-        public string Uri { get; set; } = string.Empty;
+        public required string Uri { get; init; }
 
-        public string Path { get; set; } = string.Empty;
+        public string? Path { get; init; }
 
-        public IEnumerable<KeyValuePair<string, object>>? Headers { get; init; } = null;
+        public IEnumerable<KeyValuePair<string, object>>? Headers { get; init; }
 
-        public IEnumerable<KeyValuePair<string, object?>>? QueryParams { get; init; } = null;
+        public IEnumerable<KeyValuePair<string, object?>>? QueryParams { get; init; }
     }
 }
\ No newline at end of file