chore: aktualisierte DigitalData.Core-Pakete

DigitalData.UserManager.API/Controllers/AuthController.cs

@@ -11,11 +11,11 @@ using DigitalData.Core.Abstractions.Application;
 using Microsoft.Extensions.Localization;
 using DigitalData.Core.DTO;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Route("api/[controller]")]
+public class AuthController : ControllerBase
 {
-    [Route("api/[controller]")]
-    public class AuthController : ControllerBase
-    {
     private readonly IUserService _userService;
     private readonly IGroupOfUserService _gouService;
     private readonly IDirectorySearchService _dirSearchService;
@@ -154,5 +154,4 @@ namespace DigitalData.UserManager.API.Controllers
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
-    }
 }

DigitalData.UserManager.API/Controllers/BaseAuthController.cs

@@ -7,16 +7,16 @@ using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using System.Security.Claims;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
-{
+
-    [Authorize]
+[Authorize]
-    public class BaseAuthController<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity> : CRUDControllerBaseWithErrorHandling<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity, int>
+public class BaseAuthController<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity> : CRUDControllerBaseWithErrorHandling<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity, int>
-        where TCRUDService : IBaseService<TCreateDto, TReadDto, TUpdateDto, TBaseEntity>
+    where TCRUDService : IBaseService<TCreateDto, TReadDto, TBaseEntity>
     where TCreateDto : BaseCreateDto
     where TReadDto : class
     where TUpdateDto : BaseUpdateDto
     where TBaseEntity : BaseEntity
-    {
+{
     private readonly Lazy<int?> _lUserId;
 
     public BaseAuthController(ILogger logger, TCRUDService service, IUserService userService) : base(logger, service)
@@ -43,5 +43,4 @@ namespace DigitalData.UserManager.API.Controllers
                 : null;
         };
     }
-    }
 }

DigitalData.UserManager.API/Controllers/DirectoryController.cs

@@ -10,13 +10,13 @@ using Microsoft.Extensions.Localization;
 using DigitalData.Core.DTO;
 using Microsoft.AspNetCore.Authorization;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Route("api/[controller]")]
+[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
+[Authorize]
+public class DirectoryController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
-    [Authorize]
-    public class DirectoryController : ControllerBase
-    {
     private readonly IUserService _userService;
     private readonly IDirectorySearchService _dirSearchService;
     private readonly Dictionary<string, string> _customSearchFilters;
@@ -231,5 +231,4 @@ namespace DigitalData.UserManager.API.Controllers
     {
         get => (HttpContext.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value);
     }
-    }
 }

DigitalData.UserManager.API/Controllers/EncryptionController.cs

@@ -1,14 +1,13 @@
 using DigitalData.UserManager.Application.Services;
 using DigitalData.UserManager.Application.Services.Options;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class EncryptionController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [ApiController]
-    public class EncryptionController : ControllerBase
-    {
     private readonly Encryptor _encryptor;
 
     public EncryptionController(Encryptor encryptor)
@@ -42,5 +41,4 @@ namespace DigitalData.UserManager.API.Controllers
         var param = Encryptor.GenerateParameters();
         return Ok(param);
     }
-    }
 }

DigitalData.UserManager.API/Controllers/GroupController.cs

@@ -5,11 +5,11 @@ using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Authorize]
+public class GroupController : BaseAuthController<IGroupService, GroupCreateDto, GroupReadDto, GroupUpdateDto, Group>
 {
-    [Authorize]
-    public class GroupController : BaseAuthController<IGroupService, GroupCreateDto, GroupReadDto, GroupUpdateDto, Group>
-    {
     public GroupController(ILogger<GroupController> logger, IGroupService service, IUserService userService) : base(logger, service, userService)
     {
     }
@@ -39,5 +39,4 @@ namespace DigitalData.UserManager.API.Controllers
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
-    }
 }

DigitalData.UserManager.API/Controllers/GroupOfUserController.cs

@@ -5,11 +5,11 @@ using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Authorize]
+public class GroupOfUserController : BaseAuthController<IGroupOfUserService, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser>
 {
-    [Authorize]
-    public class GroupOfUserController : BaseAuthController<IGroupOfUserService, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser>
-    {
     public GroupOfUserController(ILogger<GroupOfUserController> logger, IGroupOfUserService service, IUserService userService) : base(logger, service, userService)
     {
     }
@@ -77,5 +77,4 @@ namespace DigitalData.UserManager.API.Controllers
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
-    }
 }

DigitalData.UserManager.API/Controllers/ModuleController.cs

@@ -4,13 +4,12 @@ using DigitalData.UserManager.Application.DTOs.Module;
 using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Authorize]
+public class ModuleController : ReadControllerBaseWithErrorHandling<IModuleService, ModuleDto, Module, int>
 {
-    [Authorize]
-    public class ModuleController : ReadControllerBaseWithErrorHandling<IModuleService, ModuleDto, Module, int>
-    {
     public ModuleController(ILogger<ModuleController> logger, IModuleService service) : base(logger, service)
     {
     }
-    }
 }

DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs

@@ -6,11 +6,11 @@ using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Authorize]
+public class ModuleOfUserController : CRUDControllerBaseWithErrorHandling<IModuleOfUserService, ModuleOfUserCreateDto, ModuleOfUserReadDto, ModuleOfUserUpdateDto, ModuleOfUser, int>
 {
-    [Authorize]
-    public class ModuleOfUserController : CRUDControllerBaseWithErrorHandling<IModuleOfUserService, ModuleOfUserCreateDto, ModuleOfUserReadDto, ModuleOfUserUpdateDto, ModuleOfUser, int>
-    {
     public ModuleOfUserController(ILogger<ModuleOfUserController> logger, IModuleOfUserService service) : base(logger, service)
     {
     }
@@ -49,5 +49,4 @@ namespace DigitalData.UserManager.API.Controllers
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
-    }
 }

DigitalData.UserManager.API/Controllers/UserController.cs

@@ -1,4 +1,3 @@
-using DigitalData.Core.API;
 using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.User;
@@ -6,11 +5,11 @@ using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Authorize]
+public class UserController : BaseAuthController<IUserService, UserCreateDto, UserReadDto, UserUpdateDto, User>
 {
-    [Authorize]
-    public class UserController : BaseAuthController<IUserService, UserCreateDto, UserReadDto, UserUpdateDto, User>
-    {
     public UserController(ILogger<UserController> logger, IUserService service) : base(logger, service, service)
     {
     }
@@ -96,5 +95,4 @@ namespace DigitalData.UserManager.API.Controllers
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
-    }
 }

DigitalData.UserManager.API/Controllers/UserRepController.cs

@@ -5,11 +5,11 @@ using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Authorize]
+public class UserRepController : BaseAuthController<IUserRepService, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep>
 {
-    [Authorize]
-    public class UserRepController : BaseAuthController<IUserRepService, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep>
-    {
     public UserRepController(ILogger<UserRepController> logger, IUserRepService service, IUserService userService) : base(logger, service, userService)
     {
     }
@@ -38,5 +38,4 @@ namespace DigitalData.UserManager.API.Controllers
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
-    }
 }

DigitalData.UserManager.API/DigitalData.UserManager.API.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.20" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />

DigitalData.UserManager.API/Program.cs

@@ -83,7 +83,7 @@ try {
     builder.Services.AddUserManager<UserManagerDbContext>();
     
     builder.ConfigureBySection<DirectorySearchOptions>();
-    builder.Services.AddDirectorySearchService();
+    builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
 
     builder.Services.AddCookieBasedLocalizer();
 

DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj

@@ -27,8 +27,8 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.1.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
-    <PackageReference Include="DigitalData.Core.Application" Version="3.0.1" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
     <PackageReference Include="DigitalData.Core.DTO" Version="2.0.1" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />

DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.1.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
   </ItemGroup>
 
   <ItemGroup>