diff --git a/DigitalData.UserManager.API/Controllers/AuthController.cs b/DigitalData.UserManager.API/Controllers/AuthController.cs index 2191614..f98f48e 100644 --- a/DigitalData.UserManager.API/Controllers/AuthController.cs +++ b/DigitalData.UserManager.API/Controllers/AuthController.cs @@ -9,6 +9,8 @@ using DigitalData.UserManager.Application; using DigitalData.UserManager.Application.DTOs.Auth; using DigitalData.Core.Contracts.Application; using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Localization; +using DigitalData.Core.DTO; namespace DigitalData.UserManager.API.Controllers { @@ -20,14 +22,16 @@ namespace DigitalData.UserManager.API.Controllers private IMemoryCache _memoryCache; private IConfiguration _configuration; private IDirectorySearchService _dirSearchService; + private readonly IStringLocalizer _localizer; - public AuthController(IUserService userService, IGroupOfUserService gouService, IMemoryCache memoryCache, IConfiguration configuration, IDirectorySearchService directorySearchService) + public AuthController(IUserService userService, IGroupOfUserService gouService, IMemoryCache memoryCache, IConfiguration configuration, IDirectorySearchService directorySearchService, IStringLocalizer localizer) { _userService = userService; _gouService = gouService; _memoryCache = memoryCache; _configuration = configuration; _dirSearchService = directorySearchService; + _localizer = localizer; } [AllowAnonymous] @@ -41,11 +45,11 @@ namespace DigitalData.UserManager.API.Controllers bool isValid = _dirSearchService.ValidateCredentials(login.Username, login.Password); if (!isValid) - return Unauthorized(_userService.Failed(MessageKey.UserNotFound.ToString())); + return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFound])); var gouMsg = await _gouService.HasGroup(login.Username, "PM_USER", caseSensitive:false); if(!gouMsg.IsSuccess) - return Unauthorized(_userService.Failed(MessageKey.UnauthorizedUser.ToString())); + return Unauthorized(Result.Fail().Message(_localizer[Key.UnauthorizedUser])); //find the user var uRes = await _userService.ReadByUsernameAsync(login.Username); @@ -103,7 +107,7 @@ namespace DigitalData.UserManager.API.Controllers if (!userDto.IsSuccess || userDto.Data is null) { - return NotFound(_userService.Failed("User not found.")); + return NotFound(Result.Fail().Message(_localizer[Key.UserNotFound])); } return Ok(userDto.Data); diff --git a/DigitalData.UserManager.API/Controllers/DirectoryController.cs b/DigitalData.UserManager.API/Controllers/DirectoryController.cs index c017802..004a1b4 100644 --- a/DigitalData.UserManager.API/Controllers/DirectoryController.cs +++ b/DigitalData.UserManager.API/Controllers/DirectoryController.cs @@ -6,11 +6,8 @@ using Microsoft.Extensions.Caching.Memory; using System.Diagnostics.CodeAnalysis; using System.Security.Claims; using DigitalData.UserManager.Application; -using DigitalData.UserManager.Application.DTOs.User; -using System.DirectoryServices; -using static System.Runtime.InteropServices.JavaScript.JSType; -using System.Linq; -using System.IO; +using Microsoft.Extensions.Localization; +using DigitalData.Core.DTO; namespace DigitalData.UserManager.API.Controllers { @@ -23,10 +20,12 @@ namespace DigitalData.UserManager.API.Controllers private IDirectorySearchService _dirSearchService; private IMemoryCache _memoryCache; private Dictionary _customSearchFilters; + private readonly IStringLocalizer _localizer; - public DirectoryController(IConfiguration configuration, ILogger logger, IUserService userService, IDirectorySearchService directorySearchService, IMemoryCache memoryCache) + public DirectoryController(IConfiguration configuration, ILogger logger, IStringLocalizer localizer, IUserService userService, IDirectorySearchService directorySearchService, IMemoryCache memoryCache) { _logger = logger; + _localizer = localizer; _userService = userService; _dirSearchService = directorySearchService; _memoryCache = memoryCache; @@ -76,11 +75,11 @@ namespace DigitalData.UserManager.API.Controllers bool isValid = _dirSearchService.ValidateCredentials(dirEntryUsername, searchRootCreateDto.DirEntryPassword); if (!isValid) - return Unauthorized(_dirSearchService.Failed(MessageKey.UserNotFound.ToString())); + return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFound])); var userResult = await _userService.ReadByUsernameAsync(dirEntryUsername); if(!userResult.IsSuccess || userResult.Data is null) - return Unauthorized(_dirSearchService.Failed(MessageKey.UserNotFoundInLocalDB.ToString())); + return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFoundInLocalDB])); _dirSearchService.SetSearchRootCache(userResult.Data.Username, searchRootCreateDto.DirEntryPassword); return Ok(); diff --git a/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs b/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs index 62c2594..b538d45 100644 --- a/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs +++ b/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs @@ -19,7 +19,7 @@ namespace DigitalData.UserManager.API.Controllers [HttpDelete] public async Task Delete([FromQuery] int moduleId, [FromQuery]int userId) { - IServiceMessage result = await _service.DeleteAsyncByModuleUserId(moduleId, userId); + var result = await _service.DeleteAsyncByModuleUserId(moduleId, userId); if (result.IsSuccess) { return Ok(result); diff --git a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj index c424aca..8b729a7 100644 --- a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj +++ b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj @@ -6,14 +6,6 @@ enable - - - - - - - - @@ -47,8 +39,8 @@ ..\..\WebCoreModules\DigitalData.Core.Contracts\bin\Debug\net7.0\DigitalData.Core.Contracts.dll - - ..\..\WebCoreModules\DigitalData.Core.CultureServices\bin\Debug\net7.0\DigitalData.Core.CultureServices.dll + + ..\..\WebCoreModules\DigitalData.Core.API\bin\Debug\net7.0\DigitalData.Core.DTO.dll ..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll diff --git a/DigitalData.UserManager.API/Program.cs b/DigitalData.UserManager.API/Program.cs index d0c4978..2c7a0e7 100644 --- a/DigitalData.UserManager.API/Program.cs +++ b/DigitalData.UserManager.API/Program.cs @@ -4,7 +4,6 @@ using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.Services; using DigitalData.UserManager.Infrastructure.Repositories; using DigitalData.UserManager.Infrastructure.Contracts; -using DigitalData.Core.CultureServices; using DigitalData.Core.Application; using Microsoft.AspNetCore.Authentication.Cookies; using NLog.Web; @@ -35,14 +34,13 @@ try { builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) .AddCookie(options => { - options.Cookie.HttpOnly = false; - //options.Cookie.SecurePolicy = CookieSecurePolicy.Always; //always https - options.Cookie.SameSite = SameSiteMode.None; + options.Cookie.HttpOnly = true; // Makes the cookie inaccessible to client-side scripts for security + options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; // Ensures cookies are sent over HTTPS only + options.Cookie.SameSite = SameSiteMode.Strict; // Protects against CSRF attacks by restricting how cookies are sent with requests from external sites options.LoginPath = "/api/auth/login"; options.LogoutPath = "/api/auth/logout"; }); - builder.Services.AddDbContext(options => options.UseSqlServer(builder.Configuration.GetConnectionString("DD_ECM_Connection")) .EnableDetailedErrors()); @@ -61,15 +59,13 @@ try { }); }); - builder.Services.AddKeyTranslationService(); - builder.Services.AddAutoMapper(typeof(UserMappingProfile).Assembly); builder.Services.AddAutoMapper(typeof(GroupMappingProfile).Assembly); builder.Services.AddAutoMapper(typeof(GroupOfUserMappingProfile).Assembly); builder.Services.AddAutoMapper(typeof(ModuleMappingProfile).Assembly); builder.Services.AddAutoMapper(typeof(ModuleOfUserMappingProfile).Assembly); builder.Services.AddAutoMapper(typeof(UserRepMappingProfile).Assembly); - builder.Services.AddAutoMapper(typeof(DirectoryMappingProfile).Assembly); + //builder.Services.AddAutoMapper(typeof(DirectoryMappingProfile).Assembly); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -86,7 +82,6 @@ try { builder.Services.AddScoped(); builder.Services.AddDirectorySearchService(); - builder.Services.AddResponseService(); var app = builder.Build(); diff --git a/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.API.exe b/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.API.exe index 16f2f44..355a8f2 100644 Binary files a/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.API.exe and b/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.API.exe differ diff --git a/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll b/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll index dc51207..ccb2fa6 100644 Binary files a/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll and b/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll differ diff --git a/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb b/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb index 8938c70..1b70d22 100644 Binary files a/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb and b/DigitalData.UserManager.API/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb differ diff --git a/DigitalData.UserManager.API/bin/Debug/net7.0/appsettings.json b/DigitalData.UserManager.API/bin/Debug/net7.0/appsettings.json index 0a0b829..59994df 100644 --- a/DigitalData.UserManager.API/bin/Debug/net7.0/appsettings.json +++ b/DigitalData.UserManager.API/bin/Debug/net7.0/appsettings.json @@ -30,7 +30,7 @@ "targets": { "logfile": { "type": "File", - "fileName": "${basedir}/logs/${shortdate}.log" + "fileName": "E:/WebUserManager/logs/${shortdate}.log" }, "logconsole": { "type": "Console" diff --git a/DigitalData.UserManager.API/nlog.config b/DigitalData.UserManager.API/nlog.config deleted file mode 100644 index cb6161a..0000000 --- a/DigitalData.UserManager.API/nlog.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.csproj.CopyComplete b/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.csproj.FileListAbsolute.txt b/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.csproj.FileListAbsolute.txt index b3d77f8..08e119a 100644 --- a/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.csproj.FileListAbsolute.txt +++ b/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.csproj.FileListAbsolute.txt @@ -275,7 +275,6 @@ E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7. E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.API.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.Application.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.Contracts.dll -E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.CultureServices.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.UserManager.Application.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.UserManager.Domain.dll @@ -286,7 +285,6 @@ E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7. E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.API.pdb E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.Application.pdb E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.Contracts.pdb -E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.CultureServices.pdb E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.Infrastructure.pdb E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\DigitalData.UserManager.API.csproj.AssemblyReference.cache E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\DigitalData.UserManager.API.GeneratedMSBuildEditorConfig.editorconfig @@ -303,9 +301,12 @@ E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7. E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\staticwebassets.build.json E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\staticwebassets.development.json E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\scopedcss\bundle\DigitalData.UserManager.API.styles.css -E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\DigitalData.UserManager.API.csproj.CopyComplete E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\DigitalData.UserManager.API.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\refint\DigitalData.UserManager.API.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\DigitalData.UserManager.API.pdb E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\DigitalData.UserManager.API.genruntimeconfig.cache E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\ref\DigitalData.UserManager.API.dll +E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\Microsoft.Extensions.Localization.Abstractions.dll +E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.DTO.dll +E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\bin\Debug\net7.0\DigitalData.Core.DTO.pdb +E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.API\obj\Debug\net7.0\DigitalD.2ACBF1F0.Up2Date diff --git a/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.genruntimeconfig.cache b/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.genruntimeconfig.cache index 83bc8d3..bd7b392 100644 --- a/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.genruntimeconfig.cache +++ b/DigitalData.UserManager.API/obj/Debug/net7.0/DigitalData.UserManager.API.genruntimeconfig.cache @@ -1 +1 @@ -5243960bb1a8dfa8a26e6ced911ddcfcfbd49603 +5db32c07a921a075542f8e4d13a06dff0a7877311019b550d9af1d527121948b diff --git a/DigitalData.UserManager.API/obj/Debug/net7.0/apphost.exe b/DigitalData.UserManager.API/obj/Debug/net7.0/apphost.exe index 16f2f44..355a8f2 100644 Binary files a/DigitalData.UserManager.API/obj/Debug/net7.0/apphost.exe and b/DigitalData.UserManager.API/obj/Debug/net7.0/apphost.exe differ diff --git a/DigitalData.UserManager.API/obj/Debug/net7.0/staticwebassets.build.json b/DigitalData.UserManager.API/obj/Debug/net7.0/staticwebassets.build.json index 64eda44..7d765a6 100644 --- a/DigitalData.UserManager.API/obj/Debug/net7.0/staticwebassets.build.json +++ b/DigitalData.UserManager.API/obj/Debug/net7.0/staticwebassets.build.json @@ -1,6 +1,6 @@ { "Version": 1, - "Hash": "CVuGk5G2Z4tefLO3i5UULN9tcqrmHVfR7Mp+pLcIhcg=", + "Hash": "fpX0gIRTqJ92FKdK8Mopb4TdlAI0zjfIY8Z63x82Wg4=", "Source": "DigitalData.UserManager.API", "BasePath": "_content/DigitalData.UserManager.API", "Mode": "Default", @@ -26,6 +26,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -43,6 +45,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -60,6 +64,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -77,6 +83,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -94,6 +102,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -111,6 +121,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -128,6 +140,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -145,6 +159,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -162,6 +178,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -179,6 +197,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -196,6 +216,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -213,6 +235,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -230,6 +254,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -247,6 +273,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -264,6 +292,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -281,6 +311,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", @@ -298,6 +330,8 @@ "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", + "AssetMergeBehavior": "PreferTarget", + "AssetMergeSource": "", "RelatedAsset": "", "AssetTraitName": "", "AssetTraitValue": "", diff --git a/DigitalData.UserManager.API/wwwroot/index.html b/DigitalData.UserManager.API/wwwroot/index.html index 0c1497a..cb88b78 100644 --- a/DigitalData.UserManager.API/wwwroot/index.html +++ b/DigitalData.UserManager.API/wwwroot/index.html @@ -6,7 +6,7 @@ User Manager Portal - + diff --git a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs index f2443ef..675b81e 100644 --- a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs @@ -2,15 +2,16 @@ using DigitalData.UserManager.Application.DTOs.GroupOfUser; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Infrastructure.Contracts; +using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { public interface IGroupOfUserService : ICRUDService { - Task DeleteAsyncByGroupUserId(int groupId, int userId); + Task DeleteAsyncByGroupUserId(int groupId, int userId); - Task>> ReadAllAsyncWith(bool user, bool group); + Task>> ReadAllAsyncWith(bool user, bool group); - Task HasGroup(string username, string groupname, bool caseSensitive = true); + Task HasGroup(string username, string groupname, bool caseSensitive = true); } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Contracts/IGroupService.cs b/DigitalData.UserManager.Application/Contracts/IGroupService.cs index d51047c..5c88a88 100644 --- a/DigitalData.UserManager.Application/Contracts/IGroupService.cs +++ b/DigitalData.UserManager.Application/Contracts/IGroupService.cs @@ -2,11 +2,12 @@ using DigitalData.UserManager.Application.DTOs.Group; using DigitalData.UserManager.Infrastructure.Contracts; using DigitalData.UserManager.Domain.Entities; +using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { public interface IGroupService : ICRUDService { - Task> CreateAsync(DirectoryGroupDto dirGroup); + Task> CreateAsync(DirectoryGroupDto dirGroup); } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs index 217f661..b67e4f3 100644 --- a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs @@ -1,4 +1,5 @@ using DigitalData.Core.Contracts.Application; +using DigitalData.Core.DTO; using DigitalData.UserManager.Application.DTOs.ModuleOfUser; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Infrastructure.Contracts; @@ -7,6 +8,6 @@ namespace DigitalData.UserManager.Application.Contracts { public interface IModuleOfUserService : ICRUDService { - Task DeleteAsyncByModuleUserId(int moduleId, int userId); + Task DeleteAsyncByModuleUserId(int moduleId, int userId); } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs index b8c7c78..e2ed47f 100644 --- a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs +++ b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs @@ -2,11 +2,12 @@ using DigitalData.UserManager.Application.DTOs.UserRep; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Infrastructure.Contracts; +using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { public interface IUserRepService : ICRUDService { - Task>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null); + Task>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null); } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Contracts/IUserService.cs b/DigitalData.UserManager.Application/Contracts/IUserService.cs index d1986e2..7f31138 100644 --- a/DigitalData.UserManager.Application/Contracts/IUserService.cs +++ b/DigitalData.UserManager.Application/Contracts/IUserService.cs @@ -2,21 +2,22 @@ using DigitalData.UserManager.Application.DTOs.User; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Infrastructure.Contracts; +using DigitalData.Core.DTO; namespace DigitalData.UserManager.Application.Contracts { public interface IUserService : ICRUDService { - Task>> ReadByModuleIdAsync(int moduleId); + Task>> ReadByModuleIdAsync(int moduleId); - Task>> ReadUnassignedByModuleIdAsync(int moduleId); + Task>> ReadUnassignedByModuleIdAsync(int moduleId); - Task>> ReadByGroupIdAsync(int groupId); + Task>> ReadByGroupIdAsync(int groupId); - Task>> ReadUnassignedByGroupIdAsync(int groupId); + Task>> ReadUnassignedByGroupIdAsync(int groupId); - Task> CreateAsync(UserPrincipalDto upDto); + Task> CreateAsync(UserPrincipalDto upDto); - Task> ReadByUsernameAsync(string username); + Task> ReadByUsernameAsync(string username); } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj index be2e88f..a7b32e6 100644 --- a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj +++ b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -8,8 +8,10 @@ + + @@ -24,6 +26,9 @@ ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Contracts.dll + + ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.DTO.dll + diff --git a/DigitalData.UserManager.Application/Key.cs b/DigitalData.UserManager.Application/Key.cs new file mode 100644 index 0000000..38c6090 --- /dev/null +++ b/DigitalData.UserManager.Application/Key.cs @@ -0,0 +1,12 @@ +namespace DigitalData.UserManager.Application +{ + public static class Key + { + public static readonly string UserNotFoundInLocalDB = "UserNotFoundInLocalDB"; + public static readonly string GroupNotFound = "GroupNotFound"; + public static readonly string GroupAlreadyExists = "GroupAlreadyExists"; + public static readonly string UserAlreadyExists = "UserAlreadyExists"; + public static readonly string UserNotFound = "UserNotFound"; + public static readonly string UnauthorizedUser = "UnauthorizedUser"; + } +} diff --git a/DigitalData.UserManager.Application/MessageKey.cs b/DigitalData.UserManager.Application/MessageKey.cs deleted file mode 100644 index 183dd85..0000000 --- a/DigitalData.UserManager.Application/MessageKey.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace DigitalData.UserManager.Application -{ - public enum MessageKey - { - UserNotFoundInLocalDB, - GroupNotFound, - GroupAlreadyExists, - UserAlreadyExists, - UserNotFound, - UnauthorizedUser - } -} diff --git a/DigitalData.UserManager.Application/Resource.cs b/DigitalData.UserManager.Application/Resource.cs new file mode 100644 index 0000000..6720214 --- /dev/null +++ b/DigitalData.UserManager.Application/Resource.cs @@ -0,0 +1,9 @@ +namespace DigitalData.UserManager.Application +{ + /// + /// Place holder class for Resource.*.resx as the resouce of IStringLocalizer. + /// + public class Resource + { + } +} diff --git a/DigitalData.UserManager.Application/Services/GroupOfUserService.cs b/DigitalData.UserManager.Application/Services/GroupOfUserService.cs index 4d4351e..c7d471d 100644 --- a/DigitalData.UserManager.Application/Services/GroupOfUserService.cs +++ b/DigitalData.UserManager.Application/Services/GroupOfUserService.cs @@ -1,21 +1,21 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.Contracts.Application; -using DigitalData.Core.Contracts.CultureServices; +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 Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { public class GroupOfUserService : CRUDService, IGroupOfUserService { - public GroupOfUserService(IGroupOfUserRepository repository, IKeyTranslationService translationService, IMapper mapper) : base(repository, translationService, mapper) + public GroupOfUserService(IGroupOfUserRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, localizer, mapper) { } - public async Task DeleteAsyncByGroupUserId(int groupId, int userId) + public async Task DeleteAsyncByGroupUserId(int groupId, int userId) { var mous = await _repository.ReadByGroupUserIdAsync(groupId, userId); @@ -24,10 +24,10 @@ namespace DigitalData.UserManager.Application.Services await _repository.DeleteAsync(mou); } - return Successful(); + return Result.Success(); } - public async Task>> ReadAllAsyncWith(bool user, bool group) + public async Task>> ReadAllAsyncWith(bool user, bool group) { IEnumerable entities; @@ -49,10 +49,10 @@ namespace DigitalData.UserManager.Application.Services } var gouReadDtos = _mapper.MapOrThrow>(entities); - return Successful(gouReadDtos); + return Result.Success(gouReadDtos); } - public async Task HasGroup(string username, string groupname, bool caseSensitive = true) + public async Task HasGroup(string username, string groupname, bool caseSensitive = true) { var gous = await _repository.ReadAllAsyncWithGroupAndUser(); @@ -61,7 +61,7 @@ namespace DigitalData.UserManager.Application.Services else gous = gous.Where(gous => gous.User?.Username.ToLower() == username.ToLower() && gous.Group?.Name?.ToLower() == groupname.ToLower()); - return CreateMessage(gous.Any()); + return gous.Any() ? Result.Success() : Result.Fail(); } } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Services/GroupService.cs b/DigitalData.UserManager.Application/Services/GroupService.cs index 0be3e9b..090289e 100644 --- a/DigitalData.UserManager.Application/Services/GroupService.cs +++ b/DigitalData.UserManager.Application/Services/GroupService.cs @@ -1,32 +1,32 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.Contracts.Application; -using DigitalData.Core.Contracts.CultureServices; +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 Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { public class GroupService : CRUDService, IGroupService { - public GroupService(IGroupRepository repository, IKeyTranslationService translationService, IMapper mapper) : base(repository, translationService, mapper) + public GroupService(IGroupRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, localizer, mapper) { } - public async Task> CreateAsync(DirectoryGroupDto adGroup) + public async Task> CreateAsync(DirectoryGroupDto adGroup) { var group = _mapper.MapOrThrow(adGroup); if (await HasEntity(group.Guid)) - return Failed(MessageKey.GroupAlreadyExists.ToString()); + return Result.Fail().Message(_localizer[Key.GroupAlreadyExists.ToString()]); var createdGroup = await _repository.CreateAsync(group); if (createdGroup is null) - return Failed(); + return Result.Fail(); else - return Successful(KeyValueOf(createdGroup)); + return Result.Success(KeyValueOf(createdGroup)); } } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs b/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs index 5369261..71209ac 100644 --- a/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs +++ b/DigitalData.UserManager.Application/Services/ModuleOfUserService.cs @@ -1,21 +1,21 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.Contracts.Application; -using DigitalData.Core.Contracts.CultureServices; +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 Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { public class ModuleOfUserService : CRUDService, IModuleOfUserService { - public ModuleOfUserService(IModuleOfUserRepository repository, IKeyTranslationService translationService, IMapper mapper) : base(repository, translationService, mapper) + public ModuleOfUserService(IModuleOfUserRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, localizer, mapper) { } - public async Task DeleteAsyncByModuleUserId(int moduleId, int userId) + public async Task DeleteAsyncByModuleUserId(int moduleId, int userId) { var mous = await _repository.ReadByModelUserIdAsync(moduleId, userId); @@ -24,7 +24,7 @@ namespace DigitalData.UserManager.Application.Services await _repository.DeleteAsync(mou); } - return Successful(); + return Result.Success(); } } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Services/ModuleService.cs b/DigitalData.UserManager.Application/Services/ModuleService.cs index ef21eb0..d2438b7 100644 --- a/DigitalData.UserManager.Application/Services/ModuleService.cs +++ b/DigitalData.UserManager.Application/Services/ModuleService.cs @@ -1,16 +1,16 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.Contracts.CultureServices; using DigitalData.UserManager.Application.Contracts; using DigitalData.UserManager.Application.DTOs.Module; using DigitalData.UserManager.Domain.Entities; using DigitalData.UserManager.Infrastructure.Contracts; +using Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { public class ModuleService : BasicCRUDService, IModuleService { - public ModuleService(IModuleRepository repository, IKeyTranslationService translationService, IMapper mapper) : base(repository, translationService, mapper) + public ModuleService(IModuleRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, localizer, mapper) { } } diff --git a/DigitalData.UserManager.Application/Services/UserRepService.cs b/DigitalData.UserManager.Application/Services/UserRepService.cs index c997acc..b0646be 100644 --- a/DigitalData.UserManager.Application/Services/UserRepService.cs +++ b/DigitalData.UserManager.Application/Services/UserRepService.cs @@ -1,25 +1,25 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.Contracts.Application; -using DigitalData.Core.Contracts.CultureServices; +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 Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { public class UserRepService : CRUDService, IUserRepService { - public UserRepService(IUserRepRepository repository, IKeyTranslationService translationService, IMapper mapper) : base(repository, translationService, mapper) + public UserRepService(IUserRepRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, localizer, mapper) { } - public async Task>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null) + public async Task>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null) { var urs = await _repository.ReadAllAsync(withUser, withRepGroup, withRightGroup, withRepUser, userId); var urReadDTOs = _mapper.MapOrThrow>(urs); - return Successful(urReadDTOs); + return Result.Success(urReadDTOs); } } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/Services/UserService.cs b/DigitalData.UserManager.Application/Services/UserService.cs index 83f219b..da92769 100644 --- a/DigitalData.UserManager.Application/Services/UserService.cs +++ b/DigitalData.UserManager.Application/Services/UserService.cs @@ -1,70 +1,70 @@ using AutoMapper; using DigitalData.Core.Application; -using DigitalData.Core.Contracts.Application; -using DigitalData.Core.Contracts.CultureServices; +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 Microsoft.Extensions.Localization; namespace DigitalData.UserManager.Application.Services { public class UserService : CRUDService, IUserService { - public UserService(IUserRepository repository, IKeyTranslationService translationService, IMapper mapper) : base(repository, translationService, mapper) + public UserService(IUserRepository repository, IStringLocalizer localizer, IMapper mapper) : base(repository, localizer, mapper) { } - public async Task>> ReadByModuleIdAsync(int moduleId) + public async Task>> ReadByModuleIdAsync(int moduleId) { var users = await _repository.ReadByModuleIdAsync(moduleId); IEnumerable readDTOs = _mapper.MapOrThrow>(users); - return Successful(readDTOs); + return Result.Success(readDTOs); } - public async Task>> ReadByGroupIdAsync(int groupId) + public async Task>> ReadByGroupIdAsync(int groupId) { var users = await _repository.ReadByGroupIdAsync(groupId); IEnumerable readDTOs = _mapper.MapOrThrow>(users); - return Successful(readDTOs); + return Result.Success(readDTOs); } - public async Task>> ReadUnassignedByModuleIdAsync(int moduleId) + public async Task>> ReadUnassignedByModuleIdAsync(int moduleId) { var users = await _repository.ReadUnassignedByModuleIdAsync(moduleId); IEnumerable readDTOs = _mapper.MapOrThrow>(users); - return Successful(readDTOs); + return Result.Success(readDTOs); } - public async Task>> ReadUnassignedByGroupIdAsync(int groupId) + public async Task>> ReadUnassignedByGroupIdAsync(int groupId) { var users = await _repository.ReadUnassignedByGroupIdAsync(groupId); IEnumerable readDTOs = _mapper.MapOrThrow>(users); - return Successful(readDTOs); + return Result.Success(readDTOs); } - public async Task> CreateAsync(UserPrincipalDto upDto) + public async Task> CreateAsync(UserPrincipalDto upDto) { var user = _mapper.MapOrThrow(upDto); if (await HasEntity(user.Guid)) - return Failed(MessageKey.UserAlreadyExists.ToString()); + return Result.Fail().Message(_localizer[Key.UserAlreadyExists]); var createdUser = await _repository.CreateAsync(user); if (createdUser is null) - return Failed(); + return Result.Fail(); else - return Successful(KeyValueOf(createdUser)); + return Result.Success(KeyValueOf(createdUser)); } - public async Task> ReadByUsernameAsync(string username) + public async Task> ReadByUsernameAsync(string username) { var user = await _repository.ReadByUsernameAsync(username); if (user is null) - return Failed(MessageKey.UserNotFoundInLocalDB.ToString()); + return Result.Fail().Message(_localizer[Key.UserNotFoundInLocalDB]); var userDto = _mapper.MapOrThrow(user); - return Successful(userDto); + return Result.Success(userDto); } } } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll b/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll index dc51207..ccb2fa6 100644 Binary files a/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll and b/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll differ diff --git a/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb b/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb index 8938c70..1b70d22 100644 Binary files a/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb and b/DigitalData.UserManager.Application/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb differ diff --git a/DigitalData.UserManager.Application/obj/Debug/net7.0/DigitalData.UserManager.Application.csproj.CopyComplete b/DigitalData.UserManager.Application/obj/Debug/net7.0/DigitalData.UserManager.Application.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/DigitalData.UserManager.Application/obj/Debug/net7.0/DigitalData.UserManager.Application.csproj.FileListAbsolute.txt b/DigitalData.UserManager.Application/obj/Debug/net7.0/DigitalData.UserManager.Application.csproj.FileListAbsolute.txt index 55d9954..1bc5624 100644 --- a/DigitalData.UserManager.Application/obj/Debug/net7.0/DigitalData.UserManager.Application.csproj.FileListAbsolute.txt +++ b/DigitalData.UserManager.Application/obj/Debug/net7.0/DigitalData.UserManager.Application.csproj.FileListAbsolute.txt @@ -64,8 +64,10 @@ E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Deb E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\DigitalData.UserManager.Application.AssemblyInfoInputs.cache E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\DigitalData.UserManager.Application.AssemblyInfo.cs E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\DigitalData.UserManager.Application.csproj.CoreCompileInputs.cache -E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\DigitalData.UserManager.Application.csproj.CopyComplete E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\DigitalData.UserManager.Application.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\refint\DigitalData.UserManager.Application.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\DigitalData.UserManager.Application.pdb E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\ref\DigitalData.UserManager.Application.dll +E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.Core.DTO.dll +E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.Core.DTO.pdb +E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Application\obj\Debug\net7.0\DigitalD.78E1DF98.Up2Date diff --git a/DigitalData.UserManager.DTO/Class1.cs b/DigitalData.UserManager.DTO/Class1.cs new file mode 100644 index 0000000..2596c18 --- /dev/null +++ b/DigitalData.UserManager.DTO/Class1.cs @@ -0,0 +1,7 @@ +namespace DigitalData.UserManager.DTO +{ + public class Class1 + { + + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/Auth/AuthCheckDto.cs b/DigitalData.UserManager.DTO/DTOs/Auth/AuthCheckDto.cs new file mode 100644 index 0000000..73341e3 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/Auth/AuthCheckDto.cs @@ -0,0 +1,4 @@ +namespace DigitalData.UserManager.Application.DTOs.Auth +{ + public record AuthCheckDto (bool IsAuthenticated); +} diff --git a/DigitalData.UserManager.DTO/DTOs/Auth/LogInDto.cs b/DigitalData.UserManager.DTO/DTOs/Auth/LogInDto.cs new file mode 100644 index 0000000..db99c15 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/Auth/LogInDto.cs @@ -0,0 +1,4 @@ +namespace DigitalData.UserManager.Application.DTOs.Auth +{ + public record LogInDto(string Username, string Password); +} diff --git a/DigitalData.UserManager.DTO/DTOs/Group/DirectoryGroupDto.cs b/DigitalData.UserManager.DTO/DTOs/Group/DirectoryGroupDto.cs new file mode 100644 index 0000000..a902427 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/Group/DirectoryGroupDto.cs @@ -0,0 +1,28 @@ +namespace DigitalData.UserManager.Application.DTOs.Group +{ + public record DirectoryGroupDto + ( + IEnumerable Samaccountname + //public string Name { get; set; } + //public string ObjectSid { get; set; } + //public string ObjectCategory { get; set; } + //public int SamAccountType { get; set; } + //public string DistinguishedName { get; set; } + //public int InstanceType { get; set; } + //public string CN { get; set; } + //public string ObjectClass { get; set; } + //public DateTime WhenChanged { get; set; } + //public Guid ObjectGuid { get; set; } + //public long UsnCreated { get; set; } + //public int? GroupType { get; set; } + //public DateTime? DsCorePropagationData { get; set; } + //public int? AdminCount { get; set; } + //public int? SystemFlags { get; set; } + //public string Member { get; set; } + //public string AdsPath { get; set; } + //public long UsnChanged { get; set; } + //public DateTime WhenCreated { get; set; } + //public string Description { get; set; } + //public bool? IsCriticalSystemObject { get; set; } + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/Group/GroupCreateDto.cs b/DigitalData.UserManager.DTO/DTOs/Group/GroupCreateDto.cs new file mode 100644 index 0000000..5cf34f0 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/Group/GroupCreateDto.cs @@ -0,0 +1,13 @@ +namespace DigitalData.UserManager.Application.DTOs.Group +{ + public record GroupCreateDto + ( + string? Name, + bool? AdSync, + bool? Internal, + bool? Active, + string? Comment, + string? AddedWho, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/Group/GroupReadDto.cs b/DigitalData.UserManager.DTO/DTOs/Group/GroupReadDto.cs new file mode 100644 index 0000000..db7de55 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/Group/GroupReadDto.cs @@ -0,0 +1,14 @@ +namespace DigitalData.UserManager.Application.DTOs.Group +{ + public record GroupReadDto + ( + int Guid, + string? Name, + bool? AdSync, + bool? Internal, + bool? Active, + string? Comment, + string? AddedWho, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/Group/GroupUpdateDto.cs b/DigitalData.UserManager.DTO/DTOs/Group/GroupUpdateDto.cs new file mode 100644 index 0000000..696c038 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/Group/GroupUpdateDto.cs @@ -0,0 +1,13 @@ +namespace DigitalData.UserManager.Application.DTOs.Group +{ + public record GroupUpdateDto + ( + int Guid, + string? Name, + bool? AdSync, + bool? Internal, + bool? Active, + string? Comment, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserCreateDto.cs b/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserCreateDto.cs new file mode 100644 index 0000000..3f132ff --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserCreateDto.cs @@ -0,0 +1,9 @@ +namespace DigitalData.UserManager.Application.DTOs.GroupOfUser +{ + public record GroupOfUserCreateDto( + int UserId, + int GroupId, + string? Comment, + string? AddedWho + ); +} diff --git a/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserReadDto.cs b/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserReadDto.cs new file mode 100644 index 0000000..b135b78 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserReadDto.cs @@ -0,0 +1,16 @@ +using DigitalData.UserManager.Application.DTOs.Group; +using DigitalData.UserManager.Application.DTOs.User; + +namespace DigitalData.UserManager.Application.DTOs.GroupOfUser +{ + public record GroupOfUserReadDto( + int Guid, + int UserId, + int GroupId, + string? Comment, + string AddedWho, + string? ChangedWho, + UserReadDto User, + GroupReadDto Group + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs b/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs new file mode 100644 index 0000000..380fa3e --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs @@ -0,0 +1,10 @@ +namespace DigitalData.UserManager.Application.DTOs.GroupOfUser +{ + public record GroupOfUserUpdateDto( + int Guid, + int? UserId, + int? GroupId, + string? Comment, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/Module/ModuleDto.cs b/DigitalData.UserManager.DTO/DTOs/Module/ModuleDto.cs new file mode 100644 index 0000000..b3e63da --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/Module/ModuleDto.cs @@ -0,0 +1,8 @@ +namespace DigitalData.UserManager.Application.DTOs.Module +{ + public record ModuleDto( + int Guid, + string? Name, + string? ShortName + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserCreateDto.cs b/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserCreateDto.cs new file mode 100644 index 0000000..117321b --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserCreateDto.cs @@ -0,0 +1,10 @@ +namespace DigitalData.UserManager.Application.DTOs.ModuleOfUser +{ + public record ModuleOfUserCreateDto( + int UserId, + int ModuleId, + bool IsAdmin, + string? Comment, + string? AddedWho + ); +} diff --git a/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserReadDto.cs b/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserReadDto.cs new file mode 100644 index 0000000..c648e5b --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserReadDto.cs @@ -0,0 +1,11 @@ +namespace DigitalData.UserManager.Application.DTOs.ModuleOfUser +{ + public record ModuleOfUserReadDto( + int Guid, + int UserId, + int ModuleId, + string? Comment, + string? AddedWho, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs b/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs new file mode 100644 index 0000000..042e58b --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs @@ -0,0 +1,11 @@ +namespace DigitalData.UserManager.Application.DTOs.ModuleOfUser +{ + public record ModuleOfUserUpdateDto( + int Guid, + int UserId, + int ModuleId, + bool? IsAdmin, + string? Comment, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/SearchRootCreateDto.cs b/DigitalData.UserManager.DTO/DTOs/SearchRootCreateDto.cs new file mode 100644 index 0000000..6ab4748 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/SearchRootCreateDto.cs @@ -0,0 +1,4 @@ +namespace DigitalData.UserManager.Application.DTOs +{ + public record SearchRootCreateDto(string? DirEntryUsername, string DirEntryPassword); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/User/UserCreateDto.cs b/DigitalData.UserManager.DTO/DTOs/User/UserCreateDto.cs new file mode 100644 index 0000000..fa97d21 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/User/UserCreateDto.cs @@ -0,0 +1,18 @@ +namespace DigitalData.UserManager.Application.DTOs.User +{ + public record class UserCreateDto + { + public string? Prename { get; init; } + public string? Name { get; init; } + public string? Username { get; init; } + public string? Shortname { get; init; } + public string? Email { get; init; } + public string Language { get; init; } = "de-DE"; + public string? Comment { get; init; } + public bool? Deleted { get; init; } + public string DateFormat { get; init; } = "dd.MM.yyyy"; + public string AddedWho { get; init; } = "DEFAULT"; + public string? ChangedWho { get; init; } + public bool Active { get; init; } = true; + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/User/UserPrincipalDto.cs b/DigitalData.UserManager.DTO/DTOs/User/UserPrincipalDto.cs new file mode 100644 index 0000000..aad89e3 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/User/UserPrincipalDto.cs @@ -0,0 +1,34 @@ +namespace DigitalData.UserManager.Application.DTOs.User +{ + public record UserPrincipalDto + ( + string SamAccountName, + string GivenName, + string? MiddleName, + string Surname, + string EmailAddress, + string? AddedWho, + string? DateFormat + // Guid Guid, + // string SId, + // string EmployeeId, + // string VoiceTelephoneNumber, + // DateTime? AccountExpirationDate, + // DateTime? AccountLockoutTime, + // bool AllowReversiblePasswordEncryption, + // int BadLogonCount, + // bool DelegationPermitted, + // bool? Enabled, + // string HomeDirectory, + // string HomeDrive, + // DateTime? LastBadPasswordAttempt, + // DateTime? LastLogon, + // DateTime? LastPasswordSet, + // bool PasswordNeverExpires, + // bool PasswordNotRequired, + // byte[] PermittedLogonTimes, + // bool SmartcardLogonRequired, + // bool UserCannotChangePassword + ); + +} diff --git a/DigitalData.UserManager.DTO/DTOs/User/UserPrincipalReadDto.cs b/DigitalData.UserManager.DTO/DTOs/User/UserPrincipalReadDto.cs new file mode 100644 index 0000000..746a37e --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/User/UserPrincipalReadDto.cs @@ -0,0 +1,14 @@ +namespace DigitalData.UserManager.Application.DTOs.User +{ + public record UserPrincipalReadDto + ( + Guid Guid, + string SId, + string EmployeeId, + string SamAccountName, + string GivenName, + string MiddleName, + string Surname, + string EmailAddress + ); +} diff --git a/DigitalData.UserManager.DTO/DTOs/User/UserReadDto.cs b/DigitalData.UserManager.DTO/DTOs/User/UserReadDto.cs new file mode 100644 index 0000000..59a413d --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/User/UserReadDto.cs @@ -0,0 +1,17 @@ +namespace DigitalData.UserManager.Application.DTOs.User +{ + public record UserReadDto( + int Guid, + string? Prename, + string? Name, + string Username, + string? Shortname, + string? Email, + string Language, + string? Comment, + bool Deleted, + string DateFormat, + string AddedWho, + bool Active + ); +} diff --git a/DigitalData.UserManager.DTO/DTOs/User/UserUpdateDto.cs b/DigitalData.UserManager.DTO/DTOs/User/UserUpdateDto.cs new file mode 100644 index 0000000..e114224 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/User/UserUpdateDto.cs @@ -0,0 +1,18 @@ +namespace DigitalData.UserManager.Application.DTOs.User +{ + public record UserUpdateDto( + int Guid, + string? Prename, + string? Name, + string? Username, + string? Shortname, + string? Email, + string? Language, + string? Comment, + bool? Deleted, + string? DateFormat, + string? AddedWho, + string? ChangedWho, + bool? Active + ); +} diff --git a/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepCreateDto.cs b/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepCreateDto.cs new file mode 100644 index 0000000..4ac40bf --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepCreateDto.cs @@ -0,0 +1,10 @@ +namespace DigitalData.UserManager.Application.DTOs.UserRep +{ + public record UserRepCreateDto( + int UserId, + int? RepGroupId, + int RightGroupId, + string AddedWho, + int RepUserId + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepReadDto.cs b/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepReadDto.cs new file mode 100644 index 0000000..3729b9a --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepReadDto.cs @@ -0,0 +1,18 @@ +using DigitalData.UserManager.Application.DTOs.Group; +using DigitalData.UserManager.Application.DTOs.User; + +namespace DigitalData.UserManager.Application.DTOs.UserRep +{ + public record UserRepReadDto( + int Guid, + int UserId, + int? RepGroupId, + int RightGroupId, + string AddedWho, + int? RepUserId, + UserReadDto? User, + GroupReadDto? RepGroup, + GroupReadDto? RightGroup, + UserReadDto? RepUser + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepUpdateDto.cs b/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepUpdateDto.cs new file mode 100644 index 0000000..ed379f3 --- /dev/null +++ b/DigitalData.UserManager.DTO/DTOs/UserRep/UserRepUpdateDto.cs @@ -0,0 +1,9 @@ +namespace DigitalData.UserManager.Application.DTOs.UserRep +{ + public record UserRepUpdateDto( + int UserId, + int? RepGroupId, + int RightGroupId, + int RepUserId + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/DigitalData.UserManager.DTO.csproj b/DigitalData.UserManager.DTO/DigitalData.UserManager.DTO.csproj new file mode 100644 index 0000000..cfadb03 --- /dev/null +++ b/DigitalData.UserManager.DTO/DigitalData.UserManager.DTO.csproj @@ -0,0 +1,9 @@ + + + + net7.0 + enable + enable + + + diff --git a/DigitalData.UserManager.DTO/MappingProfiles/DirectoryMappingProfile.cs b/DigitalData.UserManager.DTO/MappingProfiles/DirectoryMappingProfile.cs new file mode 100644 index 0000000..5a5adf9 --- /dev/null +++ b/DigitalData.UserManager.DTO/MappingProfiles/DirectoryMappingProfile.cs @@ -0,0 +1,14 @@ +using AutoMapper; +using DigitalData.UserManager.Application.DTOs.User; +namespace DigitalData.UserManager.Application.MappingProfiles +{ + public class DirectoryMappingProfile : Profile + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "")] + public DirectoryMappingProfile() + { + //CreateMap(); + //CreateMap(); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/MappingProfiles/GroupMappingProfile.cs b/DigitalData.UserManager.DTO/MappingProfiles/GroupMappingProfile.cs new file mode 100644 index 0000000..8780c60 --- /dev/null +++ b/DigitalData.UserManager.DTO/MappingProfiles/GroupMappingProfile.cs @@ -0,0 +1,27 @@ +using AutoMapper; +using DigitalData.UserManager.Application.DTOs.Group; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.Application.MappingProfiles +{ + public class GroupMappingProfile : Profile + { + public GroupMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap() + .ForMember(group => group.EcmFkId, opt => opt.MapFrom(adGroup => 1)) + .ForMember(group => group.AdSync, opt => opt.MapFrom(adGroup => true)) + .ForMember(group => group.Internal, opt => opt.MapFrom(adGroup => false)) + .ForMember(group => group.Active, opt => opt.MapFrom(adGroup => true)) + .ForMember(group => group.Name, opt => opt.MapFrom(adGroup => adGroup.Samaccountname.ElementAt(0))); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/MappingProfiles/GroupOfUserMappingProfile.cs b/DigitalData.UserManager.DTO/MappingProfiles/GroupOfUserMappingProfile.cs new file mode 100644 index 0000000..ab551c3 --- /dev/null +++ b/DigitalData.UserManager.DTO/MappingProfiles/GroupOfUserMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.Application.DTOs.GroupOfUser; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.Application.MappingProfiles +{ + public class GroupOfUserMappingProfile : Profile + { + public GroupOfUserMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} diff --git a/DigitalData.UserManager.DTO/MappingProfiles/ModuleMappingProfile.cs b/DigitalData.UserManager.DTO/MappingProfiles/ModuleMappingProfile.cs new file mode 100644 index 0000000..e0847e0 --- /dev/null +++ b/DigitalData.UserManager.DTO/MappingProfiles/ModuleMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.Application.DTOs.Module; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.Application.MappingProfiles +{ + public class ModuleMappingProfile : Profile + { + public ModuleMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} diff --git a/DigitalData.UserManager.DTO/MappingProfiles/ModuleOfUserMappingProfile.cs b/DigitalData.UserManager.DTO/MappingProfiles/ModuleOfUserMappingProfile.cs new file mode 100644 index 0000000..0b83a37 --- /dev/null +++ b/DigitalData.UserManager.DTO/MappingProfiles/ModuleOfUserMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.Application.DTOs.ModuleOfUser; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.Application.MappingProfiles +{ + public class ModuleOfUserMappingProfile : Profile + { + public ModuleOfUserMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} diff --git a/DigitalData.UserManager.DTO/MappingProfiles/UserMappingProfile.cs b/DigitalData.UserManager.DTO/MappingProfiles/UserMappingProfile.cs new file mode 100644 index 0000000..085bd4c --- /dev/null +++ b/DigitalData.UserManager.DTO/MappingProfiles/UserMappingProfile.cs @@ -0,0 +1,26 @@ +using AutoMapper; +using DigitalData.UserManager.Application.DTOs.User; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.Application.MappingProfiles +{ + public class UserMappingProfile : Profile + { + public UserMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap() + .ForMember(user => user.Name, opt => opt.MapFrom(upDto => upDto.Surname)) + .ForMember(user => user.Prename, opt => opt.MapFrom(upDto => upDto.GivenName)) + .ForMember(user => user.Username, opt => opt.MapFrom(upDto => upDto.SamAccountName)) + .ForMember(user => user.Email, opt => opt.MapFrom(upDto => upDto.EmailAddress)); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DTO/MappingProfiles/UserRepMappingProfile.cs b/DigitalData.UserManager.DTO/MappingProfiles/UserRepMappingProfile.cs new file mode 100644 index 0000000..fe48df9 --- /dev/null +++ b/DigitalData.UserManager.DTO/MappingProfiles/UserRepMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.Application.DTOs.UserRep; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.Application.MappingProfiles +{ + public class UserRepMappingProfile : Profile + { + public UserRepMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/Class1.cs b/DigitalData.UserManager.DataContracts/Class1.cs new file mode 100644 index 0000000..3026467 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/Class1.cs @@ -0,0 +1,7 @@ +namespace DigitalData.UserManager.DataContracts +{ + public class Class1 + { + + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/Auth/AuthCheckDto.cs b/DigitalData.UserManager.DataContracts/DTOs/Auth/AuthCheckDto.cs new file mode 100644 index 0000000..07865ea --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/Auth/AuthCheckDto.cs @@ -0,0 +1,4 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.Auth +{ + public record AuthCheckDto (bool IsAuthenticated); +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/Auth/LogInDto.cs b/DigitalData.UserManager.DataContracts/DTOs/Auth/LogInDto.cs new file mode 100644 index 0000000..8c6704b --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/Auth/LogInDto.cs @@ -0,0 +1,4 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.Auth +{ + public record LogInDto(string Username, string Password); +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/Group/DirectoryGroupDto.cs b/DigitalData.UserManager.DataContracts/DTOs/Group/DirectoryGroupDto.cs new file mode 100644 index 0000000..ec83ba6 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/Group/DirectoryGroupDto.cs @@ -0,0 +1,28 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.Group +{ + public record DirectoryGroupDto + ( + IEnumerable Samaccountname + //public string Name { get; set; } + //public string ObjectSid { get; set; } + //public string ObjectCategory { get; set; } + //public int SamAccountType { get; set; } + //public string DistinguishedName { get; set; } + //public int InstanceType { get; set; } + //public string CN { get; set; } + //public string ObjectClass { get; set; } + //public DateTime WhenChanged { get; set; } + //public Guid ObjectGuid { get; set; } + //public long UsnCreated { get; set; } + //public int? GroupType { get; set; } + //public DateTime? DsCorePropagationData { get; set; } + //public int? AdminCount { get; set; } + //public int? SystemFlags { get; set; } + //public string Member { get; set; } + //public string AdsPath { get; set; } + //public long UsnChanged { get; set; } + //public DateTime WhenCreated { get; set; } + //public string Description { get; set; } + //public bool? IsCriticalSystemObject { get; set; } + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/Group/GroupCreateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/Group/GroupCreateDto.cs new file mode 100644 index 0000000..a317d1f --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/Group/GroupCreateDto.cs @@ -0,0 +1,13 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.Group +{ + public record GroupCreateDto + ( + string? Name, + bool? AdSync, + bool? Internal, + bool? Active, + string? Comment, + string? AddedWho, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/Group/GroupReadDto.cs b/DigitalData.UserManager.DataContracts/DTOs/Group/GroupReadDto.cs new file mode 100644 index 0000000..c522e00 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/Group/GroupReadDto.cs @@ -0,0 +1,14 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.Group +{ + public record GroupReadDto + ( + int Guid, + string? Name, + bool? AdSync, + bool? Internal, + bool? Active, + string? Comment, + string? AddedWho, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/Group/GroupUpdateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/Group/GroupUpdateDto.cs new file mode 100644 index 0000000..de02db5 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/Group/GroupUpdateDto.cs @@ -0,0 +1,13 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.Group +{ + public record GroupUpdateDto + ( + int Guid, + string? Name, + bool? AdSync, + bool? Internal, + bool? Active, + string? Comment, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserCreateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserCreateDto.cs new file mode 100644 index 0000000..cefcddb --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserCreateDto.cs @@ -0,0 +1,9 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.GroupOfUser +{ + public record GroupOfUserCreateDto( + int UserId, + int GroupId, + string? Comment, + string? AddedWho + ); +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserReadDto.cs b/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserReadDto.cs new file mode 100644 index 0000000..8bf044d --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserReadDto.cs @@ -0,0 +1,16 @@ +using DigitalData.UserManager.DataContracts.DTOs.Group; +using DigitalData.UserManager.DataContracts.DTOs.User; + +namespace DigitalData.UserManager.DataContracts.DTOs.GroupOfUser +{ + public record GroupOfUserReadDto( + int Guid, + int UserId, + int GroupId, + string? Comment, + string AddedWho, + string? ChangedWho, + UserReadDto User, + GroupReadDto Group + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs new file mode 100644 index 0000000..7216eba --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/GroupOfUser/GroupOfUserUpdateDto.cs @@ -0,0 +1,10 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.GroupOfUser +{ + public record GroupOfUserUpdateDto( + int Guid, + int? UserId, + int? GroupId, + string? Comment, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/Module/ModuleDto.cs b/DigitalData.UserManager.DataContracts/DTOs/Module/ModuleDto.cs new file mode 100644 index 0000000..f28175d --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/Module/ModuleDto.cs @@ -0,0 +1,8 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.Module +{ + public record ModuleDto( + int Guid, + string? Name, + string? ShortName + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserCreateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserCreateDto.cs new file mode 100644 index 0000000..2627303 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserCreateDto.cs @@ -0,0 +1,10 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.ModuleOfUser +{ + public record ModuleOfUserCreateDto( + int UserId, + int ModuleId, + bool IsAdmin, + string? Comment, + string? AddedWho + ); +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserReadDto.cs b/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserReadDto.cs new file mode 100644 index 0000000..8196226 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserReadDto.cs @@ -0,0 +1,11 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.ModuleOfUser +{ + public record ModuleOfUserReadDto( + int Guid, + int UserId, + int ModuleId, + string? Comment, + string? AddedWho, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs new file mode 100644 index 0000000..e0cac53 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/ModuleOfUser/ModuleOfUserUpdateDto.cs @@ -0,0 +1,11 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.ModuleOfUser +{ + public record ModuleOfUserUpdateDto( + int Guid, + int UserId, + int ModuleId, + bool? IsAdmin, + string? Comment, + string? ChangedWho + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/SearchRootCreateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/SearchRootCreateDto.cs new file mode 100644 index 0000000..f5f570d --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/SearchRootCreateDto.cs @@ -0,0 +1,4 @@ +namespace DigitalData.UserManager.DataContracts.DTOs +{ + public record SearchRootCreateDto(string? DirEntryUsername, string DirEntryPassword); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/User/UserCreateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/User/UserCreateDto.cs new file mode 100644 index 0000000..e35a876 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/User/UserCreateDto.cs @@ -0,0 +1,18 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.User +{ + public record class UserCreateDto + { + public string? Prename { get; init; } + public string? Name { get; init; } + public string? Username { get; init; } + public string? Shortname { get; init; } + public string? Email { get; init; } + public string Language { get; init; } = "de-DE"; + public string? Comment { get; init; } + public bool? Deleted { get; init; } + public string DateFormat { get; init; } = "dd.MM.yyyy"; + public string AddedWho { get; init; } = "DEFAULT"; + public string? ChangedWho { get; init; } + public bool Active { get; init; } = true; + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/User/UserPrincipalDto.cs b/DigitalData.UserManager.DataContracts/DTOs/User/UserPrincipalDto.cs new file mode 100644 index 0000000..7a1484a --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/User/UserPrincipalDto.cs @@ -0,0 +1,34 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.User +{ + public record UserPrincipalDto + ( + string SamAccountName, + string GivenName, + string? MiddleName, + string Surname, + string EmailAddress, + string? AddedWho, + string? DateFormat + // Guid Guid, + // string SId, + // string EmployeeId, + // string VoiceTelephoneNumber, + // DateTime? AccountExpirationDate, + // DateTime? AccountLockoutTime, + // bool AllowReversiblePasswordEncryption, + // int BadLogonCount, + // bool DelegationPermitted, + // bool? Enabled, + // string HomeDirectory, + // string HomeDrive, + // DateTime? LastBadPasswordAttempt, + // DateTime? LastLogon, + // DateTime? LastPasswordSet, + // bool PasswordNeverExpires, + // bool PasswordNotRequired, + // byte[] PermittedLogonTimes, + // bool SmartcardLogonRequired, + // bool UserCannotChangePassword + ); + +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/User/UserPrincipalReadDto.cs b/DigitalData.UserManager.DataContracts/DTOs/User/UserPrincipalReadDto.cs new file mode 100644 index 0000000..2e5118a --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/User/UserPrincipalReadDto.cs @@ -0,0 +1,14 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.User +{ + public record UserPrincipalReadDto + ( + Guid Guid, + string SId, + string EmployeeId, + string SamAccountName, + string GivenName, + string MiddleName, + string Surname, + string EmailAddress + ); +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/User/UserReadDto.cs b/DigitalData.UserManager.DataContracts/DTOs/User/UserReadDto.cs new file mode 100644 index 0000000..776a50b --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/User/UserReadDto.cs @@ -0,0 +1,17 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.User +{ + public record UserReadDto( + int Guid, + string? Prename, + string? Name, + string Username, + string? Shortname, + string? Email, + string Language, + string? Comment, + bool Deleted, + string DateFormat, + string AddedWho, + bool Active + ); +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/User/UserUpdateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/User/UserUpdateDto.cs new file mode 100644 index 0000000..c5e705b --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/User/UserUpdateDto.cs @@ -0,0 +1,18 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.User +{ + public record UserUpdateDto( + int Guid, + string? Prename, + string? Name, + string? Username, + string? Shortname, + string? Email, + string? Language, + string? Comment, + bool? Deleted, + string? DateFormat, + string? AddedWho, + string? ChangedWho, + bool? Active + ); +} diff --git a/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepCreateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepCreateDto.cs new file mode 100644 index 0000000..f0bc387 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepCreateDto.cs @@ -0,0 +1,10 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.UserRep +{ + public record UserRepCreateDto( + int UserId, + int? RepGroupId, + int RightGroupId, + string AddedWho, + int RepUserId + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepReadDto.cs b/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepReadDto.cs new file mode 100644 index 0000000..928e021 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepReadDto.cs @@ -0,0 +1,18 @@ +using DigitalData.UserManager.DataContracts.DTOs.Group; +using DigitalData.UserManager.DataContracts.DTOs.User; + +namespace DigitalData.UserManager.DataContracts.DTOs.UserRep +{ + public record UserRepReadDto( + int Guid, + int UserId, + int? RepGroupId, + int RightGroupId, + string AddedWho, + int? RepUserId, + UserReadDto? User, + GroupReadDto? RepGroup, + GroupReadDto? RightGroup, + UserReadDto? RepUser + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepUpdateDto.cs b/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepUpdateDto.cs new file mode 100644 index 0000000..93d5c06 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DTOs/UserRep/UserRepUpdateDto.cs @@ -0,0 +1,9 @@ +namespace DigitalData.UserManager.DataContracts.DTOs.UserRep +{ + public record UserRepUpdateDto( + int UserId, + int? RepGroupId, + int RightGroupId, + int RepUserId + ); +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/DigitalData.UserManager.DataContracts.csproj b/DigitalData.UserManager.DataContracts/DigitalData.UserManager.DataContracts.csproj new file mode 100644 index 0000000..2e982d3 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/DigitalData.UserManager.DataContracts.csproj @@ -0,0 +1,20 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + + diff --git a/DigitalData.UserManager.DataContracts/MappingProfiles/DirectoryMappingProfile.cs b/DigitalData.UserManager.DataContracts/MappingProfiles/DirectoryMappingProfile.cs new file mode 100644 index 0000000..e1ccb23 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/MappingProfiles/DirectoryMappingProfile.cs @@ -0,0 +1,16 @@ +using AutoMapper; +using DigitalData.UserManager.DataContracts.DTOs.User; +using System.DirectoryServices.AccountManagement; + +namespace DigitalData.UserManager.DataContracts.MappingProfiles +{ + public class DirectoryMappingProfile : Profile + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "")] + public DirectoryMappingProfile() + { + CreateMap(); + CreateMap(); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/MappingProfiles/GroupMappingProfile.cs b/DigitalData.UserManager.DataContracts/MappingProfiles/GroupMappingProfile.cs new file mode 100644 index 0000000..994a8e8 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/MappingProfiles/GroupMappingProfile.cs @@ -0,0 +1,27 @@ +using AutoMapper; +using DigitalData.UserManager.DataContracts.DTOs.Group; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.DataContracts.MappingProfiles +{ + public class GroupMappingProfile : Profile + { + public GroupMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap() + .ForMember(group => group.EcmFkId, opt => opt.MapFrom(adGroup => 1)) + .ForMember(group => group.AdSync, opt => opt.MapFrom(adGroup => true)) + .ForMember(group => group.Internal, opt => opt.MapFrom(adGroup => false)) + .ForMember(group => group.Active, opt => opt.MapFrom(adGroup => true)) + .ForMember(group => group.Name, opt => opt.MapFrom(adGroup => adGroup.Samaccountname.ElementAt(0))); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/MappingProfiles/GroupOfUserMappingProfile.cs b/DigitalData.UserManager.DataContracts/MappingProfiles/GroupOfUserMappingProfile.cs new file mode 100644 index 0000000..bbfb95a --- /dev/null +++ b/DigitalData.UserManager.DataContracts/MappingProfiles/GroupOfUserMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.DataContracts.DTOs.GroupOfUser; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.DataContracts.MappingProfiles +{ + public class GroupOfUserMappingProfile : Profile + { + public GroupOfUserMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} diff --git a/DigitalData.UserManager.DataContracts/MappingProfiles/ModuleMappingProfile.cs b/DigitalData.UserManager.DataContracts/MappingProfiles/ModuleMappingProfile.cs new file mode 100644 index 0000000..b89a235 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/MappingProfiles/ModuleMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.DataContracts.DTOs.Module; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.DataContracts.MappingProfiles +{ + public class ModuleMappingProfile : Profile + { + public ModuleMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} diff --git a/DigitalData.UserManager.DataContracts/MappingProfiles/ModuleOfUserMappingProfile.cs b/DigitalData.UserManager.DataContracts/MappingProfiles/ModuleOfUserMappingProfile.cs new file mode 100644 index 0000000..14f8b11 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/MappingProfiles/ModuleOfUserMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.DataContracts.DTOs.ModuleOfUser; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.DataContracts.MappingProfiles +{ + public class ModuleOfUserMappingProfile : Profile + { + public ModuleOfUserMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} diff --git a/DigitalData.UserManager.DataContracts/MappingProfiles/UserMappingProfile.cs b/DigitalData.UserManager.DataContracts/MappingProfiles/UserMappingProfile.cs new file mode 100644 index 0000000..fea50f4 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/MappingProfiles/UserMappingProfile.cs @@ -0,0 +1,26 @@ +using AutoMapper; +using DigitalData.UserManager.DataContracts.DTOs.User; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.DataContracts.MappingProfiles +{ + public class UserMappingProfile : Profile + { + public UserMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap() + .ForMember(user => user.Name, opt => opt.MapFrom(upDto => upDto.Surname)) + .ForMember(user => user.Prename, opt => opt.MapFrom(upDto => upDto.GivenName)) + .ForMember(user => user.Username, opt => opt.MapFrom(upDto => upDto.SamAccountName)) + .ForMember(user => user.Email, opt => opt.MapFrom(upDto => upDto.EmailAddress)); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.DataContracts/MappingProfiles/UserRepMappingProfile.cs b/DigitalData.UserManager.DataContracts/MappingProfiles/UserRepMappingProfile.cs new file mode 100644 index 0000000..bb1e097 --- /dev/null +++ b/DigitalData.UserManager.DataContracts/MappingProfiles/UserRepMappingProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using DigitalData.UserManager.DataContracts.DTOs.UserRep; +using DigitalData.UserManager.Domain.Entities; + +namespace DigitalData.UserManager.DataContracts.MappingProfiles +{ + public class UserRepMappingProfile : Profile + { + public UserRepMappingProfile() + { + CreateMap(); + CreateMap(); + CreateMap(); + + CreateMap(); + CreateMap(); + CreateMap(); + } + } +} \ No newline at end of file diff --git a/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll b/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll index dc51207..ccb2fa6 100644 Binary files a/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll and b/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll differ diff --git a/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb b/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb index 8938c70..1b70d22 100644 Binary files a/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb and b/DigitalData.UserManager.Domain/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb differ diff --git a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.CoreCompileInputs.cache b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.CoreCompileInputs.cache index a8e1d4b..07a6e5b 100644 --- a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.CoreCompileInputs.cache +++ b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -04f7bc95c8dfbe37f9a09b5384752d3233030162 +e7442efa119506a35ea2bbf61e7f3b06da27621b46597296eb047a0a80f5aa80 diff --git a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.FileListAbsolute.txt b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.FileListAbsolute.txt index 52f2c20..998381e 100644 --- a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.FileListAbsolute.txt +++ b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.csproj.FileListAbsolute.txt @@ -25,7 +25,6 @@ E:\TekH\Visual Studio\DDWeb\DigitalData.UserManager\DigitalData.UserManager.Doma E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Domain\bin\Debug\net7.0\DigitalData.UserManager.Domain.deps.json E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Domain\bin\Debug\net7.0\DigitalData.UserManager.Domain.dll E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Domain\bin\Debug\net7.0\DigitalData.UserManager.Domain.pdb -E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Domain\obj\Debug\net7.0\DigitalData.UserManager.Domain.csproj.AssemblyReference.cache E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Domain\obj\Debug\net7.0\DigitalData.UserManager.Domain.GeneratedMSBuildEditorConfig.editorconfig E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Domain\obj\Debug\net7.0\DigitalData.UserManager.Domain.AssemblyInfoInputs.cache E:\TekH\Visual Studio\WebUserManager\DigitalData.UserManager.Domain\obj\Debug\net7.0\DigitalData.UserManager.Domain.AssemblyInfo.cs diff --git a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.dll b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.dll index dc51207..ccb2fa6 100644 Binary files a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.dll and b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.dll differ diff --git a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.pdb b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.pdb index 8938c70..1b70d22 100644 Binary files a/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.pdb and b/DigitalData.UserManager.Domain/obj/Debug/net7.0/DigitalData.UserManager.Domain.pdb differ diff --git a/DigitalData.UserManager.Domain/obj/Debug/net7.0/ref/DigitalData.UserManager.Domain.dll b/DigitalData.UserManager.Domain/obj/Debug/net7.0/ref/DigitalData.UserManager.Domain.dll index 41da26a..4efe644 100644 Binary files a/DigitalData.UserManager.Domain/obj/Debug/net7.0/ref/DigitalData.UserManager.Domain.dll and b/DigitalData.UserManager.Domain/obj/Debug/net7.0/ref/DigitalData.UserManager.Domain.dll differ diff --git a/DigitalData.UserManager.Domain/obj/Debug/net7.0/refint/DigitalData.UserManager.Domain.dll b/DigitalData.UserManager.Domain/obj/Debug/net7.0/refint/DigitalData.UserManager.Domain.dll index 41da26a..4efe644 100644 Binary files a/DigitalData.UserManager.Domain/obj/Debug/net7.0/refint/DigitalData.UserManager.Domain.dll and b/DigitalData.UserManager.Domain/obj/Debug/net7.0/refint/DigitalData.UserManager.Domain.dll differ diff --git a/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll b/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll index dc51207..ccb2fa6 100644 Binary files a/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll and b/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.dll differ diff --git a/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb b/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb index 8938c70..1b70d22 100644 Binary files a/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb and b/DigitalData.UserManager.Infrastructure/bin/Debug/net7.0/DigitalData.UserManager.Domain.pdb differ diff --git a/DigitalData.UserManager.sln b/DigitalData.UserManager.sln index 9a2d988..87dafe1 100644 --- a/DigitalData.UserManager.sln +++ b/DigitalData.UserManager.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.NgW EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.UserManager.Infrastructure", "DigitalData.UserManager.Infrastructure\DigitalData.UserManager.Infrastructure.csproj", "{1DD81373-82F9-4872-95C6-888624DB1797}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.UserManager.DataContracts", "DigitalData.UserManager.DataContracts\DigitalData.UserManager.DataContracts.csproj", "{58E4815C-3EA0-4959-9F1A-5310A4CFD786}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {1DD81373-82F9-4872-95C6-888624DB1797}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DD81373-82F9-4872-95C6-888624DB1797}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DD81373-82F9-4872-95C6-888624DB1797}.Release|Any CPU.Build.0 = Release|Any CPU + {58E4815C-3EA0-4959-9F1A-5310A4CFD786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58E4815C-3EA0-4959-9F1A-5310A4CFD786}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58E4815C-3EA0-4959-9F1A-5310A4CFD786}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58E4815C-3EA0-4959-9F1A-5310A4CFD786}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE