Update project file for version 3.0.2 release

- Changed SDK declaration to include a non-breaking Unicode character.
- Incremented version number from 3.0.1 to 3.0.2 for package and assembly.
- Updated copyright year to 2024.

DigitalData.UserManager.API/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.3",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

DigitalData.UserManager.API/Controllers/AuthController.cs

@@ -1,117 +1,36 @@
-using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authentication;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Mvc;
-using DigitalData.UserManager.Application.Contracts;
-using DigitalData.UserManager.Application.DTOs.User;
 using Microsoft.AspNetCore.Authorization;
-using DigitalData.UserManager.Application;
 using DigitalData.UserManager.Application.DTOs.Auth;
-using DigitalData.Core.Abstractions.Application;
+using DigitalData.UserManager.Application.Contracts;
-using Microsoft.Extensions.Localization;
 using DigitalData.Core.DTO;
+using Microsoft.Extensions.Localization;
+using DigitalData.UserManager.Application;
+using System.Security.Claims;
 
-namespace DigitalData.UserManager.API.Controllers
+namespace DigitalData.UserManager.API.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class AuthController : ControllerBase
 {
-    [Route("api/[controller]")]
+    private readonly ILogger<UserController> _logger;
-    public class AuthController : ControllerBase
-    {
     private readonly IUserService _userService;
-        private readonly IGroupOfUserService _gouService;
-        private readonly IDirectorySearchService _dirSearchService;
     private readonly IStringLocalizer<Resource> _localizer;
-        private readonly ILogger<AuthController> _logger;
+
-        private readonly IConfiguration _config;
+    public AuthController(ILogger<UserController> logger, IUserService userService, IStringLocalizer<Resource> localizer)
-        public AuthController(IUserService userService, IGroupOfUserService gouService, IDirectorySearchService directorySearchService, IStringLocalizer<Resource> localizer, ILogger<AuthController> logger, IConfiguration configuration)
     {
-            _userService = userService;
-            _gouService = gouService;
-            _dirSearchService = directorySearchService;
-            _localizer = localizer;
         _logger = logger;
-            _config = configuration;
+        _userService = userService;
+        _localizer = localizer;
     }
 
-        [AllowAnonymous]
+    [Authorize]
     [HttpGet("check")]
-        public IActionResult CheckAuthentication()
+    public IActionResult CheckAuthentication() => Ok();
-        {
-            try
-            {
-                return Ok(User.Identity?.IsAuthenticated ?? false);
-            }
-            catch(Exception ex)
-            {
-                _logger.LogError(ex, "{Message}", ex.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
-        }
 
     [AllowAnonymous]
     [HttpPost("login")]
-        public async Task<IActionResult> Login([FromBody] LogInDto login)
+    public Task<IActionResult> Login([FromBody] LogInDto login) => throw new NotImplementedException();
-        {
-            try
-            {
-                bool isValid = _dirSearchService.ValidateCredentials(login.Username, login.Password);
-
-                if (!isValid)
-                    return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFound]));
-
-                var allowedGroupName = _config.GetSection("AllowedGroupName").Get<string>()
-                    ?? throw new InvalidOperationException("Allowed group names configuration is missing.");
-
-                var gouMsg = await _gouService.HasGroup(login.Username, allowedGroupName, caseSensitive: false);
-                if (!gouMsg.IsSuccess)
-                    return Unauthorized(Result.Fail().Message(_localizer[Key.UnauthorizedUser]));
-                
-                //find the user
-                var uRes = await _userService.ReadByUsernameAsync(login.Username);
-                if (!uRes.IsSuccess || uRes.Data is null)
-                {
-                    return Unauthorized(uRes);
-                }
-
-                UserReadDto user = uRes.Data;
-
-                // Create claims
-                var claims = new List<Claim>
-            {
-                new (ClaimTypes.NameIdentifier, user.Id.ToString()),
-                new (ClaimTypes.Name, user.Username),
-                new (ClaimTypes.Surname, user.Name ?? ""),
-                new (ClaimTypes.GivenName, user.Prename ?? ""),
-                new (ClaimTypes.Email, user.Email ?? ""),
-                new (ClaimTypes.Role, "PM_USER")
-            };
-
-                // Create claimsIdentity
-                var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
-
-                // Create authProperties
-                var authProperties = new AuthenticationProperties
-                {
-                    IsPersistent = true,
-                    AllowRefresh = true,
-                    ExpiresUtc = DateTime.UtcNow.AddMinutes(60)
-                };
-
-                // Sign in
-                await HttpContext.SignInAsync(
-                    CookieAuthenticationDefaults.AuthenticationScheme,
-                    new ClaimsPrincipal(claimsIdentity),
-                    authProperties);
-
-                _dirSearchService.SetSearchRootCache(user.Username, login.Password);
-
-                return Ok();
-            }
-            catch(Exception ex)
-            {
-                _logger.LogError(ex, "{Message}", ex.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
-        }
 
     [Authorize]
     [HttpGet("user")]
@@ -141,18 +60,13 @@ namespace DigitalData.UserManager.API.Controllers
 
     [Authorize]
     [HttpPost("logout")]
-        public async Task<IActionResult> Logout()
+    public IActionResult Logout()
     {
-            try
+        Response.Cookies.Delete("AuthToken", new()
         {
-                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+            Path = "/"
+        });
+
         return Ok();
     }
-            catch(Exception ex)
-            {
-                _logger.LogError(ex, "{Message}", ex.Message);
-                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

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>4.0.0.0</Version>
+    <Version>6.0.1</Version>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <AssemblyVersion>6.0.1</AssemblyVersion>
-    <FileVersion>4.0.0.0</FileVersion>
+    <FileVersion>6.0.1</FileVersion>
+    <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,29 +21,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Auth.Client" Version="1.3.5" />
+    <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" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.3.2" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
-    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -50,6 +42,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="..\Assets\icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
     <None Include="wwwroot\assets\img\DD_white.svg" />
     <None Include="wwwroot\assets\img\digital_data.svg" />
     <None Include="wwwroot\assets\img\digital_data_red_BG.svg" />
@@ -63,4 +59,8 @@
     <None Include="wwwroot\media\bootstrap-icons-X6UQXWUS.woff2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalData.UserManager.DependencyInjection\DigitalData.UserManager.DependencyInjection.csproj" />
+  </ItemGroup>
+
 </Project>

DigitalData.UserManager.API/LazyServiceProvider.cs

@@ -0,0 +1,18 @@
+namespace DigitalData.UserManager.API;
+
+public class LazyServiceProvider : IServiceProvider
+{
+    private Lazy<IServiceProvider>? _serviceProvider;
+
+    public Func<IServiceProvider> Factory
+    {
+        set => _serviceProvider = new(value);
+    }
+
+    public object? GetService(Type serviceType)
+    {
+        if (_serviceProvider is null)
+            throw new InvalidOperationException("GetService cannot be called before _serviceProvider is set.");
+        return _serviceProvider.Value.GetService(serviceType);
+    }
+}

DigitalData.UserManager.API/Models/AuthTokenKeys.cs

@@ -0,0 +1,12 @@
+namespace DigitalData.UserManager.API.Models;
+
+public class AuthTokenKeys
+{
+    public string Cookie { get; init; } = "AuthToken";
+
+    public string QueryString { get; init; } = "AuthToken";
+
+    public string Issuer { get; init; } = "auth.digitaldata.works";
+
+    public string Audience { get; init; } = "user-manager.digitaldata.works";
+}

DigitalData.UserManager.API/Models/ModelExtensions.cs

@@ -0,0 +1,18 @@
+using DigitalData.UserManager.Application.DTOs.User;
+using System.Security.Claims;
+
+namespace DigitalData.UserManager.API.Models;
+
+public static class ModelExtensions
+{
+    public static List<Claim> ToClaimList(this UserReadDto user) => new()
+    {
+        new (ClaimTypes.NameIdentifier, user.Id.ToString()),
+        new (ClaimTypes.Name, user.Username),
+        new (ClaimTypes.Surname, user.Name ?? ""),
+        new (ClaimTypes.GivenName, user.Prename ?? ""),
+        new (ClaimTypes.Email, user.Email ?? "")
+    };
+
+    public static Dictionary<string, object> ToClaimDictionary(this UserReadDto user) => user.ToClaimList().ToDictionary(claim => claim.Type, claim => (object)claim.Value);
+}

DigitalData.UserManager.API/Program.cs

@@ -10,20 +10,27 @@ using DigitalData.UserManager.API.Controllers;
 using DigitalData.UserManager.Application.Services;
 using Microsoft.Data.SqlClient;
 using Newtonsoft.Json;
+using Microsoft.IdentityModel.Tokens;
+using DigitalData.UserManager.Application.DTOs.User;
+using DigitalData.UserManager.API.Models;
+using DigitalData.Auth.Client;
+using DigitalData.UserManager.API;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.Options;
+using DigitalData.Core.Abstractions.Security.Extensions;
+using Microsoft.OpenApi.Models;
+using DigitalData.UserManager.DependencyInjection;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Debug("init main");
 
 try {
-    var builder = WebApplication.CreateBuilder(args);
+    var builder = WebApplication.CreateBuilder();
     
     var config = builder.Configuration;
 
     builder.Services.AddEncryptor(builder.Configuration.GetSection("EncryptionParameters"));
 
-    if (builder.Configuration.GetValue<bool>("RunAsWindowsService"))
-        builder.Host.UseWindowsService();
-
     builder.Logging.ClearProviders();
     builder.Host.UseNLog();
 
@@ -63,7 +70,7 @@ try {
     // Once the app is built, the password will be decrypted with Encryptor. lazy loading also acts as a call back method.
     Lazy<string>? cnn_str = null;
 
-    builder.Services.AddDbContext<UserManagerDbContext>(options => options.UseSqlServer(cnn_str!.Value).EnableSensitiveDataLogging());
+    builder.Services.AddUserManager(options => options.UseSqlServer(cnn_str!.Value).EnableSensitiveDataLogging());
 
     var allowedOrigins = builder.Configuration.GetSection("AllowedOrigins").Get<string[]>() ?? throw new InvalidOperationException("In appsettings there is no allowed origin.");
 
@@ -79,16 +86,92 @@ try {
             });
     });
         
-    //builder.Services.AddAutoMapper(typeof(DirectoryMappingProfile).Assembly);
-    builder.Services.AddUserManager<UserManagerDbContext>();
-    
     builder.ConfigureBySection<DirectorySearchOptions>();
-    builder.Services.AddDirectorySearchService();
+    builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
+    builder.Services.AddJWTService<UserReadDto>(user => new SecurityTokenDescriptor()
+    {
+        Claims = user.ToClaimList().ToDictionary(claim => claim.Type, claim => claim.Value as object)
+    });
+
+    var lazyProvider = new LazyServiceProvider();
+
+    builder.Services.AddAuthHubClient(config.GetSection("AuthClientParams"));
+
+    var authTokenKeys = config.GetSection(nameof(AuthTokenKeys)).Get<AuthTokenKeys>() ?? new();
+
+    builder.Services
+        .AddAuthentication(options =>
+        {
+            options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+            options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+        })
+        .AddJwtBearer(opt =>
+        {
+            opt.TokenValidationParameters = new TokenValidationParameters
+            {
+                ValidateIssuerSigningKey = true,
+                IssuerSigningKeyResolver = (token, securityToken, identifier, parameters) =>
+                {
+                    var clientParams = lazyProvider.GetRequiredService<IOptions<ClientParams>>()?.Value;
+                    var publicKey = clientParams!.PublicKeys.Get(authTokenKeys.Issuer, authTokenKeys.Audience);
+                    return new List<SecurityKey>() { publicKey.SecurityKey };
+                },
+                ValidateIssuer = true,
+                ValidIssuer = authTokenKeys.Issuer,
+                ValidateAudience = true,
+                ValidAudience = authTokenKeys.Audience,
+            };
+
+            opt.Events = new JwtBearerEvents
+            {
+                OnMessageReceived = context =>
+                {
+                    // if there is no token read related cookie or query string
+                    if (context.Token is null)   // if there is no token
+                    {
+                        if (context.Request.Cookies.TryGetValue(authTokenKeys.Cookie, out var cookieToken) && cookieToken is not null)
+                            context.Token = cookieToken;
+                        else if (context.Request.Query.TryGetValue(authTokenKeys.QueryString, out var queryStrToken))
+                            context.Token = queryStrToken;
+                    }
+                    return Task.CompletedTask;
+                }
+            };
+        });
+
+    builder.Services.AddSwaggerGen(setupAct =>
+    {
+        setupAct.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+        {
+            Description = "JWT Authorization header using the Bearer scheme. Example: \"Bearer {token}\"",
+            Name = "Authorization",
+            In = ParameterLocation.Header,
+            Type = SecuritySchemeType.Http,
+            Scheme = "Bearer"
+        });
+
+        setupAct.AddSecurityRequirement(new OpenApiSecurityRequirement
+        {
+            {
+                new OpenApiSecurityScheme
+                {
+                    Reference = new OpenApiReference
+                    {
+                        Type = ReferenceType.SecurityScheme,
+                        Id = "Bearer"
+                    }
+                },
+                Array.Empty<string>()
+            }
+        });
+    });
 
     builder.Services.AddCookieBasedLocalizer();
 
     var app = builder.Build();
 
+    lazyProvider.Factory = () => app.Services;
+
     cnn_str = new(() =>
     {
         var encryptor = app.Services.GetRequiredService<Encryptor>();

DigitalData.UserManager.API/Properties/PublishProfiles/IISProfile Net 7.pubxml

@@ -11,9 +11,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <ProjectGuid>07ccd651-647c-49f7-9715-30cebc13710d</ProjectGuid>
-    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\DD-UserManager\Web\${Version}\$(Version).zip</DesktopBuildPackageLocation>
+    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\DD-UserManager\Web\$(Version)\$(Version).zip</DesktopBuildPackageLocation>
     <PackageAsSingleFile>true</PackageAsSingleFile>
     <DeployIisAppPath>UserManager.API</DeployIisAppPath>
     <_TargetId>IISWebDeployPackage</_TargetId>
+	<TargetFramework>net7.0</TargetFramework>
+	<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+	<SelfContained>true</SelfContained>
   </PropertyGroup>
 </Project>

DigitalData.UserManager.API/Properties/PublishProfiles/IISProfile.pubxml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <WebPublishMethod>Package</WebPublishMethod>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <ProjectGuid>07ccd651-647c-49f7-9715-30cebc13710d</ProjectGuid>
-    <DesktopBuildPackageLocation>E:\TekH\Visual Studio\src\DigitalData.UserManager.API.zip</DesktopBuildPackageLocation>
-    <PackageAsSingleFile>true</PackageAsSingleFile>
-    <DeployIisAppPath>UserManager</DeployIisAppPath>
-    <_TargetId>IISWebDeployPackage</_TargetId>
-  </PropertyGroup>
-</Project>

DigitalData.UserManager.API/Properties/launchSettings.json

@@ -22,7 +22,7 @@
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": true,
+      "launchBrowser": false,
       "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7103;http://localhost:5137",
       "environmentVariables": {

DigitalData.UserManager.API/appsettings.json

@@ -75,5 +75,16 @@
   "DateTimeZoneHandling": "Local",
   // Delete below in production
   "UseEncryptor": true,
-  "UseSwagger": true
+  "UseSwagger": true,
+  "AuthClientParams": {
+    "Url": "https://localhost:7192/auth-hub",
+    "PublicKeys": [
+      {
+        "Issuer": "auth.digitaldata.works",
+        "Audience": "user-manager.digitaldata.works",
+        "Content": "-----BEGIN PUBLIC KEY-----MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3QCd7dH/xOUITFZbitMa/xnh8a0LyL6ZBvSRAwkI9ceplTRSHJXoM1oB+xtjWE1kOuHVLe941Tm03szS4+/rHIm0Ejva/KKlv7sPFAHE/pWuoPS303vOHgI4HAFcuwywA8CghUWzaaK5LU/Hl8srWwxBHv5hKIUjJFJygeAIENvFOZ1gFbB3MPEC99PiPOwAmfl4tMQUmSsFyspl/RWVi7bTv26ZE+m3KPcWppmvmYjXlSitxRaySxnfFvpca/qWfd/uUUg2KWKtpAwWVkqr0qD9v3TyKSgHoGDsrFpwSx8qufUJSinmZ1u/0iKl6TXeHubYS4C4SUSVjOWXymI2ZQIDAQAB-----END PUBLIC KEY-----"
+      }
+    ],
+    "RetryDelay": "00:00:05"
+  }
 }

DigitalData.UserManager.Application/Contracts/Repositories/IClientUserRepository.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IClientUserRepository : ICRUDRepository<ClientUser, int>
+{
+    Task<IEnumerable<ClientUser>> ReadAsync(bool readOnly = true, int? userId = null);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IGroupOfUserRepository.cs

@@ -0,0 +1,27 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IGroupOfUserRepository : ICRUDRepository<GroupOfUser, int>
+{
+    IQueryable<GroupOfUser> ReadByGroupId(int groupId);
+
+    Task<IEnumerable<GroupOfUser>> ReadByGroupUserIdAsync(int groupId, int userId);
+
+    Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroup();
+
+    Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithUser();
+
+    Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser();
+
+    Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username);
+
+    Task<IEnumerable<GroupOfUser>> ReadByUserIdAsync(int userId);
+
+    // merge all GroupOfUserRepository-methods conditionally under this method
+    Task<IEnumerable<GroupOfUser>> ReadAsync(
+        bool readOnly = true,
+        bool withGroup = true, bool withUser = true,
+        int? id = null, int? groupId = null, int? userId = null, string? username = null);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IGroupRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IGroupRepository : ICRUDRepository<Group, int>
+{
+}

DigitalData.UserManager.Application/Contracts/Repositories/IModuleOfUserRepository.cs

@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IModuleOfUserRepository : ICRUDRepository<ModuleOfUser, int>
+{
+    IQueryable<ModuleOfUser> ReadByModuleId(int moduleId);
+
+    Task<IEnumerable<ModuleOfUser>> ReadByModelUserIdAsync(int moduleId, int userId);
+
+    Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IModuleRepository.cs

@@ -0,0 +1,8 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IModuleRepository : ICRUDRepository<Module, int>
+{
+}

DigitalData.UserManager.Application/Contracts/Repositories/IUserRepRepository.cs

@@ -0,0 +1,11 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IUserRepRepository : ICRUDRepository<UserRep, int>
+{
+    Task<IEnumerable<UserRep>> ReadAllAsync(
+        bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false,
+        int? userId = null, int? repUserId = null, int? groupId = null, int? repGroupId = null, bool readOnly = true);
+}

DigitalData.UserManager.Application/Contracts/Repositories/IUserRepository.cs

@@ -0,0 +1,17 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.UserManager.Domain.Entities;
+
+namespace DigitalData.UserManager.Application.Contracts.Repositories;
+
+public interface IUserRepository : ICRUDRepository<User, int>
+{
+    Task<IEnumerable<User>> ReadByModuleIdAsync(int moduleId);
+
+    Task<IEnumerable<User>> ReadUnassignedByModuleIdAsync(int moduleId);
+
+    Task<IEnumerable<User>> ReadByGroupIdAsync(int groupId);
+
+    Task<IEnumerable<User>> ReadUnassignedByGroupIdAsync(int groupId);
+
+    Task<User?> ReadByUsernameAsync(string username);
+}

DigitalData.UserManager.Application/DIExtensions.cs

@@ -2,9 +2,6 @@
 using DigitalData.UserManager.Application.MappingProfiles;
 using DigitalData.UserManager.Application.Services;
 using DigitalData.UserManager.Application.Services.Options;
-using DigitalData.UserManager.Infrastructure.Contracts;
-using DigitalData.UserManager.Infrastructure.Repositories;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -19,8 +16,7 @@ namespace DigitalData.UserManager.Application
         /// <typeparam name="TDbContext">The type of the DbContext to use for the repositories.</typeparam>
         /// <param name="services">The IServiceCollection to which the services will be added.</param>
         /// <returns>The updated IServiceCollection.</returns>
-        public static IServiceCollection AddUserManager<TDbContext>(this IServiceCollection services)
+        public static IServiceCollection AddUserManagerApplication(this IServiceCollection services)
-            where TDbContext : DbContext, IUserManagerDbContext
             => services
             .AddAutoMapper(typeof(UserMappingProfile).Assembly)
             .AddAutoMapper(typeof(GroupMappingProfile).Assembly)
@@ -29,14 +25,6 @@ namespace DigitalData.UserManager.Application
             .AddAutoMapper(typeof(ModuleOfUserMappingProfile).Assembly)
             .AddAutoMapper(typeof(UserRepMappingProfile).Assembly)
 
-            .AddScoped<IUserRepository, UserRepository<TDbContext>>()
-            .AddScoped<IGroupRepository, GroupRepository<TDbContext>>()
-            .AddScoped<IGroupOfUserRepository, GroupOfUserRepository<TDbContext>>()
-            .AddScoped<IModuleRepository, ModuleRepository<TDbContext>>()
-            .AddScoped<IModuleOfUserRepository, ModuleOfUserRepository<TDbContext>>()
-            .AddScoped<IUserRepRepository, UserRepRepository<TDbContext>>()
-            .AddScoped<IClientUserRepository, ClientUserRepository<TDbContext>>()
-
             .AddScoped<IUserService, UserService>()
             .AddScoped<IGroupService, GroupService>()
             .AddScoped<IGroupOfUserService, GroupOfUserService>()
@@ -44,16 +32,6 @@ namespace DigitalData.UserManager.Application
             .AddScoped<IModuleOfUserService, ModuleOfUserService>()
             .AddScoped<IUserRepService, UserRepService>();
         
-        /// <summary>
-        /// Adds the UserManager services and repositories to the specified <see cref="IServiceCollection"/>.
-        /// This method registers the necessary mappings, repositories, services and <see cref="UserManagerDbContext"/> for the UserManager.
-        /// </summary>
-        /// <param name="services">The IServiceCollection to which the services will be added.</param>
-        /// <returns>The updated IServiceCollection.</returns>
-        public static IServiceCollection AddUserManager(this IServiceCollection services, string connectionString)=> services
-            .AddDbContext<UserManagerDbContext>(options => options.UseSqlServer(connectionString).EnableSensitiveDataLogging())
-            .AddUserManager<UserManagerDbContext>();
-
         public static IServiceCollection AddEncryptor(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddSingleton<Encryptor>();

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

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>UserManager.Application</PackageId>
-    <Version>3.1.2</Version>
+    <Version>3.1.3</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>UserManager.Application</Product>
@@ -14,23 +14,26 @@
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
     <PackageTags>digital data application user maanger</PackageTags>
-    <AssemblyVersion>3.1.2</AssemblyVersion>
+    <AssemblyVersion>3.1.3</AssemblyVersion>
-    <FileVersion>3.1.2</FileVersion>
+    <FileVersion>3.1.3</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\DigitalData.UserManager.Domain\Assets\icon.png">
+    <None Include="..\Assets\icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.1.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.1" />
-    <PackageReference Include="DigitalData.Core.Application" Version="3.0.1" />
     <PackageReference Include="DigitalData.Core.DTO" Version="2.0.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	<PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
@@ -38,16 +41,26 @@
     <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
-    <ProjectReference Include="..\DigitalData.UserManager.Infrastructure\DigitalData.UserManager.Infrastructure.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+    <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
+    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Assets\icon.png">
+    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
   </ItemGroup>
 
 </Project>

DigitalData.UserManager.Application/Services/GroupOfUserService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.GroupOfUser;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Application.Services
 {

DigitalData.UserManager.Application/Services/GroupService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.Group;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.Extensions.Localization;
 
 namespace DigitalData.UserManager.Application.Services

DigitalData.UserManager.Application/Services/ModuleOfUserService.cs

@@ -4,7 +4,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.ModuleOfUser;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Application.Services
 {

DigitalData.UserManager.Application/Services/ModuleService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.Application;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.Module;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Application.Services
 {

DigitalData.UserManager.Application/Services/UserRepService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.UserRep;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 

DigitalData.UserManager.Application/Services/UserService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.User;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.Extensions.Localization;
 
 namespace DigitalData.UserManager.Application.Services

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

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PackageId>UserManager</PackageId>
+    <Version>1.0.0</Version>
+    <Authors>Digital Data GmbH</Authors>
+    <Company>Digital Data GmbH</Company>
+    <Product>UserManager</Product>
+    <Description>Die Hauptbibliothek, die Benutzer-, Gruppen- und Modulzuweisungen über Active Directory mit Entity Framework durchführt.</Description>
+    <Copyright>Copyright 2024</Copyright>
+    <PackageIcon>icon.png</PackageIcon>
+    <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
+    <PackageTags>digital data user maanger</PackageTags>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\Assets\icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
+    <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
+    <ProjectReference Include="..\DigitalData.UserManager.Infrastructure\DigitalData.UserManager.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>

DigitalData.UserManager.DependencyInjection/Extensions.cs

@@ -0,0 +1,25 @@
+using DigitalData.UserManager.Application;
+using DigitalData.UserManager.Infrastructure;
+using DigitalData.UserManager.Infrastructure.Contracts;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DigitalData.UserManager.DependencyInjection;
+
+public static class Extensions
+{
+    public static IServiceCollection AddUserManager<TDbContext>(this IServiceCollection services) 
+        where TDbContext : DbContext, IUserManagerDbContext
+    {
+        services.AddUserManagerInfrastructure<TDbContext>();
+        services.AddUserManagerApplication();
+        return services;
+    }
+
+    public static IServiceCollection AddUserManager(this IServiceCollection services, Action<DbContextOptionsBuilder> optionsAction)
+    {
+        services.AddUserManagerInfrastructure(optionsAction);
+        services.AddUserManagerApplication();
+        return services;
+    }
+}

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

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>UserManager.Domain</PackageId>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>UserManager.Domain</Product>
@@ -14,26 +14,19 @@
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
     <PackageTags>digital data domain user maanger</PackageTags>
-    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <AssemblyVersion>3.0.2</AssemblyVersion>
-    <FileVersion>3.0.1</FileVersion>
+    <FileVersion>3.0.2</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\DigitalData.UserManager.Application\Assets\icon.png">
+    <None Include="..\Assets\icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.1.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Assets\icon.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
   </ItemGroup>
 
 </Project>

DigitalData.UserManager.Infrastructure/Contracts/IClientUserRepository.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IClientUserRepository : ICRUDRepository<ClientUser, int>
-    {
-        Task<IEnumerable<ClientUser>> ReadAsync(bool readOnly = true, int? userId = null);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IGroupOfUserRepository.cs

@@ -1,28 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IGroupOfUserRepository : ICRUDRepository<GroupOfUser, int>
-    {
-        IQueryable<GroupOfUser> ReadByGroupId(int groupId);
-
-        Task<IEnumerable<GroupOfUser>> ReadByGroupUserIdAsync(int groupId, int userId);
-
-        Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroup();
-
-        Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithUser();
-
-        Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser();
-
-        Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username);
-
-        Task<IEnumerable<GroupOfUser>> ReadByUserIdAsync(int userId);
-
-        // merge all GroupOfUserRepository-methods conditionally under this method
-        Task<IEnumerable<GroupOfUser>> ReadAsync(
-            bool readOnly = true,
-            bool withGroup = true, bool withUser = true,
-            int? id = null, int? groupId = null, int? userId = null, string? username = null);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IGroupRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IGroupRepository : ICRUDRepository<Group, int>
-    {
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IModuleOfUserRepository.cs

@@ -1,14 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IModuleOfUserRepository : ICRUDRepository<ModuleOfUser, int>
-    {
-        IQueryable<ModuleOfUser> ReadByModuleId(int moduleId);
-
-        Task<IEnumerable<ModuleOfUser>> ReadByModelUserIdAsync(int moduleId, int userId);
-
-        Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IModuleRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IModuleRepository : ICRUDRepository<Module, int>
-    {
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IUserManagerDbContext.cs

@@ -1,10 +1,10 @@
 using DigitalData.UserManager.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Contracts
+namespace DigitalData.UserManager.Infrastructure.Contracts;
+
+public interface IUserManagerDbContext
 {
-    public interface IUserManagerDbContext
-    {
     public DbSet<GroupOfUser> GroupOfUsers { get; }
 
     public DbSet<Group> Groups { get; }
@@ -18,5 +18,4 @@ namespace DigitalData.UserManager.Infrastructure.Contracts
     public DbSet<UserRep> UserReps { get; }
 
     public DbSet<ClientUser> ClientUsers { get; }
-    }
 }

DigitalData.UserManager.Infrastructure/Contracts/IUserRepRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IUserRepRepository : ICRUDRepository<UserRep, int>
-    {
-        Task<IEnumerable<UserRep>> ReadAllAsync(
-            bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false,
-            int? userId = null, int? repUserId = null, int? groupId = null, int? repGroupId = null, bool readOnly = true);
-    }
-}

DigitalData.UserManager.Infrastructure/Contracts/IUserRepository.cs

@@ -1,18 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using DigitalData.UserManager.Domain.Entities;
-
-namespace DigitalData.UserManager.Infrastructure.Contracts
-{
-    public interface IUserRepository : ICRUDRepository<User, int>
-    {
-        Task<IEnumerable<User>> ReadByModuleIdAsync(int moduleId);
-
-        Task<IEnumerable<User>> ReadUnassignedByModuleIdAsync(int moduleId);
-
-        Task<IEnumerable<User>> ReadByGroupIdAsync(int groupId);
-
-        Task<IEnumerable<User>> ReadUnassignedByGroupIdAsync(int groupId);
-
-        Task<User?> ReadByUsernameAsync(string username);
-    }
-}

DigitalData.UserManager.Infrastructure/DependencyInjection.cs

@@ -0,0 +1,42 @@
+using DigitalData.UserManager.Application;
+using DigitalData.UserManager.Application.Contracts.Repositories;
+using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Infrastructure.Repositories;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DigitalData.UserManager.Infrastructure;
+
+public static class DependencyInjection
+{
+    /// <summary>
+    /// Adds the UserManager repositories to the specified <see cref="IServiceCollection"/>.
+    /// This method registers the necessary repositories for the UserManager.
+    /// </summary>
+    /// <typeparam name="TDbContext">The type of the DbContext to use for the repositories.</typeparam>
+    /// <param name="services">The IServiceCollection to which the services will be added.</param>
+    /// <returns>The updated IServiceCollection.</returns>
+    public static IServiceCollection AddUserManagerInfrastructure<TDbContext>(this IServiceCollection services)
+            where TDbContext : DbContext, IUserManagerDbContext
+    {
+        return services
+            .AddScoped<IUserRepository, UserRepository<TDbContext>>()
+            .AddScoped<IGroupRepository, GroupRepository<TDbContext>>()
+            .AddScoped<IGroupOfUserRepository, GroupOfUserRepository<TDbContext>>()
+            .AddScoped<IModuleRepository, ModuleRepository<TDbContext>>()
+            .AddScoped<IModuleOfUserRepository, ModuleOfUserRepository<TDbContext>>()
+            .AddScoped<IUserRepRepository, UserRepRepository<TDbContext>>()
+            .AddScoped<IClientUserRepository, ClientUserRepository<TDbContext>>();
+    }
+
+    /// <summary>
+    /// Adds the UserManager services and repositories to the specified <see cref="IServiceCollection"/>.
+    /// This method allows configuring the DbContext options using the provided <paramref name="optionsAction"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/> to which the services will be added.</param>
+    /// <param name="optionsAction">An <see cref="Action{T}"/> to configure the <see cref="DbContextOptionsBuilder"/>.</param>
+    /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
+    public static IServiceCollection AddUserManagerInfrastructure(this IServiceCollection services, Action<DbContextOptionsBuilder> optionsAction) => services
+        .AddDbContext<UserManagerDbContext>(optionsAction)
+        .AddUserManagerInfrastructure<UserManagerDbContext>();
+}

DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+	<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>UserManager.Infrastructure</PackageId>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>UserManager.Infrastructure</Product>
@@ -14,36 +14,39 @@
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebUserManager.git</RepositoryUrl>
     <PackageTags>digital data infrastructure user maanger</PackageTags>
-    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <AssemblyVersion>3.0.2</AssemblyVersion>
-    <FileVersion>3.0.1</FileVersion>
+    <FileVersion>3.0.2</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\DigitalData.UserManager.Domain\Assets\icon.png">
+    <None Include="..\Assets\icon.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
+  </ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
+	
-      <PrivateAssets>all</PrivateAssets>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
     <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Assets\icon.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-
 </Project>

DigitalData.UserManager.Infrastructure/Repositories/ClientUserRepository.cs

@@ -1,7 +1,8 @@
 using DigitalData.Core.Infrastructure;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
+using DigitalData.UserManager.Infrastructure.Contracts;
 
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {

DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs

@@ -2,6 +2,7 @@
 using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.Core.Infrastructure;
 using Microsoft.EntityFrameworkCore;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {

DigitalData.UserManager.Infrastructure/Repositories/GroupRepository.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;

DigitalData.UserManager.Infrastructure/Repositories/ModuleOfUserRepository.cs

@@ -1,13 +1,14 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Repositories
+namespace DigitalData.UserManager.Infrastructure.Repositories;
-{
+
-    public class ModuleOfUserRepository<TDbContext> : CRUDRepository<ModuleOfUser, int, TDbContext>, IModuleOfUserRepository
+public class ModuleOfUserRepository<TDbContext> : CRUDRepository<ModuleOfUser, int, TDbContext>, IModuleOfUserRepository
     where TDbContext : DbContext, IUserManagerDbContext
-    {
+{
     public ModuleOfUserRepository(TDbContext dbContext) : base(dbContext, dbContext.ModuleOfUsers)
     {
     }
@@ -28,5 +29,4 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
     }
 
     public async Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username) => await ReadByUser(username).ToListAsync();
-    }
 }

DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs

@@ -1,15 +1,15 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Repositories
+namespace DigitalData.UserManager.Infrastructure.Repositories;
-{
+
-    public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
+public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
     where TDbContext : DbContext, IUserManagerDbContext
-    {
+{
     public ModuleRepository(TDbContext dbContext) : base(dbContext, dbContext.Modules)
     {
     }
-    }
 }

DigitalData.UserManager.Infrastructure/Repositories/UserRepRepository.cs

@@ -1,13 +1,14 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
 
-namespace DigitalData.UserManager.Infrastructure.Repositories
+namespace DigitalData.UserManager.Infrastructure.Repositories;
-{
+
-    public class UserRepRepository<TDbContext> : CRUDRepository<UserRep, int, TDbContext>, IUserRepRepository
+public class UserRepRepository<TDbContext> : CRUDRepository<UserRep, int, TDbContext>, IUserRepRepository
     where TDbContext : DbContext, IUserManagerDbContext
-    {
+{
     public UserRepRepository(TDbContext dbContext) : base(dbContext, dbContext.UserReps)
     {
     }
@@ -44,5 +45,4 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
 
         return await query.ToListAsync();
     }
-    }
 }

DigitalData.UserManager.Infrastructure/Repositories/UserRepository.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Infrastructure;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;

DigitalData.UserManager.sln

@@ -11,6 +11,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.Inf
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.API", "DigitalData.UserManager.API\DigitalData.UserManager.API.csproj", "{07CCD651-647C-49F7-9715-30CEBC13710D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.UserManager.DependencyInjection", "DigitalData.UserManager.DependencyInjection\DigitalData.UserManager.DependencyInjection.csproj", "{7E5FD115-EE6D-48F2-ACF1-E951EC071073}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+	ProjectSection(SolutionItems) = preProject
+		Assets\icon.png = Assets\icon.png
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,10 +42,17 @@ Global
 		{07CCD651-647C-49F7-9715-30CEBC13710D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07CCD651-647C-49F7-9715-30CEBC13710D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07CCD651-647C-49F7-9715-30CEBC13710D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E5FD115-EE6D-48F2-ACF1-E951EC071073}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6804DE1E-B257-4DC9-B9D4-08C8518C8282}
 	EndGlobalSection