chore(DI): bump to 1.1.3

- Anpassung des Namespace und der Klammern der Klasse „User“, um sowohl .NET als auch .NET Framework zu unterstützen.
- Beibehaltung bestehender Eigenschaften und Anmerkungen, einschließlich der Behandlung von Nullwerten und erforderlichen Angaben pro Ziel.
- Gewährleistet die korrekte Kompilierung unter den Bedingungen „#if NET“ und „#if NETFRAMEWORK“.

src/DigitalData.UserManager.API/ClientApp/user_manager_ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "user-manager-ui",
-  "version": "4.1.0",
+  "version": "2.0.0",
   "minApiVersion":"6.1.3",
   "scripts": {
     "ng": "ng",

src/DigitalData.UserManager.API/Controllers/DirectoryController.cs

@@ -9,6 +9,8 @@ using Microsoft.Extensions.Localization;
 using Microsoft.AspNetCore.Authorization;
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
+using Microsoft.Extensions.Options;
+using DigitalData.UserManager.API.Models;
 
 namespace DigitalData.UserManager.API.Controllers;
 
@@ -23,8 +25,9 @@ public class DirectoryController : ControllerBase
     private readonly Dictionary<string, string> _customSearchFilters;
     private readonly IStringLocalizer<Resource> _localizer;
     private readonly ILogger<DirectoryController> _logger;
+    private readonly DirSearchRoot _dirSearchRoot;
 
-    public DirectoryController(IConfiguration configuration, IStringLocalizer<Resource> localizer, IUserService userService, IDirectorySearchService directorySearchService, ILogger<DirectoryController> logger)
+    public DirectoryController(IConfiguration configuration, IStringLocalizer<Resource> localizer, IUserService userService, IDirectorySearchService directorySearchService, ILogger<DirectoryController> logger, IOptions<DirSearchRoot> dirSearchRootOptions)
     {
         _localizer = localizer;
         _userService = userService;
@@ -33,23 +36,7 @@ public class DirectoryController : ControllerBase
         var customSearchFiltersSection = configuration.GetSection("DirectorySearch:CustomSearchFilters");
         _customSearchFilters = customSearchFiltersSection.Get<Dictionary<string, string>>() ?? new();
         _logger = logger;
-    }
-
-    [HttpGet("Root/{username}")]
-    public IActionResult GetRootOf(string username)
-    {
-        var root = _dirSearchService.GetSearchRootCache(username);
-
-        return root is null ? NotFound() : Ok(new
-        {
-            guid = root.Guid,
-            nativeGuid = root.NativeGuid,
-            name = root.Name,
-            path = root.Path,
-            parentPath = root.Parent?.Path,
-            username = root.Username,
-            schemaClassName = root.SchemaClassName
-        });
+        _dirSearchRoot = dirSearchRootOptions.Value;
     }
 
     [HttpGet("CustomSearchFilter")]
@@ -66,26 +53,6 @@ public class DirectoryController : ControllerBase
         }
     }
 
-    [HttpPost]
-    public async Task<IActionResult> CreateSearchRoot([FromBody] SearchRootCreateDto searchRootCreateDto)
-    {
-        var dirEntryUsername = searchRootCreateDto.Username ?? CurrentUser;
-        if (dirEntryUsername is null)
-            return Unauthorized();
-
-        bool isValid = _dirSearchService.ValidateCredentials(dirEntryUsername, searchRootCreateDto.Password);
-
-        if (!isValid)
-            return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFound]));
-
-        var userResult = await _userService.ReadByUsernameAsync(dirEntryUsername);
-        if (!userResult.IsSuccess || userResult.Data is null)
-            return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFoundInLocalDB]));
-
-        _dirSearchService.SetSearchRootCache(userResult.Data.Username, searchRootCreateDto.Password);
-        return Ok();
-    }
-
     [HttpGet("SearchByFilter/{filter}")]
     public IActionResult SearchByFilter([FromRoute] string filter, string? dirEntryUsername, params string[] propName)
     {
@@ -94,7 +61,9 @@ public class DirectoryController : ControllerBase
         if (dirEntryUsername is null)
             return Unauthorized();
 
-        return _dirSearchService.FindAllByUserCache(dirEntryUsername, filter, properties: propName).Then(Ok, IActionResult (m, n) =>
+        using var sRoot = _dirSearchRoot.ToDirectoryEntry;
+
+        return _dirSearchService.FindAll(sRoot, filter, properties: propName).Then(Ok, IActionResult (m, n) =>
         {
             _logger.LogNotice(n);
             return StatusCode(StatusCodes.Status424FailedDependency);
@@ -114,7 +83,9 @@ public class DirectoryController : ControllerBase
         if (filter is null)
             return NotFound($"The filter named {filterName} does not exist.");
 
-        return _dirSearchService.FindAllByUserCache(dirEntryUsername, filter, properties: propName).Then(Ok, IActionResult (m, n) =>
+        using var sRoot = _dirSearchRoot.ToDirectoryEntry;
+
+        return _dirSearchService.FindAll(sRoot, filter, properties: propName).Then(Ok, IActionResult (m, n) =>
         {
             _logger.LogNotice(n);
             return StatusCode(StatusCodes.Status424FailedDependency);
@@ -135,7 +106,9 @@ public class DirectoryController : ControllerBase
         if (filter is null)
             throw new InvalidOperationException("The LDAP Group Search filter configuration is missing in your appsettings. Please ensure it's added under DirectorySearch:CustomSearchFilters:Group to enable group searches.");
 
-        return _dirSearchService.FindAllByUserCache(username: dirEntryUsername, filter, properties: propName).Then(Ok, IActionResult (m, n) =>
+        using var sRoot = _dirSearchRoot.ToDirectoryEntry;
+
+        return _dirSearchService.FindAll(_dirSearchRoot.ToDirectoryEntry, filter, properties: propName).Then(Ok, IActionResult (m, n) =>
         {
             _logger.LogNotice(n);
             return StatusCode(StatusCodes.Status424FailedDependency);
@@ -156,7 +129,9 @@ public class DirectoryController : ControllerBase
         if (filter is null)
             throw new InvalidOperationException("The LDAP User Search filter configuration is missing in your appsettings. Please ensure it's added under DirectorySearch:CustomSearchFilters:User to enable group searches.");
 
-        return _dirSearchService.FindAllByUserCache(username: dirEntryUsername, filter, properties: propName).Then(
+        using var sRoot = _dirSearchRoot.ToDirectoryEntry;
+
+        return _dirSearchService.FindAll(sRoot, filter, properties: propName).Then(
             Success: data =>
             {
                 if (groupName is not null)

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

@@ -4,9 +4,9 @@
     <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.1.3</Version>
-    <AssemblyVersion>6.1.3</AssemblyVersion>
-    <FileVersion>6.1.3</FileVersion>
+    <Version>6.1.4</Version>
+    <AssemblyVersion>6.1.4</AssemblyVersion>
+    <FileVersion>6.1.4</FileVersion>
     <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
 

src/DigitalData.UserManager.API/Models/AuthTokenKeys.cs

@@ -8,5 +8,5 @@ public class AuthTokenKeys
 
     public string Issuer { get; init; } = "auth.digitaldata.works";
 
-    public string Audience { get; init; } = "user-manager.digitaldata.works";
+    public string Audience { get; init; } = "usermanager.digitaldata.works";
 }

src/DigitalData.UserManager.API/Models/DirSearchRoot.cs

@@ -0,0 +1,22 @@
+using DigitalData.Core.Application;
+using System.DirectoryServices;
+
+namespace DigitalData.UserManager.API.Models;
+
+[Obsolete("Use ActiveDirectory.API")]
+public class DirSearchRoot : DirectorySearchOptions
+{
+    public string Path => $"LDAP://{ServerName}/{Root}";
+
+    public string? Username { get; set; }
+
+    public string? Password { get; set; }
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
+    public DirectoryEntry ToDirectoryEntry => new ()
+    {
+        Path = Path,
+        Username = Username,
+        Password = Password
+    };
+}

src/DigitalData.UserManager.API/Program.cs

@@ -82,6 +82,7 @@ try {
         
     builder.ConfigureBySection<DirectorySearchOptions>();
     builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
+    builder.Services.Configure<DirSearchRoot>(config.GetSection("DirectorySearchOptions"));
     builder.Services.AddJWTService<UserReadDto>(user => new SecurityTokenDescriptor()
     {
         Claims = user.ToClaimList().ToDictionary(claim => claim.Type, claim => claim.Value as object)
@@ -171,7 +172,6 @@ try {
         var eCnnStr = config.GetConnectionString("UM_DEF") ?? throw new InvalidOperationException("Connection string 'DD_ECM_Connection' is missing from the configuration.");
 
         SqlConnectionStringBuilder cnnStrBuilder = new(eCnnStr);
-        cnnStrBuilder.UserID = encryptor.Decrypt(cnnStrBuilder.UserID);
         cnnStrBuilder.Password = encryptor.Decrypt(cnnStrBuilder.Password);
         var dCnnStr = cnnStrBuilder.ConnectionString;
         return dCnnStr;

src/DigitalData.UserManager.API/appsettings.Auth.json

@@ -4,7 +4,7 @@
     "PublicKeys": [
       {
         "Issuer": "auth.digitaldata.works",
-        "Audience": "user-manager.digitaldata.works"
+        "Audience": "usermanager.digitaldata.works"
       }
     ],
     "RetryDelay": "00:00:05"

src/DigitalData.UserManager.API/appsettings.json

@@ -6,14 +6,15 @@
     }
   },
   "ConnectionStrings": {
-    "UM_DEF": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=g+2edXEbMbujCUjh7INZRQ==;Password=Bz/n9pu8EyzlVqicaMRQGQ==;Encrypt=false;TrustServerCertificate=True;"
+    "UM_DEF": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=Bz/n9pu8EyzlVqicaMRQGQ==;Encrypt=false;TrustServerCertificate=True;"
   },
   "AllowedOrigins": [ "https://localhost:7103", "http://172.24.12.39:85", "http://localhost:85", "http://localhost:4200", "http://localhost:5500", "https://localhost:7202" ],
   "RunAsWindowsService": false,
   "DirectorySearchOptions": {
     "ServerName": "DD-VMP01-DC01",
     "Root": "DC=dd-gan,DC=local,DC=digitaldata,DC=works",
-    "UserCacheExpirationDays": 1,
+    "Username": "FABRIK19-User01",
+    "Password": "9bWOr0UGuHn_7VkC",
     "CustomSearchFilters": {
       "User": "(&(objectClass=user)(sAMAccountName=*))",
       "Group": "(&(objectClass=group) (samAccountName=*))"

src/DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj

@@ -13,9 +13,9 @@
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
     <PackageTags>digital data user maanger</PackageTags>
-    <Version>1.1.2</Version>
-    <AssemblyVersion>1.1.2</AssemblyVersion>
-    <FileVersion>1.1.2</FileVersion>
+    <Version>1.1.3</Version>
+    <AssemblyVersion>1.1.3</AssemblyVersion>
+    <FileVersion>1.1.3</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs

@@ -6,36 +6,44 @@ using System;
 #endif
 
 namespace DigitalData.UserManager.Domain.Entities
-{
-    public class BaseEntity
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Column("GUID")]
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int Id { get; set; }
-
-        [StringLength(50)]
-        [Column("ADDED_WHO")]
-        public string
-#if NET7_0_OR_GREATER
-            ?
 #endif
-            AddedWho { get; set; }
 
-        [StringLength(50)]
-        [Column("CHANGED_WHO")]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+public class BaseEntity
+{
+    [Column("GUID")]
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public int Id { get; set; }
+
+    [StringLength(50)]
+    [Column("ADDED_WHO")]
+    public string
+#if NET
+        ?
 #endif
-            ChangedWho { get; set; }
+        AddedWho { get; set; }
 
-        //TODO: assign it to default value in create dto, not here!
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; } = DateTime.Now;
+    [StringLength(50)]
+    [Column("CHANGED_WHO")]
+    public string
+#if NET
+        ?
+#endif
+        ChangedWho { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-    }
+    //TODO: assign it to default value in create dto, not here!
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime AddedWhen { get; set; } = DateTime.Now;
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
 }
+
+#if NETFRAMEWORK
+    }
+#endif

src/DigitalData.UserManager.Domain/Entities/ClientUser.cs

@@ -25,7 +25,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [Column("COMMENT")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
@@ -33,7 +33,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(50)]
         [Column("ADDED_WHO")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             AddedWho { get; set; }

src/DigitalData.UserManager.Domain/Entities/Group.cs

@@ -9,7 +9,7 @@ namespace DigitalData.UserManager.Domain.Entities
     {
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
         Name { get; set; }
@@ -29,7 +29,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(200)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }

src/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs

@@ -16,21 +16,21 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(200)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("GroupId")]
         public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Group { get; set; }

src/DigitalData.UserManager.Domain/Entities/Module.cs

@@ -13,7 +13,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Name { get; set; }
@@ -21,7 +21,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(20)]
         [Column("SHORT_NAME")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             ShortName { get; set; }

src/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs

@@ -22,7 +22,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("COMMENT")]
         [StringLength(200)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
@@ -30,7 +30,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("ADDED_WHO")]
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             AddedWho { get; set; } = "DEFAULT";
@@ -38,21 +38,21 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("CHANGED_WHO")]
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             ChangedWho { get; set; }
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("ModuleId")]
         public virtual Module
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Module { get; set; }

src/DigitalData.UserManager.Domain/Entities/User.cs

@@ -6,122 +6,130 @@ using System;
 #endif
 
 namespace DigitalData.UserManager.Domain.Entities
-{
-    [Table("TBDD_USER", Schema = "dbo")]
-    public partial class User : BaseEntity
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Column("PRENAME")]
-        [StringLength(50)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
 #endif
-            Prename { get; set; }
 
-        [Column("NAME")]
-        [StringLength(50)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+[Table("TBDD_USER", Schema = "dbo")]
+public partial class User : BaseEntity
+{
+    [Column("PRENAME")]
+    [StringLength(50)]
+    public string
+#if NET
+        ?
 #endif
-            Name { get; set; }
+        Prename { get; set; }
 
-        [Required]
-        [Column("USERNAME")]
-        [StringLength(50)]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Column("NAME")]
+    [StringLength(50)]
+    public string
+#if NET
+        ?
 #endif
-            string Username { get; set; }
+        Name { get; set; }
 
-        [Column("SHORTNAME")]
-        [StringLength(30)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Required]
+    [Column("USERNAME")]
+    [StringLength(50)]
+    public
+#if NET
+        required
 #endif
-            Shortname
-        { get; set; }
+        string Username { get; set; }
 
-        [Column("EMAIL")]
-        [StringLength(100)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Column("SHORTNAME")]
+    [StringLength(30)]
+    public string
+#if NET
+        ?
 #endif
-            Email { get; set; }
+        Shortname
+    { get; set; }
 
-        [Required]
-        [Column("LANGUAGE")]
-        [StringLength(5)]
-        [DefaultValue("de-DE")]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Column("EMAIL")]
+    [StringLength(100)]
+    public string
+#if NET
+        ?
 #endif
-            Language { get; set; }
+        Email { get; set; }
 
-        [Column("COMMENT")]
-        [StringLength(500)]
-        public string
-#if NET7_0_OR_GREATER
-            ?
+    [Required]
+    [Column("LANGUAGE")]
+    [StringLength(5)]
+    [DefaultValue("de-DE")]
+    public string
+#if NET
+        ?
 #endif
-            Comment { get; set; }
+        Language { get; set; }
 
-        [Column("DELETED")]
-        public bool Deleted { get; set; }
-
-        [Required]
-        [Column("DATE_FORMAT")]
-        [StringLength(10)]
-        [DefaultValue("dd.MM.yyyy")]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Column("COMMENT")]
+    [StringLength(500)]
+    public string
+#if NET
+        ?
 #endif
-            string DateFormat { get; set; }
+        Comment { get; set; }
 
-        [Required]
-        [Column("ACTIVE")]
-        public bool Active { get; set; }
+    [Column("DELETED")]
+    public bool Deleted { get; set; }
 
-        [Required]
-        [Column("GENERAL_VIEWER")]
-        [StringLength(30)]
-        [DefaultValue("NONE")]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Required]
+    [Column("DATE_FORMAT")]
+    [StringLength(10)]
+    [DefaultValue("dd.MM.yyyy")]
+    public
+#if NET
+        required
 #endif
-            string GeneralViewer { get; set; }
+        string DateFormat { get; set; }
 
-        [Required]
-        [Column("WAN_ENVIRONMENT")]
-        public bool WanEnvironment { get; set; }
+    [Required]
+    [Column("ACTIVE")]
+    public bool Active { get; set; }
 
-        [Required]
-        [Column("USERID_FK_INT_ECM")]
-        public int UserIdFkIntEcm { get; set; }
-
-        [Column("DELETED_WHEN")]
-        public DateTime
-#if NET7_0_OR_GREATER
-            ?
+    [Required]
+    [Column("GENERAL_VIEWER")]
+    [StringLength(30)]
+    [DefaultValue("NONE")]
+    public
+#if NET
+        required
 #endif
-            DeletedWhen { get; set; }
+        string GeneralViewer { get; set; }
 
-        [Column("DELETED_WHO")]
-        [StringLength(50)]
-        public
-#if NET7_0_OR_GREATER
-            required
+    [Required]
+    [Column("WAN_ENVIRONMENT")]
+    public bool WanEnvironment { get; set; }
+
+    [Required]
+    [Column("USERID_FK_INT_ECM")]
+    public int UserIdFkIntEcm { get; set; }
+
+    [Column("DELETED_WHEN")]
+    public DateTime
+#if NET
+        ?
 #endif
-            string
-#if NET7_0_OR_GREATER
-            ?
-# endif
-            DeletedWho { get; set; }
-    }
+        DeletedWhen { get; set; }
+
+    [Column("DELETED_WHO")]
+    [StringLength(50)]
+    public
+#if NET
+        required
+#endif
+        string
+#if NET
+        ?
+#endif
+        DeletedWho { get; set; }
 }
+
+#if NETFRAMEWORK
+    }
+#endif

src/DigitalData.UserManager.Domain/Entities/UserRep.cs

@@ -28,28 +28,28 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("RepGroupId")]
         public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             RepGroup { get; set; }
 
         [ForeignKey("GroupId")]
         public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Group { get; set; }
 
         [ForeignKey("RepUserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             RepUser { get; set; }