1 Commits

Author SHA1 Message Date
Oscar Morales
a14cec8fb1 Configure authentication in program.cs and endpoints 2025-07-15 17:21:08 -06:00
31 changed files with 741 additions and 114 deletions

View File

@@ -9,6 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Thalos.Domain", "Core.Thalos.Domain\Core.Thalos.Domain.csproj", "{BE8E05D6-05B2-4317-B619-21853B7D21DB}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Thalos.Domain", "Core.Thalos.Domain\Core.Thalos.Domain.csproj", "{BE8E05D6-05B2-4317-B619-21853B7D21DB}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Thalos.Infrastructure", "Core.Thalos.Infraestructure\Core.Thalos.Infrastructure.csproj", "{43BD5F47-132F-4E78-83F1-A1FEED01A502}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Thalos.Provider", "Core.Thalos.Provider\Core.Thalos.Provider.csproj", "{8CAE8380-475F-46B8-AF90-C495AAC58606}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Thalos.Provider", "Core.Thalos.Provider\Core.Thalos.Provider.csproj", "{8CAE8380-475F-46B8-AF90-C495AAC58606}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Presentation", "Presentation", "{36839283-6407-476A-BB33-F0EE90383E2B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Presentation", "Presentation", "{36839283-6407-476A-BB33-F0EE90383E2B}"
@@ -27,6 +29,10 @@ Global
{BE8E05D6-05B2-4317-B619-21853B7D21DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE8E05D6-05B2-4317-B619-21853B7D21DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE8E05D6-05B2-4317-B619-21853B7D21DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE8E05D6-05B2-4317-B619-21853B7D21DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE8E05D6-05B2-4317-B619-21853B7D21DB}.Release|Any CPU.Build.0 = Release|Any CPU {BE8E05D6-05B2-4317-B619-21853B7D21DB}.Release|Any CPU.Build.0 = Release|Any CPU
{43BD5F47-132F-4E78-83F1-A1FEED01A502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43BD5F47-132F-4E78-83F1-A1FEED01A502}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43BD5F47-132F-4E78-83F1-A1FEED01A502}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43BD5F47-132F-4E78-83F1-A1FEED01A502}.Release|Any CPU.Build.0 = Release|Any CPU
{8CAE8380-475F-46B8-AF90-C495AAC58606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CAE8380-475F-46B8-AF90-C495AAC58606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CAE8380-475F-46B8-AF90-C495AAC58606}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CAE8380-475F-46B8-AF90-C495AAC58606}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CAE8380-475F-46B8-AF90-C495AAC58606}.Release|Any CPU.ActiveCfg = Release|Any CPU {8CAE8380-475F-46B8-AF90-C495AAC58606}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -38,6 +44,7 @@ Global
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{F00B4683-03B3-487A-9608-4B30675AA278} = {36839283-6407-476A-BB33-F0EE90383E2B} {F00B4683-03B3-487A-9608-4B30675AA278} = {36839283-6407-476A-BB33-F0EE90383E2B}
{BE8E05D6-05B2-4317-B619-21853B7D21DB} = {2E7D918E-AB9F-44BF-A334-FD675C9B626E} {BE8E05D6-05B2-4317-B619-21853B7D21DB} = {2E7D918E-AB9F-44BF-A334-FD675C9B626E}
{43BD5F47-132F-4E78-83F1-A1FEED01A502} = {2E7D918E-AB9F-44BF-A334-FD675C9B626E}
{8CAE8380-475F-46B8-AF90-C495AAC58606} = {2E7D918E-AB9F-44BF-A334-FD675C9B626E} {8CAE8380-475F-46B8-AF90-C495AAC58606} = {2E7D918E-AB9F-44BF-A334-FD675C9B626E}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution

View File

@@ -25,7 +25,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[ApiController] [ApiController]
[AllowAnonymous] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
public class ModuleController(IModuleProvider service) : ControllerBase public class ModuleController(IModuleProvider service) : ControllerBase
{ {
/// <summary> /// <summary>
@@ -39,8 +39,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)] [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("ModuleManagement.Read, RoleManagement.Read")]
//[Permission("ModuleManagement.Read, RoleManagement.Read")]
public async Task<IActionResult> GetAllModulesAsync(CancellationToken cancellationToken) public async Task<IActionResult> GetAllModulesAsync(CancellationToken cancellationToken)
{ {
var result = await service.GetAllModules(cancellationToken).ConfigureAwait(false); var result = await service.GetAllModules(cancellationToken).ConfigureAwait(false);
@@ -60,8 +59,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)] [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("ModuleManagement.Read")]
//[Permission("ModuleManagement.Read")]
public async Task<IActionResult> GetAllModulesByList([FromBody] string[] modules, CancellationToken cancellationToken) public async Task<IActionResult> GetAllModulesByList([FromBody] string[] modules, CancellationToken cancellationToken)
{ {
if (modules == null || !modules.Any()) if (modules == null || !modules.Any())
@@ -87,8 +85,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("ModuleManagement.Read")]
//[Permission("ModuleManagement.Read")]
public async Task<IActionResult> GetModuleByIdAsync([FromRoute] string id, CancellationToken cancellationToken) public async Task<IActionResult> GetModuleByIdAsync([FromRoute] string id, CancellationToken cancellationToken)
{ {
var result = await service.GetModuleById(id, cancellationToken).ConfigureAwait(false); var result = await service.GetModuleById(id, cancellationToken).ConfigureAwait(false);
@@ -111,8 +108,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal e|ror.</response> /// <response code="500">The service internal e|ror.</response>
[HttpPost] [HttpPost]
[ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status201Created)] [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status201Created)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("ModuleManagement.Write")]
//[Permission("ModuleManagement.Write")]
public async Task<IActionResult> CreateModuleAsync([FromBody] ModuleRequest newModule, CancellationToken cancellationToken) public async Task<IActionResult> CreateModuleAsync([FromBody] ModuleRequest newModule, CancellationToken cancellationToken)
{ {
var result = await service.CreateModule(newModule, cancellationToken).ConfigureAwait(false); var result = await service.CreateModule(newModule, cancellationToken).ConfigureAwait(false);
@@ -134,8 +130,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("ModuleManagement.Write")]
//[Permission("ModuleManagement.Write")]
public async Task<IActionResult> UpdateModuleAsync([FromRoute] string id, ModuleAdapter entity, CancellationToken cancellationToken) public async Task<IActionResult> UpdateModuleAsync([FromRoute] string id, ModuleAdapter entity, CancellationToken cancellationToken)
{ {
if (id != entity.Id?.ToString()) if (id != entity.Id?.ToString())
@@ -163,8 +158,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("ModuleManagement.Write")]
//[Permission("ModuleManagement.Write")]
public async Task<IActionResult> ChangeModuleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) public async Task<IActionResult> ChangeModuleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{ {
var result = await service.ChangeModuleStatus(id, newStatus, cancellationToken).ConfigureAwait(false); var result = await service.ChangeModuleStatus(id, newStatus, cancellationToken).ConfigureAwait(false);

View File

@@ -25,6 +25,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[ApiController] [ApiController]
[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
public class PermissionController(IPermissionProvider service) : ControllerBase public class PermissionController(IPermissionProvider service) : ControllerBase
{ {
/// <summary> /// <summary>
@@ -38,8 +39,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)] [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("PermissionManagement.Read, RoleManagement.Read")]
//[Permission("PermissionManagement.Read, RoleManagement.Read")]
public async Task<IActionResult> GetAllPermissionsAsync(CancellationToken cancellationToken) public async Task<IActionResult> GetAllPermissionsAsync(CancellationToken cancellationToken)
{ {
var result = await service.GetAllPermissions(cancellationToken).ConfigureAwait(false); var result = await service.GetAllPermissions(cancellationToken).ConfigureAwait(false);
@@ -59,8 +59,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)] [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("PermissionManagement.Read")]
//[Permission("PermissionManagement.Read")]
public async Task<IActionResult> GetAllPermissionsByList([FromBody] string[] permissions, CancellationToken cancellationToken) public async Task<IActionResult> GetAllPermissionsByList([FromBody] string[] permissions, CancellationToken cancellationToken)
{ {
if (permissions == null || !permissions.Any()) if (permissions == null || !permissions.Any())
@@ -85,8 +84,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("PermissionManagement.Read")]
//[Permission("PermissionManagement.Read")]
public async Task<IActionResult> GetPermissionByIdAsync([FromRoute] string id, CancellationToken cancellationToken) public async Task<IActionResult> GetPermissionByIdAsync([FromRoute] string id, CancellationToken cancellationToken)
{ {
var result = await service.GetPermissionById(id, cancellationToken).ConfigureAwait(false); var result = await service.GetPermissionById(id, cancellationToken).ConfigureAwait(false);
@@ -109,8 +107,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal e|ror.</response> /// <response code="500">The service internal e|ror.</response>
[HttpPost] [HttpPost]
[ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status201Created)] [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status201Created)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("PermissionManagement.Write")]
//[Permission("PermissionManagement.Write")]
public async Task<IActionResult> CreatePermissionAsync([FromBody] PermissionRequest newPermission, CancellationToken cancellationToken) public async Task<IActionResult> CreatePermissionAsync([FromBody] PermissionRequest newPermission, CancellationToken cancellationToken)
{ {
var result = await service.CreatePermission(newPermission, cancellationToken).ConfigureAwait(false); var result = await service.CreatePermission(newPermission, cancellationToken).ConfigureAwait(false);
@@ -132,8 +129,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("PermissionManagement.Write")]
//[Permission("PermissionManagement.Write")]
public async Task<IActionResult> UpdatePermissionAsync([FromRoute] string id, PermissionAdapter entity, CancellationToken cancellationToken) public async Task<IActionResult> UpdatePermissionAsync([FromRoute] string id, PermissionAdapter entity, CancellationToken cancellationToken)
{ {
if (id != entity.Id?.ToString()) if (id != entity.Id?.ToString())
@@ -161,8 +157,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("PermissionManagement.Write")]
//[Permission("PermissionManagement.Write")]
public async Task<IActionResult> ChangePermissionStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) public async Task<IActionResult> ChangePermissionStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{ {
var result = await service.ChangePermissionStatus(id, newStatus, cancellationToken).ConfigureAwait(false); var result = await service.ChangePermissionStatus(id, newStatus, cancellationToken).ConfigureAwait(false);

View File

@@ -24,6 +24,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Produces(MimeTypes.ApplicationJson)] [Produces(MimeTypes.ApplicationJson)]
[Consumes(MimeTypes.ApplicationJson)] [Consumes(MimeTypes.ApplicationJson)]
[ApiController] [ApiController]
[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
public class RoleController(IRoleProvider service) : ControllerBase public class RoleController(IRoleProvider service) : ControllerBase
{ {
/// <summary> /// <summary>
@@ -35,8 +36,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpGet] [HttpGet]
[ProducesResponseType(typeof(IEnumerable<RoleAdapter>), StatusCodes.Status200OK)] [ProducesResponseType(typeof(IEnumerable<RoleAdapter>), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("RoleManagement.Read")]
//[Permission("RoleManagement.Read")]
public async Task<IActionResult> GetAllRolesAsync(CancellationToken cancellationToken) public async Task<IActionResult> GetAllRolesAsync(CancellationToken cancellationToken)
{ {
var result = await service.GetAllRoles(cancellationToken).ConfigureAwait(false); var result = await service.GetAllRoles(cancellationToken).ConfigureAwait(false);
@@ -54,8 +54,7 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpGet] [HttpGet]
[Route(Routes.Id)] [Route(Routes.Id)]
[ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("RoleManagement.Read")]
//[Permission("RoleManagement.Read")]
public async Task<IActionResult> GetRoleByIdAsync([FromRoute] string id, CancellationToken cancellationToken) public async Task<IActionResult> GetRoleByIdAsync([FromRoute] string id, CancellationToken cancellationToken)
{ {
var result = await service.GetRoleById(id, cancellationToken).ConfigureAwait(false); var result = await service.GetRoleById(id, cancellationToken).ConfigureAwait(false);
@@ -78,8 +77,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpPost] [HttpPost]
[ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status201Created)] [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status201Created)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("RoleManagement.Write")]
//[Permission("RoleManagement.Write")]
public async Task<IActionResult> CreateRoleAsync([FromBody] RoleRequest newRole, CancellationToken cancellationToken) public async Task<IActionResult> CreateRoleAsync([FromBody] RoleRequest newRole, CancellationToken cancellationToken)
{ {
var result = await service.CreateRole(newRole, cancellationToken).ConfigureAwait(false); var result = await service.CreateRole(newRole, cancellationToken).ConfigureAwait(false);
@@ -99,8 +97,7 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpPut] [HttpPut]
[Route(Routes.Id)] [Route(Routes.Id)]
[ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("RoleManagement.Write")]
//[Permission("RoleManagement.Write")]
public async Task<IActionResult> UpdateRoleAsync([FromRoute] string id, [FromBody] RoleAdapter entity, CancellationToken cancellationToken) public async Task<IActionResult> UpdateRoleAsync([FromRoute] string id, [FromBody] RoleAdapter entity, CancellationToken cancellationToken)
{ {
if (id != entity.Id?.ToString()) if (id != entity.Id?.ToString())
@@ -126,8 +123,7 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpPatch] [HttpPatch]
[Route(Routes.ChangeStatus)] [Route(Routes.ChangeStatus)]
[ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("RoleManagement.Write")]
//[Permission("RoleManagement.Write")]
public async Task<IActionResult> ChangeRoleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) public async Task<IActionResult> ChangeRoleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{ {
var result = await service.ChangeRoleStatus(id, newStatus, cancellationToken).ConfigureAwait(false); var result = await service.ChangeRoleStatus(id, newStatus, cancellationToken).ConfigureAwait(false);
@@ -146,8 +142,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpPost(Routes.AddApplication)] [HttpPost(Routes.AddApplication)]
[ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("RoleManagement.Write")]
//[Permission("RoleManagement.Write")]
public async Task<IActionResult> AddApplicationToRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) public async Task<IActionResult> AddApplicationToRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken)
{ {
var result = await service.AddApplicationToRole(roleId, application, cancellationToken).ConfigureAwait(false); var result = await service.AddApplicationToRole(roleId, application, cancellationToken).ConfigureAwait(false);
@@ -166,8 +161,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpDelete(Routes.RemoveApplication)] [HttpDelete(Routes.RemoveApplication)]
[ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Permission("RoleManagement.Write")]
//[Permission("RoleManagement.Write")]
public async Task<IActionResult> RemoveApplicationFromRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) public async Task<IActionResult> RemoveApplicationFromRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken)
{ {
var result = await service.RemoveApplicationFromRole(roleId, application, cancellationToken).ConfigureAwait(false); var result = await service.RemoveApplicationFromRole(roleId, application, cancellationToken).ConfigureAwait(false);

View File

@@ -35,8 +35,8 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpGet] [HttpGet]
[ProducesResponseType(typeof(IEnumerable<UserAdapter>), StatusCodes.Status200OK)] [ProducesResponseType(typeof(IEnumerable<UserAdapter>), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Read")] [Permission("UserManagement.Read")]
public async Task<IActionResult> GetAllUsers(CancellationToken cancellationToken) public async Task<IActionResult> GetAllUsers(CancellationToken cancellationToken)
{ {
var result = await service.GetAllUsers(cancellationToken).ConfigureAwait(false); var result = await service.GetAllUsers(cancellationToken).ConfigureAwait(false);
@@ -54,8 +54,8 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpGet] [HttpGet]
[Route(Routes.Id)] [Route(Routes.Id)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Read")] [Permission("UserManagement.Read")]
public async Task<IActionResult> GetUserById([FromRoute] string id, CancellationToken cancellationToken) public async Task<IActionResult> GetUserById([FromRoute] string id, CancellationToken cancellationToken)
{ {
var result = await service.GetUserById(id, cancellationToken).ConfigureAwait(false); var result = await service.GetUserById(id, cancellationToken).ConfigureAwait(false);
@@ -79,7 +79,7 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpGet] [HttpGet]
[Route(Routes.Email)] [Route(Routes.Email)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")] [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
public async Task<IActionResult> GetUserByEmail([FromRoute] string email, CancellationToken cancellationToken) public async Task<IActionResult> GetUserByEmail([FromRoute] string email, CancellationToken cancellationToken)
{ {
var result = await service.GetUserByEmail(email, cancellationToken).ConfigureAwait(false); var result = await service.GetUserByEmail(email, cancellationToken).ConfigureAwait(false);
@@ -127,8 +127,8 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpPost(Routes.Register)] [HttpPost(Routes.Register)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status201Created)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status201Created)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Write")] [Permission("UserManagement.Write")]
public async Task<IActionResult> CreateUserAsync([FromBody] UserRequest newUser, CancellationToken cancellationToken) public async Task<IActionResult> CreateUserAsync([FromBody] UserRequest newUser, CancellationToken cancellationToken)
{ {
var result = await service.CreateUser(newUser, cancellationToken).ConfigureAwait(false); var result = await service.CreateUser(newUser, cancellationToken).ConfigureAwait(false);
@@ -148,8 +148,8 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpPut] [HttpPut]
[Route(Routes.Id)] [Route(Routes.Id)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Write")] [Permission("UserManagement.Write")]
public async Task<IActionResult> UpdateUserAsync([FromRoute] string id, [FromBody] UserAdapter entity, CancellationToken cancellationToken) public async Task<IActionResult> UpdateUserAsync([FromRoute] string id, [FromBody] UserAdapter entity, CancellationToken cancellationToken)
{ {
if (id != entity.Id?.ToString()) if (id != entity.Id?.ToString())
@@ -173,7 +173,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpPatch(Routes.LogIn)] [HttpPatch(Routes.LogIn)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")] [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
public async Task<IActionResult> LoginUserAsync([FromRoute] string email, CancellationToken cancellationToken) public async Task<IActionResult> LoginUserAsync([FromRoute] string email, CancellationToken cancellationToken)
{ {
var result = await service.LogInUser(email, cancellationToken).ConfigureAwait(false); var result = await service.LogInUser(email, cancellationToken).ConfigureAwait(false);
@@ -194,7 +194,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response> /// <response code="500">The service internal error.</response>
[HttpPatch(Routes.LogOut)] [HttpPatch(Routes.LogOut)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")] [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
public async Task<IActionResult> LogOutUserSessionAsync([FromRoute] string email, CancellationToken cancellationToken) public async Task<IActionResult> LogOutUserSessionAsync([FromRoute] string email, CancellationToken cancellationToken)
{ {
var result = await service.LogOutUserSession(email, cancellationToken).ConfigureAwait(false); var result = await service.LogOutUserSession(email, cancellationToken).ConfigureAwait(false);
@@ -216,8 +216,8 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpPatch] [HttpPatch]
[Route(Routes.ChangeStatus)] [Route(Routes.ChangeStatus)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Write")] [Permission("UserManagement.Write")]
public async Task<IActionResult> ChangeUserStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) public async Task<IActionResult> ChangeUserStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{ {
var result = await service.ChangeUserStatus(id, newStatus, cancellationToken).ConfigureAwait(false); var result = await service.ChangeUserStatus(id, newStatus, cancellationToken).ConfigureAwait(false);
@@ -236,8 +236,8 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpPost] [HttpPost]
[Route(Routes.AddCompany)] [Route(Routes.AddCompany)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Write")] [Permission("UserManagement.Write")]
public async Task<IActionResult> AddCompanyToUserAsync([FromRoute] string userId, [FromRoute] string companyId, CancellationToken cancellationToken) public async Task<IActionResult> AddCompanyToUserAsync([FromRoute] string userId, [FromRoute] string companyId, CancellationToken cancellationToken)
{ {
var result = await service.AddCompanyToUser(userId, companyId, cancellationToken).ConfigureAwait(false); var result = await service.AddCompanyToUser(userId, companyId, cancellationToken).ConfigureAwait(false);
@@ -256,8 +256,8 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpDelete] [HttpDelete]
[Route(Routes.RemoveCompany)] [Route(Routes.RemoveCompany)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Write")] [Permission("UserManagement.Write")]
public async Task<IActionResult> RemoveCompanyFromUserAsync([FromRoute] string userId, [FromRoute] string companyId, CancellationToken cancellationToken) public async Task<IActionResult> RemoveCompanyFromUserAsync([FromRoute] string userId, [FromRoute] string companyId, CancellationToken cancellationToken)
{ {
var result = await service.RemoveCompanyFromUser(userId, companyId, cancellationToken).ConfigureAwait(false); ; var result = await service.RemoveCompanyFromUser(userId, companyId, cancellationToken).ConfigureAwait(false); ;
@@ -276,8 +276,8 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpPost] [HttpPost]
[Route(Routes.AddProject)] [Route(Routes.AddProject)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Write")] [Permission("UserManagement.Write")]
public async Task<IActionResult> AddProjectToUserAsync([FromRoute] string userId, [FromRoute] string projectId, CancellationToken cancellationToken) public async Task<IActionResult> AddProjectToUserAsync([FromRoute] string userId, [FromRoute] string projectId, CancellationToken cancellationToken)
{ {
var result = await service.AddProjectToUser(userId, projectId, cancellationToken).ConfigureAwait(false); var result = await service.AddProjectToUser(userId, projectId, cancellationToken).ConfigureAwait(false);
@@ -296,8 +296,8 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpDelete] [HttpDelete]
[Route(Routes.RemoveProject)] [Route(Routes.RemoveProject)]
[ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
//[Permission("UserManagement.Write")] [Permission("UserManagement.Write")]
public async Task<IActionResult> RemoveProjectFromUserAsync([FromRoute] string userId, [FromRoute] string projectId, CancellationToken cancellationToken) public async Task<IActionResult> RemoveProjectFromUserAsync([FromRoute] string userId, [FromRoute] string projectId, CancellationToken cancellationToken)
{ {
var result = await service.RemoveProjectFromUser(userId, projectId, cancellationToken).ConfigureAwait(false); var result = await service.RemoveProjectFromUser(userId, projectId, cancellationToken).ConfigureAwait(false);
@@ -315,7 +315,7 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpGet] [HttpGet]
[Route("{email}/GetTokenAdapter")] [Route("{email}/GetTokenAdapter")]
[ProducesResponseType(typeof(TokenAdapter), StatusCodes.Status200OK)] [ProducesResponseType(typeof(TokenAdapter), StatusCodes.Status200OK)]
//[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")] [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
public async Task<IActionResult> GetTokenAdapter([FromRoute] string email, CancellationToken cancellationToken) public async Task<IActionResult> GetTokenAdapter([FromRoute] string email, CancellationToken cancellationToken)
{ {
var tokenAdapter = await service.GetToken(email, cancellationToken).ConfigureAwait(false); var tokenAdapter = await service.GetToken(email, cancellationToken).ConfigureAwait(false);

View File

@@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Core.Blueprint.Logging" Version="1.0.1" /> <PackageReference Include="Core.Blueprint.Logging" Version="1.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,6 +1,8 @@
using Asp.Versioning.ApiExplorer; using Asp.Versioning.ApiExplorer;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.Graph.ExternalConnectors;
using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen; using Swashbuckle.AspNetCore.SwaggerGen;
using Swashbuckle.AspNetCore.SwaggerUI; using Swashbuckle.AspNetCore.SwaggerUI;
@@ -8,13 +10,44 @@ namespace Core.Thalos.DAL.API.Extensions
{ {
public static class SwaggerExtensions public static class SwaggerExtensions
{ {
public static void AddSwagger(this IServiceCollection services) public static void AddSwagger(this IServiceCollection services, IConfiguration configuration)
{ {
services.AddEndpointsApiExplorer(); services.AddEndpointsApiExplorer();
services.AddSwaggerGen(); AddSwaggerGen(services, configuration);
services.AddTransient<IConfigureOptions<SwaggerGenOptions>, ConfigureSwaggerOptions>(); services.AddTransient<IConfigureOptions<SwaggerGenOptions>, ConfigureSwaggerOptions>();
} }
public static void AddSwaggerGen(this IServiceCollection services, IConfiguration configuration)
{
services.AddSwaggerGen(c =>
{
c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
{
Description = "JWT Authorization header using the Bearer scheme",
Name = "Authorization",
In = ParameterLocation.Header,
Type = SecuritySchemeType.Http,
Scheme = "bearer",
BearerFormat = "JWT"
});
c.AddSecurityRequirement(new OpenApiSecurityRequirement
{
{
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme,
Id = "Bearer"
}
},
Array.Empty<string>()
}
});
});
}
public static void ConfigureSwagger(this WebApplication app) public static void ConfigureSwagger(this WebApplication app)
{ {
app.UseSwagger(); app.UseSwagger();

View File

@@ -1,7 +1,8 @@
using Core.Blueprint.Caching.Configuration;
using Core.Blueprint.DAL.Mongo.Configuration; using Core.Blueprint.DAL.Mongo.Configuration;
using Core.Blueprint.Logging.Configuration; using Core.Blueprint.Logging.Configuration;
using Core.Blueprint.Redis.Configuration;
using Core.Thalos.Adapters.Extensions; using Core.Thalos.Adapters.Extensions;
using Core.Thalos.BuildingBlocks.Authentication.Extensions;
using Core.Thalos.DAL.API.Extensions; using Core.Thalos.DAL.API.Extensions;
using Core.Thalos.Provider; using Core.Thalos.Provider;
using Microsoft.AspNetCore.HttpLogging; using Microsoft.AspNetCore.HttpLogging;
@@ -10,6 +11,8 @@ using System.Text.Json.Serialization;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
builder.Services.ConfigureAuthentication(builder.Configuration);
builder.Services.AddEndpointsApiExplorer(); builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen(); builder.Services.AddSwaggerGen();
builder.Configuration builder.Configuration
@@ -45,7 +48,7 @@ builder.Host.ConfigureServices((context, services) =>
services services
.AddEndpointsApiExplorer() .AddEndpointsApiExplorer()
.AddVersioning() .AddVersioning()
.AddSwagger(); .AddSwagger(builder.Configuration);
services.AddHealthChecks(); services.AddHealthChecks();
services.AddHttpLogging(options => options.LoggingFields = HttpLoggingFields.All); services.AddHttpLogging(options => options.LoggingFields = HttpLoggingFields.All);
@@ -65,8 +68,6 @@ var app = builder.Build();
app.UseSwagger(); app.UseSwagger();
app.UseSwaggerUI(); app.UseSwaggerUI();
app.UseAuthentication();
app.UseAuthorization();
app.MapControllers(); app.MapControllers();
app.UseCors(); app.UseCors();
app.ConfigureSwagger(); app.ConfigureSwagger();
@@ -76,6 +77,8 @@ app.UseRouting();
app.UseResponseCompression(); app.UseResponseCompression();
app.UseOutputCache(); app.UseOutputCache();
app.UseResponseCaching(); app.UseResponseCaching();
app.UseAuthentication();
app.UseAuthorization();
app.UseLogging(builder.Configuration); app.UseLogging(builder.Configuration);
app.MapHealthChecks("/health"); app.MapHealthChecks("/health");

View File

@@ -1,26 +0,0 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"MongoDB": "mongodb://admin_agile:Admin%40agileWebs@portainer.white-enciso.pro:27017/?authMechanism=SCRAM-SHA-256",
"Redis": "100.123.31.103:6379"
},
"MongoDb": {
"DatabaseName": "Thalos",
"LocalAudience": ""
},
"DetailedErrors": true,
"UseRedisCache": true,
"CacheSettings": {
"DefaultCacheDurationInMinutes": 3
},
"ServiceSettings": {
"ApplicationName": "thalos",
"LayerName": "dal"
}
}

View File

@@ -18,5 +18,18 @@
"UseRedisCache": true, "UseRedisCache": true,
"CacheSettings": { "CacheSettings": {
"DefaultCacheDurationInMinutes": 3 "DefaultCacheDurationInMinutes": 3
} },
"Authentication": {
"Google": {
"ClientId": "128345072002-mtfdgpcur44o9tbd7q6e0bb9qnp2crfp.apps.googleusercontent.com",
"ClientSecret": "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",
"ApplicationName": "Thalos",
"RedirectUri": "https://localhost:7239/api/v1/Authentication/callback"
}
},
"JwtIssuerOptions": {
"Audience": "https://localhost:7239/",
"Issuer": "webApi"
},
"SecretKey": "iNivDmHLpUA223sqsfhqGbMRdRj1PVkH1"
} }

View File

@@ -0,0 +1,42 @@
// ***********************************************************************
// <copyright file="ModuleMapper.cs">
// AgileWebs
// </copyright>
// ***********************************************************************
using Core.Thalos.Adapters;
using Core.Thalos.Domain.Contexts.Onboarding.Request;
using Microsoft.AspNetCore.Http;
using MongoDB.Bson;
using System.Security.Claims;
namespace Core.Thalos.Domain.Contexts.Onboarding.Mappers
{
/// <summary>
/// Handles mappings between
/// <see cref="ModuleRequest"/>,
/// and <see cref="ModuleAdapter"/>
/// </summary>
public static class ModuleMapper
{
/// <summary>
/// Maps the permissionRequest to ModuleAdapter.
/// </summary>
/// <param name="newModule">The Module to be mapped.</param>
/// <returns>A <see cref="ModuleAdapter"/> representing
/// the asynchronous execution of the service.</returns>
public static ModuleAdapter ToAdapter(this ModuleRequest newModule, IHttpContextAccessor httpContextAccessor)
{
return new ModuleAdapter
{
Id = ObjectId.GenerateNewId().ToString(),
Name = newModule.Name,
Description = newModule.Description,
Icon = newModule.Icon,
Route = newModule.Route,
Order = newModule.Order,
Application = newModule.Application,
CreatedAt = DateTime.UtcNow,
CreatedBy = httpContextAccessor.HttpContext?.User?.FindFirst(ClaimTypes.Email)?.Value ?? string.Empty,
};
}
}
}

View File

@@ -0,0 +1,39 @@
// ***********************************************************************
// <copyright file="PermissionMapper.cs">
// AgileWebs
// </copyright>
// ***********************************************************************
using Core.Thalos.Adapters;
using Core.Thalos.Domain.Contexts.Onboarding.Request;
using Microsoft.AspNetCore.Http;
using MongoDB.Bson;
using System.Security.Claims;
namespace Core.Thalos.Domain.Contexts.Onboarding.Mappers
{
/// <summary>
/// Handles mappings between
/// <see cref="PermissionRequest"/>,
/// and <see cref="PermissionAdapter"/>
/// </summary>
public static class PermissionMapper
{
/// <summary>
/// Maps the permissionRequest to PermissionAdapter.
/// </summary>
/// <param name="newPermission">The Permission to be mapped.</param>
/// <returns>A <see cref="PermissionAdapter"/> representing
/// the asynchronous execution of the service.</returns>
public static PermissionAdapter ToAdapter(this PermissionRequest newPermission, IHttpContextAccessor httpContextAccessor)
{
return new PermissionAdapter
{
Id = ObjectId.GenerateNewId().ToString(),
Name = newPermission.Name,
Description = newPermission.Description,
CreatedAt = DateTime.UtcNow,
CreatedBy = httpContextAccessor.HttpContext?.User?.FindFirst(ClaimTypes.Email)?.Value ?? string.Empty,
AccessLevel = newPermission.AccessLevel
};
}
}
}

View File

@@ -0,0 +1,42 @@
// ***********************************************************************
// <copyright file="RoleMapper.cs">
// AgileWebs
// </copyright>
// ***********************************************************************
using Core.Thalos.Adapters;
using Core.Thalos.Domain.Contexts.Onboarding.Request;
using Microsoft.AspNetCore.Http;
using MongoDB.Bson;
using System.Security.Claims;
namespace Core.Thalos.Domain.Contexts.Onboarding.Mappers
{
/// <summary>
/// Handles mappings between
/// <see cref="RoleRequest"/>,
/// and <see cref="RoleAdapter"/>
/// </summary>
public static class RoleMapper
{
/// <summary>
/// Maps the RoleRequest to RoleAdapter.
/// </summary>
/// <param name="newRole">The Role to be mapped.</param>
/// <returns>A <see cref="RoleAdapter"/> representing
/// the asynchronous execution of the service.</returns>
public static RoleAdapter ToAdapter(this RoleRequest newRole, IHttpContextAccessor httpContextAccessor)
{
return new RoleAdapter
{
Id = ObjectId.GenerateNewId().ToString(),
Name = newRole.Name,
Description = newRole.Description,
Applications = newRole.Applications,
Modules = newRole.Modules,
Permissions = newRole.Permissions,
CreatedAt = DateTime.UtcNow,
CreatedBy = httpContextAccessor.HttpContext?.User?.FindFirst(ClaimTypes.Email)?.Value ?? string.Empty
};
}
}
}

View File

@@ -0,0 +1,46 @@
// ***********************************************************************
// <copyright file="UserMapper.cs">
// AgileWebs
// </copyright>
// ***********************************************************************
using Core.Thalos.Adapters;
using Core.Thalos.Domain.Contexts.Onboarding.Request;
using Microsoft.AspNetCore.Http;
using MongoDB.Bson;
using System.Security.Claims;
namespace Core.Thalos.Domain.Contexts.Onboarding.Mappers
{
/// <summary>
/// Handles mappings between
/// <see cref="UserRequest"/>,
/// and <see cref="UserAdapter"/>
/// </summary>
public static class UserMapper
{
/// <summary>
/// Maps the UserRequest to UserAdapter.
/// </summary>
/// <param name="newUser">The User to be mapped.</param>
/// <returns>A <see cref="UserAdapter"/> representing
/// the asynchronous execution of the service.</returns>
public static UserAdapter ToAdapter(this UserRequest newUser, IHttpContextAccessor httpContextAccessor)
{
return new UserAdapter
{
Id = ObjectId.GenerateNewId().ToString(),
Guid = Guid.NewGuid().ToString(),
Email = newUser.Email,
Name = newUser.Name,
MiddleName = newUser.MiddleName,
LastName = newUser.LastName,
DisplayName = $"{newUser.Name} {newUser.MiddleName} {newUser.LastName}",
RoleId = newUser.RoleId,
Companies = newUser.Companies,
Projects = newUser.Projects,
CreatedAt = DateTime.UtcNow,
CreatedBy = httpContextAccessor.HttpContext?.User?.FindFirst(ClaimTypes.Email)?.Value ?? string.Empty
};
}
}
}

View File

@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.0.3" /> <PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.0.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -0,0 +1,30 @@
using Core.Thalos.Infraestructure.Caching.Configs;
namespace LSA.Core.Dapper.Service.Caching
{
public static class CacheHelper
{
/// <summary>
/// Determines the cache duration based on specific duration, settings, or a default value.
/// </summary>
/// <param name="specificCacheDuration">Specific cache duration in minutes, if provided.</param>
/// <param name="cacheSettings">General cache settings containing default duration values.</param>
/// <returns>The cache duration as a TimeSpan.</returns>
public static TimeSpan GetCacheDuration(CacheSettings cacheSettings, int? specificCacheDuration = 0)
{
var defaultCacheDuration = TimeSpan.FromMinutes(.5);
if (specificCacheDuration.HasValue && specificCacheDuration.Value > 0)
{
return TimeSpan.FromMinutes(specificCacheDuration.Value);
}
if (cacheSettings.DefaultCacheDurationInMinutes > 0)
{
return TimeSpan.FromMinutes(cacheSettings.DefaultCacheDurationInMinutes);
}
return defaultCacheDuration;
}
}
}

View File

@@ -0,0 +1,47 @@
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
namespace LSA.Core.Dapper.Service.Caching
{
public static class CacheKeyHelper
{
public static string GenerateCacheKey(object instance, string methodName, params object[] parameters)
{
var className = instance.GetType().Name;
var keyBuilder = new StringBuilder($"{className}.{methodName}");
foreach (var param in parameters)
{
string normalizedParam = NormalizeParameter(param);
keyBuilder.Append($".{normalizedParam}");
}
return keyBuilder.ToString();
}
private static string NormalizeParameter(object param)
{
if (param == null)
{
return "null";
}
string paramString;
if (param is DateTime dateTime)
{
paramString = dateTime.ToString("yyyyMMdd");
}
else
{
paramString = param.ToString();
}
// Replace special characters with an underscore
string normalizedParam = Regex.Replace(paramString, @"[^a-zA-Z0-9]", "_");
return normalizedParam;
}
}
}

View File

@@ -0,0 +1,133 @@
using Azure.Identity;
using Core.Thalos.Infraestructure.Caching.Contracts;
using Microsoft.Extensions.Logging;
using StackExchange.Redis;
using System.Text.Json;
namespace LSA.Core.Dapper.Service.Caching
{
public class CacheService : ICacheService
{
private IDatabase _cacheDatabase = null!;
private readonly ILogger<CacheService> _logger;
public CacheService(string connectionString, ILogger<CacheService> logger)
{
_logger = logger;
Task.Run(async () =>
{
_cacheDatabase = await GetRedisDatabase(connectionString);
}).Wait();
}
private async Task<IDatabase> GetRedisDatabase(string connectionString)
{
try
{
var configurationOptions = await ConfigurationOptions.Parse($"{connectionString}")
.ConfigureForAzureWithTokenCredentialAsync(new DefaultAzureCredential());
configurationOptions.AbortOnConnectFail = false;
var connectionMultiplexer = await ConnectionMultiplexer.ConnectAsync(configurationOptions);
_logger.LogInformation("Successfully connected to Redis.");
return connectionMultiplexer.GetDatabase();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error establishing Redis connection.");
throw;
}
}
public async Task<T> GetAsync<T>(string key)
{
try
{
var value = await _cacheDatabase.StringGetAsync(key);
if (value.IsNullOrEmpty)
{
_logger.LogInformation($"Cache miss for key: {key}");
return default;
}
_logger.LogInformation($"Cache hit for key: {key}");
return JsonSerializer.Deserialize<T>(value);
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error getting cache item with key {key}");
throw;
}
}
public async Task SetAsync<T>(string key, T value, TimeSpan? expiry = null)
{
try
{
var json = JsonSerializer.Serialize(value);
await _cacheDatabase.StringSetAsync(key, json, expiry);
_logger.LogInformation($"Cache item set with key: {key}");
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error setting cache item with key {key}");
throw;
}
}
public async Task RemoveAsync(string key)
{
try
{
await _cacheDatabase.KeyDeleteAsync(key);
_logger.LogInformation($"Cache item removed with key: {key}");
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error removing cache item with key {key}");
throw;
}
}
public async Task<bool> ExistsAsync(string key)
{
try
{
var exists = await _cacheDatabase.KeyExistsAsync(key);
_logger.LogInformation($"Cache item exists check for key: {key} - {exists}");
return exists;
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error checking existence of cache item with key {key}");
throw;
}
}
public async Task RefreshAsync(string key, TimeSpan? expiry = null)
{
try
{
var value = await _cacheDatabase.StringGetAsync(key);
if (!value.IsNullOrEmpty)
{
await _cacheDatabase.StringSetAsync(key, value, expiry);
_logger.LogInformation($"Cache item refreshed with key: {key}");
}
else
{
_logger.LogWarning($"Cache item with key: {key} does not exist, cannot refresh");
}
}
catch (Exception ex)
{
_logger.LogError(ex, $"Error refreshing cache item with key {key}");
throw;
}
}
}
}

View File

@@ -0,0 +1,7 @@
namespace Core.Thalos.Infraestructure.Caching.Configs
{
public class CacheSettings
{
public int DefaultCacheDurationInMinutes { get; set; }
}
}

View File

@@ -0,0 +1,11 @@
namespace Core.Thalos.Infraestructure.Caching.Contracts
{
public interface ICacheService
{
Task<T> GetAsync<T>(string key);
Task SetAsync<T>(string key, T value, TimeSpan? expiry = null);
Task RemoveAsync(string key);
Task<bool> ExistsAsync(string key);
Task RefreshAsync(string key, TimeSpan? expiry = null);
}
}

View File

@@ -0,0 +1,33 @@
using Microsoft.Extensions.Configuration;
namespace Core.Thalos.Infraestructure.Contexts.Mongo
{
public class ConnectionStringProvider(IConfiguration configuration) : IConnectionStringProvider
{
public string ConnectionString { get; set; } = string.Empty;
public string Databasename { get; set; } = string.Empty;
public string Audience { get; set; } = string.Empty;
public string GetConnectionString()
{
return configuration?.GetConnectionString("DefaultConnection")?.ToString() ?? string.Empty;
}
public string GetDatabasename()
{
return configuration.GetSection("MongoDb:DatabaseName").Value ?? string.Empty;
}
public string GetAudience()
{
return configuration.GetSection("MongoDb:Audience").Value ?? string.Empty;
}
}
public interface IConnectionStringProvider
{
string GetConnectionString();
string GetDatabasename();
string ConnectionString { get; set; }
string Databasename { get; set; }
string Audience { get; set; }
}
}

View File

@@ -0,0 +1,14 @@
namespace Core.Thalos.Infraestructure.Contexts.Mongo;
public interface IMongoConnSettings
{
string ConnectionString { get; set; }
string Databasename { get; set; }
string Audience { get; set; }
}
public class MongoConnSettings : IMongoConnSettings
{
public string ConnectionString { get; set; }
public string Databasename { get; set; }
public string Audience { get; set; }
}

View File

@@ -0,0 +1,15 @@
namespace Core.Thalos.Infraestructure.PerformanceCacheService
{
[AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
public class CacheAttribute : Attribute
{
public int CacheDurationInMinutes { get; set; }
public bool EnableCaching { get; set; }
public CacheAttribute(int cacheDurationInMinutes, bool enableCaching = true)
{
CacheDurationInMinutes = cacheDurationInMinutes;
EnableCaching = enableCaching;
}
}
}

View File

@@ -12,12 +12,13 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" /> <PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" />
<PackageReference Include="Core.Blueprint.Redis" Version="1.0.2" /> <PackageReference Include="Core.Blueprint.Redis" Version="1.0.0" />
<PackageReference Include="Mapster" Version="7.4.2-pre02" /> <PackageReference Include="Mapster" Version="7.4.2-pre02" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core.Thalos.Domain\Core.Thalos.Domain.csproj" /> <ProjectReference Include="..\Core.Thalos.Domain\Core.Thalos.Domain.csproj" />
<ProjectReference Include="..\Core.Thalos.Infraestructure\Core.Thalos.Infrastructure.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -0,0 +1,16 @@
using MongoDB.Driver;
namespace Core.Thalos.Provider.Providers
{
public class BaseProvider
{
private readonly IMongoDatabase _database;
public BaseProvider(IMongoDatabase database)
{
_database = database ?? throw new ArgumentNullException(nameof(database));
}
protected IMongoDatabase Database => _database;
}
}

View File

@@ -0,0 +1,99 @@
using Azure.Core;
using Azure.Identity;
using Core.Thalos.Adapters.Common.Constants;
using MongoDB.Driver.Authentication.Oidc;
namespace Core.Thalos.Provider.Providers
{
public class HeathOidcCallback : IOidcCallback
{
private readonly string _audience;
private readonly string _environment;
public HeathOidcCallback(string audience)
{
_audience = audience;
_environment = Environment.GetEnvironmentVariable(EnvironmentVariables.Stage) ?? string.Empty;
}
public OidcAccessToken GetOidcAccessToken(OidcCallbackParameters parameters, CancellationToken cancellationToken)
{
try
{
AccessToken token;
TokenRequestContext tokenRequestContext =
new TokenRequestContext(
new[] { _audience }
);
if (_environment == "Local")
{
token =
new ChainedTokenCredential(
new ManagedIdentityCredential(),
new VisualStudioCredential(),
new VisualStudioCodeCredential(),
new SharedTokenCacheCredential()
)
.GetToken(
tokenRequestContext
);
}
else
{
token =
new ManagedIdentityCredential()
.GetToken(
tokenRequestContext
);
}
return new(token.Token, expiresIn: null);
}
catch (Exception ex)
{
throw new Exception($"An error ocurred while trying to get the OIDC token to connect to the database, ERROR: {ex.Message}");
}
}
public async Task<OidcAccessToken> GetOidcAccessTokenAsync(OidcCallbackParameters parameters, CancellationToken cancellationToken)
{
try
{
TokenRequestContext tokenRequestContext =
new TokenRequestContext(
new[] { _audience }
);
AccessToken token;
if (_environment == "Local")
{
token = await new ChainedTokenCredential(
new ManagedIdentityCredential(),
new VisualStudioCredential(),
new VisualStudioCodeCredential(),
new SharedTokenCacheCredential()
)
.GetTokenAsync(
tokenRequestContext, cancellationToken
).ConfigureAwait(false);
}
else
{
token = await new ManagedIdentityCredential()
.GetTokenAsync(
tokenRequestContext, cancellationToken
).ConfigureAwait(false);
}
return new(token.Token, expiresIn: null);
}
catch (Exception ex)
{
throw new Exception($"An error ocurred while trying to get the OIDC token to connect to the database, ERROR: {ex.Message}");
}
}
}
}

View File

@@ -5,13 +5,14 @@
// *********************************************************************** // ***********************************************************************
using Core.Thalos.Adapters; using Core.Thalos.Adapters;
using Core.Blueprint.Mongo; using Core.Blueprint.Mongo;
using Core.Blueprint.Caching.Helpers;
using Mapster; using Mapster;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using MongoDB.Driver; using MongoDB.Driver;
using Core.Thalos.Provider.Contracts; using Core.Thalos.Provider.Contracts;
using Core.Thalos.Domain.Contexts.Onboarding.Request; using Core.Thalos.Domain.Contexts.Onboarding.Request;
using Core.Blueprint.Redis; using Core.Blueprint.Caching.Contracts;
using Core.Blueprint.Redis.Helpers; using Core.Blueprint.Caching.Adapters;
namespace Core.Thalos.Provider.Providers.Onboarding namespace Core.Thalos.Provider.Providers.Onboarding
{ {
@@ -22,10 +23,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
{ {
private readonly CollectionRepository<ModuleAdapter> repository; private readonly CollectionRepository<ModuleAdapter> repository;
private readonly CacheSettings cacheSettings; private readonly CacheSettings cacheSettings;
private readonly IRedisCacheProvider cacheProvider; private readonly ICacheProvider cacheProvider;
public ModuleProvider(CollectionRepository<ModuleAdapter> repository, public ModuleProvider(CollectionRepository<ModuleAdapter> repository,
IRedisCacheProvider cacheProvider, ICacheProvider cacheProvider,
IOptions<CacheSettings> cacheSettings) IOptions<CacheSettings> cacheSettings)
{ {
this.repository = repository; this.repository = repository;

View File

@@ -3,9 +3,10 @@
// AgileWebs // AgileWebs
// </copyright> // </copyright>
// *********************************************************************** // ***********************************************************************
using Core.Blueprint.Caching.Adapters;
using Core.Blueprint.Caching.Contracts;
using Core.Blueprint.Caching.Helpers;
using Core.Blueprint.Mongo; using Core.Blueprint.Mongo;
using Core.Blueprint.Redis;
using Core.Blueprint.Redis.Helpers;
using Core.Thalos.Adapters; using Core.Thalos.Adapters;
using Core.Thalos.Domain.Contexts.Onboarding.Request; using Core.Thalos.Domain.Contexts.Onboarding.Request;
using Core.Thalos.Provider.Contracts; using Core.Thalos.Provider.Contracts;
@@ -22,10 +23,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
{ {
private readonly CollectionRepository<PermissionAdapter> repository; private readonly CollectionRepository<PermissionAdapter> repository;
private readonly CacheSettings cacheSettings; private readonly CacheSettings cacheSettings;
private readonly IRedisCacheProvider cacheProvider; private readonly ICacheProvider cacheProvider;
public PermissionProvider(CollectionRepository<PermissionAdapter> repository, public PermissionProvider(CollectionRepository<PermissionAdapter> repository,
IRedisCacheProvider cacheProvider, ICacheProvider cacheProvider,
IOptions<CacheSettings> cacheSettings IOptions<CacheSettings> cacheSettings
) )
{ {

View File

@@ -3,9 +3,10 @@
// AgileWebs // AgileWebs
// </copyright> // </copyright>
// *********************************************************************** // ***********************************************************************
using Core.Blueprint.Caching.Adapters;
using Core.Blueprint.Caching.Contracts;
using Core.Blueprint.Caching.Helpers;
using Core.Blueprint.Mongo; using Core.Blueprint.Mongo;
using Core.Blueprint.Redis;
using Core.Blueprint.Redis.Helpers;
using Core.Thalos.Adapters; using Core.Thalos.Adapters;
using Core.Thalos.Adapters.Common.Enums; using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.Domain.Contexts.Onboarding.Request; using Core.Thalos.Domain.Contexts.Onboarding.Request;
@@ -28,10 +29,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
{ {
private readonly CollectionRepository<RoleAdapter> repository; private readonly CollectionRepository<RoleAdapter> repository;
private readonly CacheSettings cacheSettings; private readonly CacheSettings cacheSettings;
private readonly IRedisCacheProvider cacheProvider; private readonly ICacheProvider cacheProvider;
public RoleProvider(CollectionRepository<RoleAdapter> repository, public RoleProvider(CollectionRepository<RoleAdapter> repository,
IRedisCacheProvider cacheProvider, ICacheProvider cacheProvider,
IOptions<CacheSettings> cacheSettings IOptions<CacheSettings> cacheSettings
) )
{ {

View File

@@ -4,9 +4,10 @@
// </copyright> // </copyright>
// *********************************************************************** // ***********************************************************************
using Core.Blueprint.Caching.Adapters;
using Core.Blueprint.Caching.Contracts;
using Core.Blueprint.Caching.Helpers;
using Core.Blueprint.Mongo; using Core.Blueprint.Mongo;
using Core.Blueprint.Redis;
using Core.Blueprint.Redis.Helpers;
using Core.Thalos.Adapters; using Core.Thalos.Adapters;
using Core.Thalos.Adapters.Common.Enums; using Core.Thalos.Adapters.Common.Enums;
using Core.Thalos.Provider.Contracts; using Core.Thalos.Provider.Contracts;
@@ -26,11 +27,11 @@ namespace Core.Thalos.Provider.Providers.Onboarding
public class UserProvider : IUserProvider public class UserProvider : IUserProvider
{ {
private readonly CollectionRepository<UserAdapter> repository; private readonly CollectionRepository<UserAdapter> repository;
private readonly CacheSettings cacheSettings; private readonly CacheSettings cacheSettings;
private readonly IRedisCacheProvider cacheProvider; private readonly ICacheProvider cacheProvider;
public UserProvider(CollectionRepository<UserAdapter> repository, public UserProvider(CollectionRepository<UserAdapter> repository,
IRedisCacheProvider cacheProvider, ICacheProvider cacheProvider,
IOptions<CacheSettings> cacheSettings IOptions<CacheSettings> cacheSettings
) )
{ {

View File

@@ -1,9 +1,16 @@
using Core.Blueprint.Mongo; using Core.Blueprint.Mongo;
using Core.Thalos.Adapters; using Core.Thalos.Adapters;
using Core.Thalos.Infraestructure.Caching.Contracts;
using Core.Thalos.Infraestructure.Contexts.Mongo;
using Core.Thalos.Provider.Contracts; using Core.Thalos.Provider.Contracts;
using Core.Thalos.Provider.Providers;
using Core.Thalos.Provider.Providers.Onboarding; using Core.Thalos.Provider.Providers.Onboarding;
using LSA.Core.Dapper.Service.Caching;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using MongoDB.Driver;
namespace Core.Thalos.Provider namespace Core.Thalos.Provider
{ {
@@ -26,5 +33,33 @@ namespace Core.Thalos.Provider
return services; return services;
} }
private static IServiceCollection AddLogs(this IServiceCollection services)
{
services.AddLogging();
var serviceProvider = services.BuildServiceProvider();
//var logger = serviceProvider.GetService<ILogger<DashboardDALService>>(); //Add for Markup class later TODO
//services.AddSingleton(typeof(ILogger), logger);
return services;
}
private static IServiceCollection AddRedisCacheService(this IServiceCollection services, IConfiguration configuration)
{
var source = configuration.GetSection("ConnectionStrings");
var redisConnectionString = source["Redis"]?.ToString();
if (string.IsNullOrEmpty(redisConnectionString))
{
throw new InvalidOperationException("Redis connection string is not configured.");
}
services.AddSingleton<ICacheService>(provider =>
new CacheService(redisConnectionString, provider.GetRequiredService<ILogger<CacheService>>()));
return services;
}
} }
} }