refactor: add to-do

- configure automapper

src/DigitalData.ActiveDirectory.API/Program.cs

@@ -13,7 +13,7 @@ builder.Services.AddSwaggerGen();
 builder.Services.AddActiveDirectory(options =>
 {
     options.ConfigActiveDirectory(builder.Configuration.GetSection("ActiveDirectory"));
-    options.MediatRLicenseKey = builder.Configuration["MediatRLicense"];
+    options.LPLicenseKey = builder.Configuration["LPLicense"];
 });
 
 var app = builder.Build();

src/DigitalData.ActiveDirectory.API/appsettings.json

@@ -11,5 +11,5 @@
     "Username": "FABRIK19-User01",
     "Password": "9bWOr0UGuHn_7VkC"
   },
-  "MediatRLicense": "eyJhbGciOiJSUzI1NiIsImtpZCI6Ikx1Y2t5UGVubnlTb2Z0d2FyZUxpY2Vuc2VLZXkvYmJiMTNhY2I1OTkwNGQ4OWI0Y2IxYzg1ZjA4OGNjZjkiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2x1Y2t5cGVubnlzb2Z0d2FyZS5jb20iLCJhdWQiOiJMdWNreVBlbm55U29mdHdhcmUiLCJleHAiOiIxNzg0ODUxMjAwIiwiaWF0IjoiMTc1MzM2MjQ5MSIsImFjY291bnRfaWQiOiIwMTk4M2M1OWU0YjM3MjhlYmZkMzEwM2MyYTQ4NmU4NSIsImN1c3RvbWVyX2lkIjoiY3RtXzAxazB5NmV3MmQ4YTk4Mzg3aDJnbTRuOWswIiwic3ViX2lkIjoiLSIsImVkaXRpb24iOiIwIiwidHlwZSI6IjIifQ.ZqsFG7kv_-xGfxS6ACk3i0iuNiVUXX2AvPI8iAcZ6-z2170lGv__aO32tWpQccD9LCv5931lBNLWSblKS0MT3gOt-5he2TEftwiSQGFwoIBgtOHWsNRMinUrg2trceSp3IhyS3UaMwnxZDrCvx4-0O-kpOzVpizeHUAZNr5U7oSCWO34bpKdae6grtM5e3f93Z1vs7BW_iPgItd-aLvPwApbaG9VhmBTKlQ7b4Jh64y7UXJ9mKP7Qb_Oa97oEg0oY5DPHOWTZWeE1EzORgVr2qkK2DELSHuZ_EIUhODojkClPNAKtvEl_qEjpq0HZCIvGwfCCRlKlSkQqIeZdFkiXg"
+  "LPLicense": "eyJhbGciOiJSUzI1NiIsImtpZCI6Ikx1Y2t5UGVubnlTb2Z0d2FyZUxpY2Vuc2VLZXkvYmJiMTNhY2I1OTkwNGQ4OWI0Y2IxYzg1ZjA4OGNjZjkiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2x1Y2t5cGVubnlzb2Z0d2FyZS5jb20iLCJhdWQiOiJMdWNreVBlbm55U29mdHdhcmUiLCJleHAiOiIxNzg0ODUxMjAwIiwiaWF0IjoiMTc1MzM2MjQ5MSIsImFjY291bnRfaWQiOiIwMTk4M2M1OWU0YjM3MjhlYmZkMzEwM2MyYTQ4NmU4NSIsImN1c3RvbWVyX2lkIjoiY3RtXzAxazB5NmV3MmQ4YTk4Mzg3aDJnbTRuOWswIiwic3ViX2lkIjoiLSIsImVkaXRpb24iOiIwIiwidHlwZSI6IjIifQ.ZqsFG7kv_-xGfxS6ACk3i0iuNiVUXX2AvPI8iAcZ6-z2170lGv__aO32tWpQccD9LCv5931lBNLWSblKS0MT3gOt-5he2TEftwiSQGFwoIBgtOHWsNRMinUrg2trceSp3IhyS3UaMwnxZDrCvx4-0O-kpOzVpizeHUAZNr5U7oSCWO34bpKdae6grtM5e3f93Z1vs7BW_iPgItd-aLvPwApbaG9VhmBTKlQ7b4Jh64y7UXJ9mKP7Qb_Oa97oEg0oY5DPHOWTZWeE1EzORgVr2qkK2DELSHuZ_EIUhODojkClPNAKtvEl_qEjpq0HZCIvGwfCCRlKlSkQqIeZdFkiXg"
 }

src/DigitalData.ActiveDirectory/DependencyInjection.cs

@@ -13,7 +13,15 @@ public static class DependencyInjection
         services.AddMediatR(cfg =>
         {
             cfg.RegisterServicesFromAssemblies(typeof(DependencyInjection).Assembly);
-            cfg.LicenseKey = cOptions.MediatRLicenseKey;
+            cfg.LicenseKey = cOptions.LPLicenseKey;
+        });
+
+        services.AddAutoMapper(cfg =>
+        {
+#if NET8_0_OR_GREATER
+            cfg.LicenseKey = cOptions.LPLicenseKey;
+#endif
+            cfg.AddMaps(typeof(DependencyInjection).Assembly);
         });
 
         if (!cOptions.IsADConfigured)
@@ -30,7 +38,13 @@ public static class DependencyInjection
 
         internal ADConfigurationOptions(IServiceCollection services) => _services = services;
 
-        public string? MediatRLicenseKey { get; set; }
+        /// <summary>
+        /// Gets or sets the license key used to activate Lucky Penny Software libraries.
+        /// </summary>
+        /// <remarks>
+        /// For more information, visit: https://luckypennysoftware.com/
+        /// </remarks>
+        public string? LPLicenseKey { get; set; }
 
         private void EnsureSingleMappingConfiguration(Action action)
         {

src/DigitalData.ActiveDirectory/DigitalData.ActiveDirectory.csproj

@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
     <PackageReference Include="MediatR" Version="13.0.0" />
-	<PackageReference Include="AutoMapper" Version="14.0.0" />
+	<PackageReference Include="AutoMapper" Version="15.0.1" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
   </ItemGroup>
@@ -38,7 +38,7 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.7" />
     <PackageReference Include="MediatR" Version="13.0.0" />
-	<PackageReference Include="AutoMapper" Version="14.0.0" />
+	<PackageReference Include="AutoMapper" Version="15.0.1" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.5" />
   </ItemGroup>

src/DigitalData.ActiveDirectory/DirectorySearchQuery.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Exceptions;
+using AutoMapper;
+using DigitalData.Core.Exceptions;
 using MediatR;
 using Microsoft.Extensions.Options;
 using System.DirectoryServices;
@@ -16,9 +17,12 @@ public class DirectorySearchQueryHandler : IRequestHandler<DirectorySearchQuery,
 {
     private readonly IOptions<ActiveDirectoryOptions> _options;
 
-    public DirectorySearchQueryHandler(IOptions<ActiveDirectoryOptions> options)
+    private readonly IMapper _mapper;
+
+    public DirectorySearchQueryHandler(IOptions<ActiveDirectoryOptions> options, IMapper mapper)
     {
         _options = options;
+        _mapper = mapper;
     }
 
     public DirectoryEntry DirectoryEntry => new ()
@@ -28,18 +32,14 @@ public class DirectorySearchQueryHandler : IRequestHandler<DirectorySearchQuery,
         Password = _options.Value.Password
     };
 
+    //TODO: add resolver to handle SearchRoot and AfterInit mapping
     public Task<IEnumerable<ResultPropertyCollection>> Handle(DirectorySearchQuery request, CancellationToken cancellationToken = default)
     {
         return Task.Run(() =>
         {
-            using var _dirEntry = DirectoryEntry;
-            using var searcher = new DirectorySearcher()
-            {
-                Filter = request.Filter,
-                SearchScope = request.Scope,
-                SizeLimit = request.SizeLimit,
-                SearchRoot = _dirEntry
-            };
+            using var searcher = _mapper.Map<DirectorySearcher>(request);
+
+            searcher.SearchRoot = DirectoryEntry;
 
             request.AfterInit?.Invoke(searcher);
 

src/DigitalData.ActiveDirectory/MappingProfile.cs

@@ -0,0 +1,13 @@
+using AutoMapper;
+using System.DirectoryServices;
+
+namespace DigitalData.ActiveDirectory;
+
+public class MappingProfile : Profile
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
+    public MappingProfile()
+    {
+        CreateMap<DirectorySearchQuery, DirectorySearcher>();
+    }
+}