diff --git a/DigitalData.UserManager.API/Controllers/AuthController.cs b/DigitalData.UserManager.API/Controllers/AuthController.cs index 68709bc..eeeb636 100644 --- a/DigitalData.UserManager.API/Controllers/AuthController.cs +++ b/DigitalData.UserManager.API/Controllers/AuthController.cs @@ -58,12 +58,12 @@ namespace DigitalData.UserManager.API.Controllers // Create claims var claims = new List { - new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), - new Claim(ClaimTypes.Name, user.Username), - new Claim(ClaimTypes.Surname, user.Name ?? ""), - new Claim(ClaimTypes.GivenName, user.Prename ?? ""), - new Claim(ClaimTypes.Email, user.Email ?? ""), - new Claim(ClaimTypes.Role, "PM_USER") + 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 diff --git a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj index 165fc9f..e520c99 100644 --- a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj +++ b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -7,10 +7,7 @@ - - - diff --git a/DigitalData.UserManager.Application/DTOs/User/UserReadDto.cs b/DigitalData.UserManager.Application/DTOs/User/UserReadDto.cs index 6b25b2b..b44afce 100644 --- a/DigitalData.UserManager.Application/DTOs/User/UserReadDto.cs +++ b/DigitalData.UserManager.Application/DTOs/User/UserReadDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; -using DigitalData.EmailProfilerDispatcher.Domain.Attributes; +using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes; namespace DigitalData.UserManager.Application.DTOs.User { diff --git a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj index cc6b9ea..2f5342a 100644 --- a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj +++ b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj @@ -8,10 +8,8 @@ - - - + @@ -23,22 +21,4 @@ - - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll - - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Contracts.dll - - - ..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.DTO.dll - - - ..\..\WebCoreModules\DigitalData.Core.Infrastructure\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll - - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Domain\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Domain.dll - - - diff --git a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj index 13870fe..3c0420a 100644 --- a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj +++ b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj @@ -7,7 +7,6 @@ -