Compare commits
	
		
			8 Commits
		
	
	
		
			feature/bl
			...
			feature/ad
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 99964d14b8 | ||
| 1ae0b600ae | |||
|   | 6cb0aea1a0 | ||
|   | 8207048c25 | ||
|   | f5b5f7d0f0 | ||
| ffc1afa8c9 | |||
|   | 1c38008e97 | ||
| c18c85959c | 
| @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Mvc; | |||||||
| using Microsoft.Graph; | using Microsoft.Graph; | ||||||
| using ModuleRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.ModuleRequest; | using ModuleRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.ModuleRequest; | ||||||
|  |  | ||||||
| namespace LSA.Core.Kerberos.API.Controllers | namespace LSA.Core.Thalos.API.Controllers | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Handles all requests for module authentication. |     /// Handles all requests for module authentication. | ||||||
| @@ -25,6 +25,7 @@ namespace LSA.Core.Kerberos.API.Controllers | |||||||
|     [Produces(MimeTypes.ApplicationJson)] |     [Produces(MimeTypes.ApplicationJson)] | ||||||
|     [Consumes(MimeTypes.ApplicationJson)] |     [Consumes(MimeTypes.ApplicationJson)] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|  |     [AllowAnonymous] | ||||||
|     public class ModuleController(IModuleProvider service) : ControllerBase |     public class ModuleController(IModuleProvider service) : ControllerBase | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -38,8 +39,8 @@ namespace LSA.Core.Kerberos.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)] |         //[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); | ||||||
| @@ -59,8 +60,8 @@ namespace LSA.Core.Kerberos.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)] |         //[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()) | ||||||
| @@ -86,11 +87,11 @@ namespace LSA.Core.Kerberos.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)] |         //[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); | ||||||
|  |  | ||||||
|             if (result == null) |             if (result == null) | ||||||
|             { |             { | ||||||
| @@ -110,8 +111,8 @@ namespace LSA.Core.Kerberos.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)] |         //[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); | ||||||
| @@ -133,13 +134,13 @@ namespace LSA.Core.Kerberos.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)] |         //[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()) | ||||||
|             { |             { | ||||||
|                 return BadRequest("User ID mismatch"); |                 return BadRequest("Module ID mismatch"); | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             var result = await service.UpdateModule(entity, cancellationToken).ConfigureAwait(false); |             var result = await service.UpdateModule(entity, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -162,8 +163,8 @@ namespace LSA.Core.Kerberos.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)] |         //[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); | ||||||
|   | |||||||
| @@ -5,16 +5,17 @@ | |||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
|  |  | ||||||
| using Asp.Versioning; | using Asp.Versioning; | ||||||
|  | using Core.Blueprint.Mongo; | ||||||
| using Core.Thalos.Adapters; | using Core.Thalos.Adapters; | ||||||
| using Core.Thalos.Adapters.Attributes; | using Core.Thalos.Adapters.Attributes; | ||||||
| using Core.Thalos.Adapters.Common.Constants; | using Core.Thalos.Adapters.Common.Constants; | ||||||
| using Core.Thalos.Adapters.Common.Enums; |  | ||||||
| using Core.Thalos.Domain.Contexts.Onboarding.Request; |  | ||||||
| using Core.Thalos.Provider.Contracts; | using Core.Thalos.Provider.Contracts; | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  | using Microsoft.Graph; | ||||||
|  | using PermissionRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.PermissionRequest; | ||||||
|  |  | ||||||
| namespace LSA.Core.Kerberos.API.Controllers | namespace LSA.Core.Thalos.API.Controllers | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Handles all requests for permission authentication. |     /// Handles all requests for permission authentication. | ||||||
| @@ -24,7 +25,7 @@ namespace LSA.Core.Kerberos.API.Controllers | |||||||
|     [Produces(MimeTypes.ApplicationJson)] |     [Produces(MimeTypes.ApplicationJson)] | ||||||
|     [Consumes(MimeTypes.ApplicationJson)] |     [Consumes(MimeTypes.ApplicationJson)] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     public class PermissionController(IPermissionService service, ILogger<PermissionController> logger) : ControllerBase |     public class PermissionController(IPermissionProvider service) : ControllerBase | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets all the permissions. |         /// Gets all the permissions. | ||||||
| @@ -37,22 +38,13 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("PermissionManagement.Read, RoleManagement.Read")] |         //[Permission("PermissionManagement.Read, RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllPermissionsAsync() |         public async Task<IActionResult> GetAllPermissionsAsync(CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.GetAllPermissions(cancellationToken).ConfigureAwait(false); | ||||||
|             { |  | ||||||
|                 var result = await service.GetAllPermissionsService(); |  | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in GetAllPermissionsAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets all the permissions by permission identifiers. |         /// Gets all the permissions by permission identifiers. | ||||||
| @@ -67,32 +59,18 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("PermissionManagement.Read")] |         //[Permission("PermissionManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllPermissionsByList([FromBody] string[] permissions) |         public async Task<IActionResult> GetAllPermissionsByList([FromBody] string[] permissions, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (permissions == null || !permissions.Any()) |             if (permissions == null || !permissions.Any()) | ||||||
|             { |             { | ||||||
|                 return BadRequest("Permission identifiers are required."); |                 return BadRequest("Permissions identifiers are required."); | ||||||
|             } |  | ||||||
|  |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var result = await service.GetAllPermissionsByListService(permissions); |  | ||||||
|  |  | ||||||
|                 if (result == null || !result.Any()) |  | ||||||
|                 { |  | ||||||
|                     return NotFound("No permissions found for the given identifiers."); |  | ||||||
|             } |             } | ||||||
|  |  | ||||||
|  |             var result = await service.GetAllPermissionsByList(permissions, cancellationToken).ConfigureAwait(false); | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in GetAllPermissionsByList"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets the permission by identifier. |         /// Gets the permission by identifier. | ||||||
| @@ -107,24 +85,19 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("PermissionManagement.Read")] |         //[Permission("PermissionManagement.Read")] | ||||||
|         public async Task<IActionResult> GetPermissionByIdAsync([FromRoute] string id) |         public async Task<IActionResult> GetPermissionByIdAsync([FromRoute] string id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.GetPermissionById(id, cancellationToken).ConfigureAwait(false); | ||||||
|             { |  | ||||||
|                 var result = await service.GetPermissionByIdService(id); |  | ||||||
|  |  | ||||||
|                 if (result is null) return NotFound($"permission with id: '{id}' not found"); |             if (result == null) | ||||||
|  |             { | ||||||
|  |                 return NotFound("Entity not found"); | ||||||
|  |             } | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in GetPermissionByIdAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Creates a new permission. |         /// Creates a new permission. | ||||||
| @@ -136,20 +109,12 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("PermissionManagement.Write")] |         //[Permission("PermissionManagement.Write")] | ||||||
|         public async Task<IActionResult> CreatePermissionAsync([FromBody] PermissionRequest newPermission) |         public async Task<IActionResult> CreatePermissionAsync([FromBody] PermissionRequest newPermission, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.CreatePermission(newPermission, cancellationToken).ConfigureAwait(false); | ||||||
|             { |             return Created("CreatedWithIdAsync", result); | ||||||
|                 var result = await service.CreatePermissionService(newPermission).ConfigureAwait(false); |  | ||||||
|                 return Created("CreatedWithIdService", result); |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in CreatePermissionAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -167,22 +132,19 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("PermissionManagement.Write")] |         //[Permission("PermissionManagement.Write")] | ||||||
|         public async Task<IActionResult> UpdatePermissionAsync(PermissionAdapter entity, string id) |         public async Task<IActionResult> UpdatePermissionAsync([FromRoute] string id, PermissionAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             if (id != entity.Id?.ToString()) | ||||||
|             { |             { | ||||||
|                 var result = await service.UpdatePermissionService(entity, id); |                 return BadRequest("Permission ID mismatch"); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var result = await service.UpdatePermission(entity, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in UpdatePermissionAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Changes the status of the permission. |         /// Changes the status of the permission. | ||||||
| @@ -199,21 +161,12 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("PermissionManagement.Write")] |         //[Permission("PermissionManagement.Write")] | ||||||
|         public async Task<IActionResult> ChangePermissionStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus) |         public async Task<IActionResult> ChangePermissionStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.ChangePermissionStatus(id, newStatus, cancellationToken).ConfigureAwait(false); | ||||||
|             { |  | ||||||
|                 var result = await service.ChangePermissionStatusService(id, newStatus); |  | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in ChangePermissionStatus"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -12,8 +12,9 @@ using Core.Thalos.Domain.Contexts.Onboarding.Request; | |||||||
| using Core.Thalos.Provider.Contracts; | using Core.Thalos.Provider.Contracts; | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  | using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | ||||||
|  |  | ||||||
| namespace LSA.Core.Kerberos.API.Controllers | namespace LSA.Core.Thalos.API.Controllers | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Handles all requests for role authentication. |     /// Handles all requests for role authentication. | ||||||
| @@ -23,7 +24,7 @@ namespace LSA.Core.Kerberos.API.Controllers | |||||||
|     [Produces(MimeTypes.ApplicationJson)] |     [Produces(MimeTypes.ApplicationJson)] | ||||||
|     [Consumes(MimeTypes.ApplicationJson)] |     [Consumes(MimeTypes.ApplicationJson)] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     public class RoleController(IRoleService service, ILogger<RoleController> logger) : ControllerBase |     public class RoleController(IRoleProvider service) : ControllerBase | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets all the roles. |         /// Gets all the roles. | ||||||
| @@ -34,22 +35,13 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("RoleManagement.Read")] |         //[Permission("RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllRolesAsync() |         public async Task<IActionResult> GetAllRolesAsync(CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.GetAllRoles(cancellationToken).ConfigureAwait(false); | ||||||
|             { |  | ||||||
|                 var result = await service.GetAllRolesService(); |  | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in GetAllRolesAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets the role by identifier. |         /// Gets the role by identifier. | ||||||
| @@ -62,24 +54,19 @@ namespace LSA.Core.Kerberos.API.Controllers | |||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("RoleManagement.Read")] |         //[Permission("RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetRoleByIdAsync([FromRoute] string id) |         public async Task<IActionResult> GetRoleByIdAsync([FromRoute] string id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.GetRoleById(id, cancellationToken).ConfigureAwait(false); | ||||||
|             { |  | ||||||
|                 var result = await service.GetRoleByIdService(id); |  | ||||||
|  |  | ||||||
|                 if (result is null) return NotFound($"role with id: '{id}' not found"); |             if (result == null) | ||||||
|  |             { | ||||||
|  |                 return NotFound("Entity not found"); | ||||||
|  |             } | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in GetRoleByIdAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Creates a new role. |         /// Creates a new role. | ||||||
| @@ -91,21 +78,12 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> CreateRoleAsync([FromBody] RoleRequest newRole) |         public async Task<IActionResult> CreateRoleAsync([FromBody] RoleRequest newRole, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.CreateRole(newRole, cancellationToken).ConfigureAwait(false); | ||||||
|             { |             return Created("CreatedWithIdAsync", result); | ||||||
|                 var result = await service.CreateRoleService(newRole).ConfigureAwait(false); |  | ||||||
|  |  | ||||||
|                 return Created("CreatedWithIdService", result); |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in CreateRoleAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -121,22 +99,19 @@ namespace LSA.Core.Kerberos.API.Controllers | |||||||
|         [HttpPut] |         [HttpPut] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> UpdateRoleAsync([FromBody] RoleAdapter entity, [FromRoute] string id) |         public async Task<IActionResult> UpdateRoleAsync([FromRoute] string id, [FromBody] RoleAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             if (id != entity.Id?.ToString()) | ||||||
|             { |             { | ||||||
|                 var result = await service.UpdateRoleService(entity, id); |                 return BadRequest("Role ID mismatch"); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var result = await service.UpdateRole(entity, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in UpdateRoleAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Changes the status of the role. |         /// Changes the status of the role. | ||||||
| @@ -151,23 +126,13 @@ namespace LSA.Core.Kerberos.API.Controllers | |||||||
|         [HttpPatch] |         [HttpPatch] | ||||||
|         [Route(Routes.ChangeStatus)] |         [Route(Routes.ChangeStatus)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> ChangeRoleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus) |         public async Task<IActionResult> ChangeRoleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             try |             var result = await service.ChangeRoleStatus(id, newStatus, cancellationToken).ConfigureAwait(false); | ||||||
|             { |  | ||||||
|                 var result = await service.ChangeRoleStatusService(id, newStatus); |  | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in ChangeRoleStatus"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|  |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Adds an application to the role's list of applications. |         /// Adds an application to the role's list of applications. | ||||||
| @@ -181,22 +146,12 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> AddApplicationToRoleAsync([FromRoute] string roleId, |         public async Task<IActionResult> AddApplicationToRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) | ||||||
|                                                                    [FromRoute] ApplicationsEnum application) |  | ||||||
|         { |         { | ||||||
|             try |             var result = await service.AddApplicationToRole(roleId, application, cancellationToken).ConfigureAwait(false); | ||||||
|             { |             return Ok(result); | ||||||
|                 var updatedRole = await service.AddApplicationToRoleService(roleId, application); |  | ||||||
|  |  | ||||||
|                 return Ok(updatedRole); |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in AddApplicationToRoleAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -211,21 +166,12 @@ namespace LSA.Core.Kerberos.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)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> RemoveApplicationFromRoleAsync([FromRoute] string roleId, |         public async Task<IActionResult> RemoveApplicationFromRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) | ||||||
|                                                                         [FromRoute] ApplicationsEnum application) |  | ||||||
|         { |         { | ||||||
|             try |             var result = await service.RemoveApplicationFromRole(roleId, application, cancellationToken).ConfigureAwait(false); | ||||||
|             { |             return Ok(result); | ||||||
|                 var updatedRole = await service.RemoveApplicationFromRoleService(roleId, application); |  | ||||||
|                 return Ok(updatedRole); |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, "Error in RemoveApplicationFromRoleAsync"); |  | ||||||
|                 return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}"); |  | ||||||
|             } |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Mvc; | |||||||
| using Microsoft.Graph; | using Microsoft.Graph; | ||||||
| using UserRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.UserRequest; | using UserRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.UserRequest; | ||||||
|  |  | ||||||
| namespace LSA.Core.Kerberos.API.Controllers | namespace LSA.Core.Thalos.API.Controllers | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Handles all requests for user authentication. |     /// Handles all requests for user authentication. | ||||||
| @@ -35,8 +35,8 @@ namespace LSA.Core.Kerberos.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,11 +54,11 @@ namespace LSA.Core.Kerberos.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); | ||||||
|  |  | ||||||
|             if (result == null) |             if (result == null) | ||||||
|             { |             { | ||||||
| @@ -79,7 +79,7 @@ namespace LSA.Core.Kerberos.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.AzureScheme}")] | ||||||
|         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.Kerberos.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,11 +148,11 @@ namespace LSA.Core.Kerberos.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()) | ||||||
|             { |             { | ||||||
|                 return BadRequest("User ID mismatch"); |                 return BadRequest("User ID mismatch"); | ||||||
|             } |             } | ||||||
| @@ -173,7 +173,7 @@ namespace LSA.Core.Kerberos.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.AzureScheme}")] | ||||||
|         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.Kerberos.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.AzureScheme}")] | ||||||
|         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.Kerberos.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.Kerberos.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.Kerberos.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.Kerberos.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,11 +296,11 @@ namespace LSA.Core.Kerberos.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.RemoveCompanyFromUser(userId, projectId, cancellationToken).ConfigureAwait(false); |             var result = await service.RemoveProjectFromUser(userId, projectId, cancellationToken).ConfigureAwait(false); | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -315,7 +315,7 @@ namespace LSA.Core.Kerberos.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.AzureScheme}")] | ||||||
|         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); | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ | |||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="Blueprint.Logging" Version="0.0.1" /> |     <PackageReference Include="Core.Blueprint.Logging" Version="1.0.0" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|   | |||||||
							
								
								
									
										71
									
								
								Core.Thalos.DAL.API/Extensions/SwaggerExtensions.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								Core.Thalos.DAL.API/Extensions/SwaggerExtensions.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,71 @@ | |||||||
|  | using Asp.Versioning.ApiExplorer; | ||||||
|  | using Microsoft.Extensions.Options; | ||||||
|  | using Microsoft.OpenApi.Any; | ||||||
|  | using Swashbuckle.AspNetCore.SwaggerGen; | ||||||
|  | using Swashbuckle.AspNetCore.SwaggerUI; | ||||||
|  |  | ||||||
|  | namespace Core.Thalos.DAL.API.Extensions | ||||||
|  | { | ||||||
|  |     public static class SwaggerExtensions | ||||||
|  |     { | ||||||
|  |         public static void AddSwagger(this IServiceCollection services) | ||||||
|  |         { | ||||||
|  |             services.AddEndpointsApiExplorer(); | ||||||
|  |             services.AddSwaggerGen(); | ||||||
|  |             services.AddTransient<IConfigureOptions<SwaggerGenOptions>, ConfigureSwaggerOptions>(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static void ConfigureSwagger(this WebApplication app) | ||||||
|  |         { | ||||||
|  |             app.UseSwagger(); | ||||||
|  |             app.UseSwaggerUI(options => | ||||||
|  |             { | ||||||
|  |                 foreach (var version in app.DescribeApiVersions().Select(version => version.GroupName)) | ||||||
|  |                     options.SwaggerEndpoint($"/swagger/{version}/swagger.json", version); | ||||||
|  |  | ||||||
|  |                 options.DisplayRequestDuration(); | ||||||
|  |                 options.EnableTryItOutByDefault(); | ||||||
|  |                 options.DocExpansion(DocExpansion.None); | ||||||
|  |             }); | ||||||
|  |         } | ||||||
|  |         public static IServiceCollection AddVersioning(this IServiceCollection services) | ||||||
|  |         { | ||||||
|  |             services.AddApiVersioning(options => options.ReportApiVersions = true) | ||||||
|  |                    .AddApiExplorer(options => | ||||||
|  |                    { | ||||||
|  |                        options.GroupNameFormat = "'v'VVV"; | ||||||
|  |                        options.SubstituteApiVersionInUrl = true; | ||||||
|  |                    }); | ||||||
|  |  | ||||||
|  |             return services; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     public class ConfigureSwaggerOptions : IConfigureOptions<SwaggerGenOptions> | ||||||
|  |     { | ||||||
|  |         private readonly IApiVersionDescriptionProvider _provider; | ||||||
|  |  | ||||||
|  |         public ConfigureSwaggerOptions(IApiVersionDescriptionProvider provider) | ||||||
|  |         { | ||||||
|  |             _provider = provider; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void Configure(SwaggerGenOptions options) | ||||||
|  |         { | ||||||
|  |             foreach (var description in _provider.ApiVersionDescriptions) | ||||||
|  |                 options.SwaggerDoc(description.GroupName, new() | ||||||
|  |                 { | ||||||
|  |                     Title = AppDomain.CurrentDomain.FriendlyName, | ||||||
|  |                     Version = description.ApiVersion.ToString() | ||||||
|  |                 }); | ||||||
|  |  | ||||||
|  |             //Map ALL Values Format TODO | ||||||
|  |             options.MapType<DateOnly>(() => new() | ||||||
|  |             { | ||||||
|  |                 Format = "date", | ||||||
|  |                 Example = new OpenApiString(DateOnly.MinValue.ToString()) | ||||||
|  |             }); | ||||||
|  |  | ||||||
|  |             options.CustomSchemaIds(type => type.ToString().Replace("+", ".")); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,90 +1,82 @@ | |||||||
|  | using Core.Blueprint.Caching.Configuration; | ||||||
|  | using Core.Blueprint.DAL.Mongo.Configuration; | ||||||
| using Core.Blueprint.Logging.Configuration; | using Core.Blueprint.Logging.Configuration; | ||||||
| using Core.Thalos.Adapters.Extensions; | using Core.Thalos.Adapters.Extensions; | ||||||
| using Core.Thalos.Adapters.Helpers; | using Core.Thalos.DAL.API.Extensions; | ||||||
| using Core.Thalos.Provider; | using Core.Thalos.Provider; | ||||||
| using Microsoft.AspNetCore.RateLimiting; | using Microsoft.AspNetCore.HttpLogging; | ||||||
| using Microsoft.AspNetCore.ResponseCompression; |  | ||||||
| using System.IO.Compression; |  | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
| using System.Threading.RateLimiting; | using System.Text.Json.Serialization; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | var builder = WebApplication.CreateBuilder(args); | ||||||
|  |  | ||||||
| var authSettings = AuthHelper.GetAuthSettings(builder, "thalos_dal"); |  | ||||||
|  |  | ||||||
| builder.Services.ConfigureAuthentication(builder.Configuration, authSettings); |  | ||||||
|  |  | ||||||
| builder.Configuration.AddUserSecrets(Assembly.GetExecutingAssembly()).AddEnvironmentVariables(); |  | ||||||
|  |  | ||||||
| // Add services to the container. |  | ||||||
|  |  | ||||||
| builder.Services.AddControllers(); |  | ||||||
| // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle |  | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
|  | builder.Services.AddSwaggerGen(); | ||||||
|  | builder.Configuration | ||||||
|  |     .AddUserSecrets(Assembly.GetExecutingAssembly()) | ||||||
|  |     .AddEnvironmentVariables(); | ||||||
|  |  | ||||||
| builder.Services.AddLogs(builder); | builder.Services.AddResponseCompression(); | ||||||
|  |  | ||||||
| builder.Services.AddCors(options => |  | ||||||
| { |  | ||||||
|     options.AddPolicy("AllowAll", policyBuilder => |  | ||||||
|         policyBuilder.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod()); |  | ||||||
| }); |  | ||||||
| builder.Services.AddMvc().AddJsonOptions(options => |  | ||||||
| { |  | ||||||
|     options.JsonSerializerOptions.WriteIndented = true; |  | ||||||
|     options.JsonSerializerOptions.MaxDepth = 20; |  | ||||||
|     options.JsonSerializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals; |  | ||||||
| }); |  | ||||||
| builder.Services.Configure<BrotliCompressionProviderOptions>(options => |  | ||||||
| { |  | ||||||
|     options.Level = CompressionLevel.Fastest; |  | ||||||
| }); |  | ||||||
| builder.Services.Configure<GzipCompressionProviderOptions>(options => |  | ||||||
| { |  | ||||||
|     options.Level = CompressionLevel.SmallestSize; |  | ||||||
| }); |  | ||||||
| builder.Services.AddResponseCompression(options => |  | ||||||
| { |  | ||||||
|     options.EnableForHttps = true; |  | ||||||
|     options.Providers.Add<BrotliCompressionProvider>(); |  | ||||||
|     options.Providers.Add<GzipCompressionProvider>(); |  | ||||||
| }); |  | ||||||
|  |  | ||||||
| builder.Services.AddRateLimiter(_ => _ |  | ||||||
|     .AddFixedWindowLimiter("fixed", options => |  | ||||||
|     { |  | ||||||
|         options.PermitLimit = 5; |  | ||||||
|         options.Window = TimeSpan.FromSeconds(10); |  | ||||||
|         options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; |  | ||||||
|         options.QueueLimit = 2; |  | ||||||
|     }) |  | ||||||
|     .AddSlidingWindowLimiter("sliding", options => |  | ||||||
|     { |  | ||||||
|         options.PermitLimit = 5; |  | ||||||
|         options.Window = TimeSpan.FromSeconds(10); |  | ||||||
|         options.SegmentsPerWindow = 5; |  | ||||||
|         options.QueueProcessingOrder = QueueProcessingOrder.OldestFirst; |  | ||||||
|         options.QueueLimit = 2; |  | ||||||
|     })); |  | ||||||
|  |  | ||||||
| builder.Services.AddResponseCaching(); |  | ||||||
| builder.Services.AddControllers(); |  | ||||||
| builder.Services.AddEndpointsApiExplorer(); |  | ||||||
| builder.Services.AddSwagger(builder.Configuration, "Core.Thalos.DAL.API.xml", authSettings); |  | ||||||
| builder.Services.AddVersioning(builder.Configuration); |  | ||||||
| builder.Services.AddLogging(); |  | ||||||
| builder.Services.AddProblemDetails(); | builder.Services.AddProblemDetails(); | ||||||
|  | builder.Services.AddMemoryCache(); | ||||||
|  | builder.Services.AddLogs(builder); | ||||||
|  | builder.Services.AddRedis(builder.Configuration); | ||||||
|  | builder.Services.AddMongoLayer(builder.Configuration); | ||||||
|  | builder.Services.AddDALLayerServices(builder.Configuration); | ||||||
|  |  | ||||||
|  | builder.Host.ConfigureServices((context, services) => | ||||||
|  | { | ||||||
|  |  | ||||||
| builder.Services.AddDALLayer(builder.Configuration); |     services.AddLogging(); | ||||||
|  |     services.AddControllers(); | ||||||
|  |     services.AddProblemDetails(); | ||||||
|  |     services.AddCors(options | ||||||
|  |         => options.AddDefaultPolicy(policyBuilder | ||||||
|  |             => policyBuilder | ||||||
|  |                 .AllowAnyOrigin() | ||||||
|  |                 .AllowAnyHeader() | ||||||
|  |                 .AllowAnyMethod())); | ||||||
|  |  | ||||||
|  |     builder.Services.Configure<Microsoft.AspNetCore.Http.Json.JsonOptions>(options => | ||||||
|  |     { | ||||||
|  |         options.SerializerOptions.Converters.Add(new JsonStringEnumConverter()); | ||||||
|  |     }); | ||||||
|  |  | ||||||
|  |     services | ||||||
|  |         .AddEndpointsApiExplorer() | ||||||
|  |         .AddVersioning() | ||||||
|  |         .AddSwagger(); | ||||||
|  |  | ||||||
|  |     services.AddHealthChecks(); | ||||||
|  |     services.AddHttpLogging(options => options.LoggingFields = HttpLoggingFields.All); | ||||||
|  |  | ||||||
|  |     builder.Services.AddOutputCache(options => | ||||||
|  |     { | ||||||
|  |         options.AddBasePolicy(builder => | ||||||
|  |             builder.Expire(TimeSpan.FromSeconds(10))); | ||||||
|  |         options.AddPolicy("Expire20", builder => | ||||||
|  |             builder.Expire(TimeSpan.FromSeconds(20))); | ||||||
|  |         options.AddPolicy("Expire30", builder => | ||||||
|  |             builder.Expire(TimeSpan.FromSeconds(30))); | ||||||
|  |     }); | ||||||
|  | }); | ||||||
|  |  | ||||||
| var app = builder.Build(); | var app = builder.Build(); | ||||||
|  |  | ||||||
| app.UseSwaggerUI(builder.Configuration, authSettings); | app.UseSwagger(); | ||||||
| app.ConfigureSwagger(builder.Configuration); | app.UseSwaggerUI(); | ||||||
| app.UseLogging(builder.Configuration); | app.UseAuthentication(); | ||||||
| app.UseHttpsRedirection(); |  | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | app.UseCors(); | ||||||
|  | app.ConfigureSwagger(); | ||||||
|  | app.UseHttpsRedirection(); | ||||||
|  | app.UseStaticFiles(); | ||||||
|  | app.UseRouting(); | ||||||
|  | app.UseResponseCompression(); | ||||||
|  | app.UseOutputCache(); | ||||||
|  | app.UseResponseCaching(); | ||||||
|  | app.UseLogging(builder.Configuration); | ||||||
|  | app.MapHealthChecks("/health"); | ||||||
|  |  | ||||||
| app.Run(); | app.Run(); | ||||||
| @@ -5,4 +5,18 @@ | |||||||
|       "Microsoft.AspNetCore": "Warning" |       "Microsoft.AspNetCore": "Warning" | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|  |   "AllowedHosts": "*", | ||||||
|  |   "ConnectionStrings": { | ||||||
|  |     "MongoDB": "mongodb://localhost:27017", | ||||||
|  |     "Redis": "localhost:6379" | ||||||
|  |   }, | ||||||
|  |   "MongoDb": { | ||||||
|  |     "DatabaseName": "Thalos", | ||||||
|  |     "LocalAudience": "" | ||||||
|  |   }, | ||||||
|  |   "DetailedErrors": true, | ||||||
|  |   "UseRedisCache": true, | ||||||
|  |   "CacheSettings": { | ||||||
|  |     "DefaultCacheDurationInMinutes": 3 | ||||||
|  |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,7 +6,17 @@ | |||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*", |   "AllowedHosts": "*", | ||||||
|   "Endpoints": { |   "ConnectionStrings": { | ||||||
|     "AppConfigurationURI": "https://sandbox-hci-usc-appcg.azconfig.io" |     "MongoDB": "mongodb://admin_agile:Admin%40agileWebs@portainer.white-enciso.pro:27017/?authMechanism=SCRAM-SHA-256", | ||||||
|  |     "Redis": "localhost:6379" | ||||||
|  |   }, | ||||||
|  |   "MongoDb": { | ||||||
|  |     "DatabaseName": "Thalos", | ||||||
|  |     "LocalAudience": "" | ||||||
|  |   }, | ||||||
|  |   "DetailedErrors": true, | ||||||
|  |   "UseRedisCache": true, | ||||||
|  |   "CacheSettings": { | ||||||
|  |     "DefaultCacheDurationInMinutes": 3 | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ | |||||||
|     "AuthorizationUrl": "", // URL for authorization endpoint (STORED IN KEY VAULT) |     "AuthorizationUrl": "", // URL for authorization endpoint (STORED IN KEY VAULT) | ||||||
|     "TokenUrl": "", // URL for token endpoint (STORED IN KEY VAULT) |     "TokenUrl": "", // URL for token endpoint (STORED IN KEY VAULT) | ||||||
|     "Scope": "", // Scope for application permissions (STORED IN KEY VAULT) |     "Scope": "", // Scope for application permissions (STORED IN KEY VAULT) | ||||||
|     "ClientId": "" // Client ID for Kerberos application (STORED IN KEY VAULT) |     "ClientId": "" // Client ID for Thalos application (STORED IN KEY VAULT) | ||||||
|   }, |   }, | ||||||
|   "MicrosoftGraph": { |   "MicrosoftGraph": { | ||||||
|     "Scopes": "", // Scopes for Microsoft Graph API access |     "Scopes": "", // Scopes for Microsoft Graph API access | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ | |||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="Thalos.Building.Blocks" Version="0.0.2" /> |     <PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.0.2" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
| </Project> | </Project> | ||||||
|   | |||||||
| @@ -3,13 +3,13 @@ | |||||||
| //     AgileWebs | //     AgileWebs | ||||||
| // </copyright> | // </copyright> | ||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
|  | using Core.Blueprint.Mongo; | ||||||
| using Core.Thalos.Adapters; | using Core.Thalos.Adapters; | ||||||
| using Core.Thalos.Adapters.Common.Enums; |  | ||||||
| using Core.Thalos.Domain.Contexts.Onboarding.Request; | using Core.Thalos.Domain.Contexts.Onboarding.Request; | ||||||
| 
 | 
 | ||||||
| namespace Core.Thalos.Provider.Contracts | namespace Core.Thalos.Provider.Contracts | ||||||
| { | { | ||||||
|     public interface IPermissionService |     public interface IPermissionProvider | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Creates a new Permission. |         /// Creates a new Permission. | ||||||
| @@ -17,7 +17,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="entity">The Permission to be created.</param> |         /// <param name="entity">The Permission to be created.</param> | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<PermissionAdapter> CreatePermissionService(PermissionRequest newPermission); |         ValueTask<PermissionAdapter> CreatePermission(PermissionRequest newPermission, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets an Permission by identifier. |         /// Gets an Permission by identifier. | ||||||
| @@ -25,14 +25,14 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="id">The Permission identifier.</param> |         /// <param name="id">The Permission identifier.</param> | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<PermissionAdapter> GetPermissionByIdService(string id); |         ValueTask<PermissionAdapter> GetPermissionById(string _id, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets all the roles. |         /// Gets all the roles. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <returns>A <see cref="{Task{IEnumerbale{PermissionAdapter}}}"/> representing |         /// <returns>A <see cref="{Task{IEnumerbale{PermissionAdapter}}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<IEnumerable<PermissionAdapter>> GetAllPermissionsService(); |         ValueTask<IEnumerable<PermissionAdapter>> GetAllPermissions(CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets all the permissions by permissions identifier list. |         /// Gets all the permissions by permissions identifier list. | ||||||
| @@ -40,7 +40,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="permissions">The list of permissions identifiers.</param> |         /// <param name="permissions">The list of permissions identifiers.</param> | ||||||
|         /// <returns>A <see cref="Task{IEnumerable{PermissionAdapter}}"/> representing |         /// <returns>A <see cref="Task{IEnumerable{PermissionAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<IEnumerable<PermissionAdapter>> GetAllPermissionsByListService(string[] permissions); |         ValueTask<IEnumerable<PermissionAdapter>> GetAllPermissionsByList(string[] permissions, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Changes the status of the permission. |         /// Changes the status of the permission. | ||||||
| @@ -50,7 +50,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns>The <see cref="PermissionAdapter"/> updated entity.</returns> |         /// <returns>The <see cref="PermissionAdapter"/> updated entity.</returns> | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<PermissionAdapter> ChangePermissionStatusService(string id, StatusEnum newStatus); |         ValueTask<PermissionAdapter> ChangePermissionStatus(string id, StatusEnum newStatus, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Updates a Permission by id. |         /// Updates a Permission by id. | ||||||
| @@ -59,6 +59,6 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="id">The Permission identifier.</param> |         /// <param name="id">The Permission identifier.</param> | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<PermissionAdapter> UpdatePermissionService(PermissionAdapter entity, string id); |         ValueTask<PermissionAdapter> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken); | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -9,7 +9,7 @@ using Core.Thalos.Domain.Contexts.Onboarding.Request; | |||||||
| 
 | 
 | ||||||
| namespace Core.Thalos.Provider.Contracts | namespace Core.Thalos.Provider.Contracts | ||||||
| { | { | ||||||
|     public interface IRoleService |     public interface IRoleProvider | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Creates a new Role. |         /// Creates a new Role. | ||||||
| @@ -17,7 +17,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="entity">The Role to be created.</param> |         /// <param name="entity">The Role to be created.</param> | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<RoleAdapter> CreateRoleService(RoleRequest newRole); |         ValueTask<RoleAdapter> CreateRole(RoleRequest newRole, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets an Role by identifier. |         /// Gets an Role by identifier. | ||||||
| @@ -25,14 +25,14 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="id">The Role identifier.</param> |         /// <param name="id">The Role identifier.</param> | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<RoleAdapter> GetRoleByIdService(string id); |         ValueTask<RoleAdapter> GetRoleById(string _id, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Gets all the roles. |         /// Gets all the roles. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <returns>A <see cref="{Task{IEnumerbale{RoleAdapter}}}"/> representing |         /// <returns>A <see cref="{Task{IEnumerbale{RoleAdapter}}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<IEnumerable<RoleAdapter>> GetAllRolesService(); |         ValueTask<IEnumerable<RoleAdapter>> GetAllRoles(CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Changes the status of the role. |         /// Changes the status of the role. | ||||||
| @@ -42,7 +42,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns>The <see cref="RoleAdapter"/> updated entity.</returns> |         /// <returns>The <see cref="RoleAdapter"/> updated entity.</returns> | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<RoleAdapter> ChangeRoleStatusService(string id, StatusEnum newStatus); |         ValueTask<RoleAdapter> ChangeRoleStatus(string id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Updates a Role by id. |         /// Updates a Role by id. | ||||||
| @@ -51,7 +51,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="id">The Role identifier.</param> |         /// <param name="id">The Role identifier.</param> | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         Task<RoleAdapter> UpdateRoleService(RoleAdapter entity, string id); |         ValueTask<RoleAdapter> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Adds an application to the role's list of applications. |         /// Adds an application to the role's list of applications. | ||||||
| @@ -59,7 +59,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="roleId">The identifier of the role to which the application will be added.</param> |         /// <param name="roleId">The identifier of the role to which the application will be added.</param> | ||||||
|         /// <param name="application">The application enum value to add.</param> |         /// <param name="application">The application enum value to add.</param> | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> | ||||||
|         Task<RoleAdapter> AddApplicationToRoleService(string roleId, ApplicationsEnum application); |         ValueTask<RoleAdapter> AddApplicationToRole(string roleId, ApplicationsEnum application, CancellationToken cancellationToken); | ||||||
| 
 | 
 | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Removes an application from the role's list of applications. |         /// Removes an application from the role's list of applications. | ||||||
| @@ -67,6 +67,6 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="roleId">The identifier of the role from which the application will be removed.</param> |         /// <param name="roleId">The identifier of the role from which the application will be removed.</param> | ||||||
|         /// <param name="application">The application enum value to remove.</param> |         /// <param name="application">The application enum value to remove.</param> | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> | ||||||
|         Task<RoleAdapter> RemoveApplicationFromRoleService(string roleId, ApplicationsEnum application); |         ValueTask<RoleAdapter> RemoveApplicationFromRole(string roleId, ApplicationsEnum application, CancellationToken cancellationToken); | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -49,7 +49,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <param name="eamil">The User email.</param> |         /// <param name="eamil">The User email.</param> | ||||||
|         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing |         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         ValueTask<UserAdapter> ValidateUserExistence(string? email, CancellationToken cancellationToken); |         ValueTask<UserExistenceAdapter> ValidateUserExistence(string? email, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Changes the status of the user. |         /// Changes the status of the user. | ||||||
|   | |||||||
| @@ -11,9 +11,8 @@ | |||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="Blueprint.Mongo" Version="0.0.3" /> |     <PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" /> | ||||||
|     <PackageReference Include="Blueprint.Redis" Version="0.0.1" /> |     <PackageReference Include="Core.Blueprint.Redis" Version="1.0.0" /> | ||||||
|     <PackageReference Include="BuildingBlocks.Library" Version="0.0.1" /> |  | ||||||
|     <PackageReference Include="Mapster" Version="7.4.2-pre02" /> |     <PackageReference Include="Mapster" Version="7.4.2-pre02" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,13 +5,14 @@ | |||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
| using Core.Thalos.Adapters; | using Core.Thalos.Adapters; | ||||||
| using Core.Blueprint.Mongo; | using Core.Blueprint.Mongo; | ||||||
| using Core.Blueprint.Redis; | using Core.Blueprint.Caching.Helpers; | ||||||
| using Core.Blueprint.Redis.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.Caching.Contracts; | ||||||
|  | using Core.Blueprint.Caching.Adapters; | ||||||
|  |  | ||||||
| namespace Core.Thalos.Provider.Providers.Onboarding | namespace Core.Thalos.Provider.Providers.Onboarding | ||||||
| { | { | ||||||
| @@ -22,10 +23,11 @@ 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, IOptions<CacheSettings> cacheSettings) |             ICacheProvider cacheProvider, | ||||||
|  |             IOptions<CacheSettings> cacheSettings) | ||||||
|         { |         { | ||||||
|             this.repository = repository; |             this.repository = repository; | ||||||
|             this.repository.CollectionInitialization(); |             this.repository.CollectionInitialization(); | ||||||
| @@ -104,9 +106,9 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|             var builder = Builders<ModuleAdapter>.Filter; |             var builder = Builders<ModuleAdapter>.Filter; | ||||||
|             var filters = new List<FilterDefinition<ModuleAdapter>>(); |             var filters = new List<FilterDefinition<ModuleAdapter>>(); | ||||||
|  |  | ||||||
|             if (modules == null || !modules.Any()) |             if (modules != null || !modules.Any()) | ||||||
|             { |             { | ||||||
|                 filters.Add(builder.In(x => x.Id, modules)); |                 filters.Add(builder.In(x => x._Id, modules)); | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             var finalFilter = filters.Any() ? builder.And(filters) : builder.Empty; |             var finalFilter = filters.Any() ? builder.And(filters) : builder.Empty; | ||||||
|   | |||||||
							
								
								
									
										156
									
								
								Core.Thalos.Provider/Providers/Onboarding/PermissionProvider.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										156
									
								
								Core.Thalos.Provider/Providers/Onboarding/PermissionProvider.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,156 @@ | |||||||
|  | // *********************************************************************** | ||||||
|  | // <copyright file="PermissionService.cs"> | ||||||
|  | //     AgileWebs | ||||||
|  | // </copyright> | ||||||
|  | // *********************************************************************** | ||||||
|  | using Core.Blueprint.Caching.Adapters; | ||||||
|  | using Core.Blueprint.Caching.Contracts; | ||||||
|  | using Core.Blueprint.Caching.Helpers; | ||||||
|  | using Core.Blueprint.Mongo; | ||||||
|  | using Core.Thalos.Adapters; | ||||||
|  | using Core.Thalos.Domain.Contexts.Onboarding.Request; | ||||||
|  | using Core.Thalos.Provider.Contracts; | ||||||
|  | using Mapster; | ||||||
|  | using Microsoft.Extensions.Options; | ||||||
|  | using MongoDB.Driver; | ||||||
|  |  | ||||||
|  | namespace Core.Thalos.Provider.Providers.Onboarding | ||||||
|  | { | ||||||
|  |     /// <summary> | ||||||
|  |     /// Handles all services and business rules related to <see cref="PermissionAdapter"/>. | ||||||
|  |     /// </summary> | ||||||
|  |     public class PermissionProvider : IPermissionProvider | ||||||
|  |     { | ||||||
|  |         private readonly CollectionRepository<PermissionAdapter> repository; | ||||||
|  |         private readonly CacheSettings cacheSettings; | ||||||
|  |         private readonly ICacheProvider cacheProvider; | ||||||
|  |  | ||||||
|  |         public PermissionProvider(CollectionRepository<PermissionAdapter> repository, | ||||||
|  |             ICacheProvider cacheProvider, | ||||||
|  |             IOptions<CacheSettings> cacheSettings | ||||||
|  |             ) | ||||||
|  |         { | ||||||
|  |             this.repository = repository; | ||||||
|  |             this.repository.CollectionInitialization(); | ||||||
|  |             this.cacheSettings = cacheSettings.Value; | ||||||
|  |             this.cacheProvider = cacheProvider; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Creates a new Permission. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="entity">The Permission to be created.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<PermissionAdapter> CreatePermission(PermissionRequest newPermission, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var permissionCollection = newPermission.Adapt<PermissionAdapter>(); | ||||||
|  |  | ||||||
|  |             await repository.InsertOneAsync(permissionCollection); | ||||||
|  |  | ||||||
|  |             return permissionCollection; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Gets an Permission by identifier. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="id">The Permission identifier.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns>0 | ||||||
|  |         public async ValueTask<PermissionAdapter> GetPermissionById(string _id, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetPermissionById", _id); | ||||||
|  |             var cachedData = await cacheProvider.GetAsync<PermissionAdapter>(cacheKey); | ||||||
|  |  | ||||||
|  |             //if (cachedData is not null) { return cachedData; } | ||||||
|  |  | ||||||
|  |             var permission = await repository.FindByIdAsync(_id); | ||||||
|  |  | ||||||
|  |             await cacheProvider.SetAsync(cacheKey, permission); | ||||||
|  |  | ||||||
|  |             return permission; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Gets all the permissions. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <returns>A <see cref="{Task{IEnumerbale{PermissionAdapter}}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<IEnumerable<PermissionAdapter>> GetAllPermissions(CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllPermissions"); | ||||||
|  |             var cachedData = await cacheProvider.GetAsync<IEnumerable<PermissionAdapter>>(cacheKey) ?? []; | ||||||
|  |  | ||||||
|  |             if (cachedData.Any()) return cachedData; | ||||||
|  |  | ||||||
|  |             var permissions = await repository.AsQueryable(); | ||||||
|  |  | ||||||
|  |             await cacheProvider.SetAsync(cacheKey, permissions); | ||||||
|  |  | ||||||
|  |             return permissions; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Gets all the permissions by permissions identifier list. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="permissions">The list of permissions identifiers.</param> | ||||||
|  |         /// <returns>A <see cref="Task{IEnumerable{PermissionAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<IEnumerable<PermissionAdapter>> GetAllPermissionsByList(string[] permissions, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllPermissionsByList", permissions); | ||||||
|  |  | ||||||
|  |             var cachedData = await cacheProvider.GetAsync<IEnumerable<PermissionAdapter>>(cacheKey) ?? []; | ||||||
|  |  | ||||||
|  |             if (cachedData.Any()) return cachedData; | ||||||
|  |  | ||||||
|  |             var builder = Builders<PermissionAdapter>.Filter; | ||||||
|  |             var filters = new List<FilterDefinition<PermissionAdapter>>(); | ||||||
|  |  | ||||||
|  |             if (permissions != null || !permissions.Any()) | ||||||
|  |             { | ||||||
|  |                 filters.Add(builder.In(x => x._Id, permissions)); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var finalFilter = filters.Any() ? builder.And(filters) : builder.Empty; | ||||||
|  |  | ||||||
|  |             var permissionsList = await repository.FilterByMongoFilterAsync(finalFilter); | ||||||
|  |  | ||||||
|  |             await cacheProvider.SetAsync(cacheKey, permissionsList); | ||||||
|  |  | ||||||
|  |             return permissionsList; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Changes the status of the permission. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="id">The permission identifier.</param> | ||||||
|  |         /// <param name="newStatus">The new status of the permission.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<PermissionAdapter> ChangePermissionStatus(string id, StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var entity = await repository.FindByIdAsync(id); | ||||||
|  |             entity.Status = newStatus; | ||||||
|  |  | ||||||
|  |             await repository.ReplaceOneAsync(entity); | ||||||
|  |  | ||||||
|  |             return entity; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Updates a Permission by id. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="entity">The Permission to be updated.</param> | ||||||
|  |         /// <param name="id">The Permission identifier.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<PermissionAdapter> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             await repository.ReplaceOneAsync(entity); | ||||||
|  |  | ||||||
|  |             return entity; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,234 +0,0 @@ | |||||||
| // *********************************************************************** |  | ||||||
| // <copyright file="PermissionService.cs"> |  | ||||||
| //     AgileWebs |  | ||||||
| // </copyright> |  | ||||||
| // *********************************************************************** |  | ||||||
| using Core.Thalos.Adapters; |  | ||||||
| using Core.Thalos.Adapters.Common.Constants; |  | ||||||
| using Core.Thalos.Adapters.Common.Enums; |  | ||||||
| using Core.Thalos.Domain.Contexts.Onboarding.Mappers; |  | ||||||
| using Core.Thalos.Domain.Contexts.Onboarding.Request; |  | ||||||
| using Core.Thalos.Infraestructure.Caching.Configs; |  | ||||||
| using Core.Thalos.Infraestructure.Caching.Contracts; |  | ||||||
| using Core.Thalos.Provider.Contracts; |  | ||||||
| using LSA.Core.Dapper.Service.Caching; |  | ||||||
| using Microsoft.AspNetCore.Http; |  | ||||||
| using Microsoft.Extensions.Logging; |  | ||||||
| using Microsoft.Extensions.Options; |  | ||||||
| using MongoDB.Bson; |  | ||||||
| using MongoDB.Driver; |  | ||||||
|  |  | ||||||
| namespace Core.Thalos.Provider.Providers.Onboarding |  | ||||||
| { |  | ||||||
|     /// <summary> |  | ||||||
|     /// Handles all services and business rules related to <see cref="PermissionAdapter"/>. |  | ||||||
|     /// </summary> |  | ||||||
|     public class PermissionService(ILogger<PermissionService> logger, IHttpContextAccessor httpContextAccessor, ICacheService cacheService, |  | ||||||
|         IOptions<CacheSettings> cacheSettings, IMongoDatabase database) : IPermissionService |  | ||||||
|     { |  | ||||||
|         private readonly CacheSettings _cacheSettings = cacheSettings.Value; |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Creates a new Permission. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="entity">The Permission to be created.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<PermissionAdapter> CreatePermissionService(PermissionRequest newPermission) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var entity = newPermission.ToAdapter(httpContextAccessor); |  | ||||||
|                 await database.GetCollection<PermissionAdapter>(CollectionNames.Permission).InsertOneAsync(entity); |  | ||||||
|                 entity.Id = (entity as dynamic ?? "").Id.ToString(); |  | ||||||
|  |  | ||||||
|                 return entity; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"CreatePermissionService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Gets an Permission by identifier. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="id">The Permission identifier.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns>0 |  | ||||||
|         public async Task<PermissionAdapter> GetPermissionByIdService(string id) |  | ||||||
|         { |  | ||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetPermissionByIdService", id); |  | ||||||
|             var cachedData = await cacheService.GetAsync<PermissionAdapter>(cacheKey); |  | ||||||
|  |  | ||||||
|             if (cachedData is not null) { return cachedData; } |  | ||||||
|  |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<PermissionAdapter>.Filter.And( |  | ||||||
|                     Builders<PermissionAdapter>.Filter.Eq("_id", ObjectId.Parse(id)), |  | ||||||
|                     Builders<PermissionAdapter>.Filter.Eq("status", StatusEnum.Active.ToString()) |  | ||||||
|                 ); |  | ||||||
|  |  | ||||||
|                 var permission = await database.GetCollection<PermissionAdapter>(CollectionNames.Permission) |  | ||||||
|                                     .Find(filter) |  | ||||||
|                                     .FirstOrDefaultAsync(); |  | ||||||
|  |  | ||||||
|                 var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings); |  | ||||||
|  |  | ||||||
|                 await cacheService.SetAsync(cacheKey, permission, cacheDuration); |  | ||||||
|  |  | ||||||
|                 return permission; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"GetPermissionByIdService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Gets all the permissions. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <returns>A <see cref="{Task{IEnumerbale{PermissionAdapter}}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<IEnumerable<PermissionAdapter>> GetAllPermissionsService() |  | ||||||
|         { |  | ||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllPermissionsService"); |  | ||||||
|             var cachedData = await cacheService.GetAsync<IEnumerable<PermissionAdapter>>(cacheKey) ?? []; |  | ||||||
|  |  | ||||||
|             if (cachedData.Any()) return cachedData; |  | ||||||
|  |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<PermissionAdapter>.Filter.Eq("status", StatusEnum.Active.ToString()); |  | ||||||
|  |  | ||||||
|                 var roles = await database.GetCollection<PermissionAdapter>(CollectionNames.Permission) |  | ||||||
|                                     .Find(filter) |  | ||||||
|                                     .ToListAsync(); |  | ||||||
|  |  | ||||||
|                 var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings); |  | ||||||
|  |  | ||||||
|                 await cacheService.SetAsync(cacheKey, roles, cacheDuration); |  | ||||||
|  |  | ||||||
|                 return roles; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"GetAllPermissionsService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Gets all the permissions by permissions identifier list. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="permissions">The list of permissions identifiers.</param> |  | ||||||
|         /// <returns>A <see cref="Task{IEnumerable{PermissionAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<IEnumerable<PermissionAdapter>> GetAllPermissionsByListService(string[] permissions) |  | ||||||
|         { |  | ||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllPermissionsByListService", permissions); |  | ||||||
|  |  | ||||||
|             var cachedData = await cacheService.GetAsync<IEnumerable<PermissionAdapter>>(cacheKey); |  | ||||||
|  |  | ||||||
|             if (cachedData != null && cachedData.Any()) return cachedData; |  | ||||||
|  |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var objectIds = permissions.Select(id => ObjectId.Parse(id)).ToArray(); |  | ||||||
|  |  | ||||||
|                 var filter = Builders<PermissionAdapter>.Filter.In("_id", objectIds) |  | ||||||
|                                 & Builders<PermissionAdapter>.Filter.Eq("status", StatusEnum.Active.ToString()); |  | ||||||
|  |  | ||||||
|                 var roles = await database.GetCollection<PermissionAdapter>(CollectionNames.Permission) |  | ||||||
|                                           .Find(filter) |  | ||||||
|                                           .ToListAsync(); |  | ||||||
|  |  | ||||||
|                 var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings); |  | ||||||
|  |  | ||||||
|                 await cacheService.SetAsync(cacheKey, roles, cacheDuration); |  | ||||||
|  |  | ||||||
|                 return roles; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"GetAllPermissionsByListService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Changes the status of the permission. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="id">The permission identifier.</param> |  | ||||||
|         /// <param name="newStatus">The new status of the permission.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<PermissionAdapter> ChangePermissionStatusService(string id, StatusEnum newStatus) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<PermissionAdapter>.Filter |  | ||||||
|                     .Eq("_id", ObjectId.Parse(id)); |  | ||||||
|  |  | ||||||
|                 var update = Builders<PermissionAdapter>.Update |  | ||||||
|                             //.Set(v => v.Status, newStatus) |  | ||||||
|                             .Set(v => v.UpdatedBy, Helper.GetEmail(httpContextAccessor)) |  | ||||||
|                             .Set(v => v.UpdatedAt, DateTime.UtcNow); |  | ||||||
|  |  | ||||||
|                 await database.GetCollection<PermissionAdapter>(CollectionNames.Permission).UpdateOneAsync(filter, update); |  | ||||||
|  |  | ||||||
|                 var updatedPermission = await database.GetCollection<PermissionAdapter>(CollectionNames.Permission) |  | ||||||
|                                     .Find(filter) |  | ||||||
|                                     .FirstOrDefaultAsync(); |  | ||||||
|  |  | ||||||
|                 return updatedPermission; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"ChangePermissionStatusService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Updates a Permission by id. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="entity">The Permission to be updated.</param> |  | ||||||
|         /// <param name="id">The Permission identifier.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<PermissionAdapter> UpdatePermissionService(PermissionAdapter entity, string id) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<PermissionAdapter>.Filter |  | ||||||
|                     .Eq("_id", ObjectId.Parse(id)); |  | ||||||
|  |  | ||||||
|                 var update = Builders<PermissionAdapter>.Update |  | ||||||
|                             .Set(v => v.Name, entity.Name) |  | ||||||
|                             .Set(v => v.Description, entity.Description) |  | ||||||
|                             .Set(v => v.AccessLevel, entity.AccessLevel) |  | ||||||
|                             .Set(v => v.Status, entity.Status) |  | ||||||
|                             .Set(v => v.UpdatedBy, Helper.GetEmail(httpContextAccessor)) |  | ||||||
|                             .Set(v => v.UpdatedAt, DateTime.UtcNow); |  | ||||||
|  |  | ||||||
|                 await database.GetCollection<PermissionAdapter>(CollectionNames.Permission).UpdateOneAsync(filter, update); |  | ||||||
|  |  | ||||||
|                 var updatedPermission = await database.GetCollection<PermissionAdapter>(CollectionNames.Permission) |  | ||||||
|                                             .Find(filter) |  | ||||||
|                                             .FirstOrDefaultAsync(); |  | ||||||
|  |  | ||||||
|                 return updatedPermission; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"UpdatePermissionService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
							
								
								
									
										173
									
								
								Core.Thalos.Provider/Providers/Onboarding/RoleProvider.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										173
									
								
								Core.Thalos.Provider/Providers/Onboarding/RoleProvider.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,173 @@ | |||||||
|  | // *********************************************************************** | ||||||
|  | // <copyright file="RoleService.cs"> | ||||||
|  | //     AgileWebs | ||||||
|  | // </copyright> | ||||||
|  | // *********************************************************************** | ||||||
|  | using Core.Blueprint.Caching.Adapters; | ||||||
|  | using Core.Blueprint.Caching.Contracts; | ||||||
|  | using Core.Blueprint.Caching.Helpers; | ||||||
|  | using Core.Blueprint.Mongo; | ||||||
|  | using Core.Thalos.Adapters; | ||||||
|  | using Core.Thalos.Adapters.Common.Enums; | ||||||
|  | using Core.Thalos.Domain.Contexts.Onboarding.Request; | ||||||
|  | using Core.Thalos.Provider.Contracts; | ||||||
|  | using Mapster; | ||||||
|  | using Microsoft.Extensions.Options; | ||||||
|  | using Microsoft.Graph; | ||||||
|  | using MongoDB.Bson; | ||||||
|  | using MongoDB.Bson.Serialization; | ||||||
|  | using MongoDB.Driver; | ||||||
|  | using System.ComponentModel.Design; | ||||||
|  | using System.Text.RegularExpressions; | ||||||
|  |  | ||||||
|  | namespace Core.Thalos.Provider.Providers.Onboarding | ||||||
|  | { | ||||||
|  |     /// <summary> | ||||||
|  |     /// Handles all services and business rules related to <see cref="RoleAdapter"/>. | ||||||
|  |     /// </summary> | ||||||
|  |     public class RoleProvider : IRoleProvider | ||||||
|  |     { | ||||||
|  |         private readonly CollectionRepository<RoleAdapter> repository; | ||||||
|  | 		private readonly CacheSettings cacheSettings; | ||||||
|  | 		private readonly ICacheProvider cacheProvider; | ||||||
|  |  | ||||||
|  | 		public RoleProvider(CollectionRepository<RoleAdapter> repository, | ||||||
|  | 		    ICacheProvider cacheProvider, | ||||||
|  | 			IOptions<CacheSettings> cacheSettings | ||||||
|  | 			) | ||||||
|  |         { | ||||||
|  |             this.repository = repository; | ||||||
|  |             this.repository.CollectionInitialization(); | ||||||
|  | 			this.cacheSettings = cacheSettings.Value; | ||||||
|  | 			this.cacheProvider = cacheProvider; | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Creates a new Role. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="entity">The Role to be created.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<RoleAdapter> CreateRole(RoleRequest newRole, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var roleCollection = newRole.Adapt<RoleAdapter>(); | ||||||
|  |  | ||||||
|  |             await repository.InsertOneAsync(roleCollection); | ||||||
|  |  | ||||||
|  |             return roleCollection; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Gets an Role by identifier. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="id">The Role identifier.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<RoleAdapter> GetRoleById(string _id, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetRoleById", _id); | ||||||
|  |             var cachedData = await cacheProvider.GetAsync<RoleAdapter>(cacheKey); | ||||||
|  |  | ||||||
|  |             if (cachedData is not null) { return cachedData; } | ||||||
|  |  | ||||||
|  |             var role = await repository.FindByIdAsync(_id); | ||||||
|  |  | ||||||
|  |             await cacheProvider.SetAsync(cacheKey, role); | ||||||
|  |  | ||||||
|  |             return role; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Gets all the roles. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <returns>A <see cref="{Task{IEnumerbale{RoleAdapter}}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<IEnumerable<RoleAdapter>> GetAllRoles(CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllRoles"); | ||||||
|  |             var cachedData = await cacheProvider.GetAsync<IEnumerable<RoleAdapter>>(cacheKey) ?? []; | ||||||
|  |  | ||||||
|  |             if (cachedData.Any()) return cachedData; | ||||||
|  |  | ||||||
|  |             var roles = await repository.AsQueryable(); | ||||||
|  |  | ||||||
|  |             await cacheProvider.SetAsync(cacheKey, roles); | ||||||
|  |  | ||||||
|  |             return roles; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Changes the status of the role. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="id">The role identifier.</param> | ||||||
|  |         /// <param name="newStatus">The new status of the role.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<RoleAdapter> ChangeRoleStatus(string id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var entity = await repository.FindByIdAsync(id); | ||||||
|  |             entity.Status = newStatus; | ||||||
|  |  | ||||||
|  |             await repository.ReplaceOneAsync(entity); | ||||||
|  |  | ||||||
|  |             return entity; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Updates a Role by id. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="entity">The Role to be updated.</param> | ||||||
|  |         /// <param name="id">The Role identifier.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing | ||||||
|  |         /// the asynchronous execution of the service.</returns> | ||||||
|  |         public async ValueTask<RoleAdapter> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             await repository.ReplaceOneAsync(entity); | ||||||
|  |  | ||||||
|  |             return entity; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Adds an application to the role's list of applications. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="roleId">The identifier of the role to which the application will be added.</param> | ||||||
|  |         /// <param name="application">The application enum value to add.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> | ||||||
|  |         public async ValueTask<RoleAdapter> AddApplicationToRole(string roleId, ApplicationsEnum application, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var role = await repository.FindOneAsync( | ||||||
|  |                 u => u._Id == roleId && | ||||||
|  |                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); | ||||||
|  |  | ||||||
|  |             var updatedApplications = role.Applications.Append(application).Distinct().ToArray(); | ||||||
|  |             role.Applications = updatedApplications; | ||||||
|  |  | ||||||
|  |             await repository.ReplaceOneAsync(role); | ||||||
|  |  | ||||||
|  |             return role; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /// <summary> | ||||||
|  |         /// Removes an application from the role's list of applications. | ||||||
|  |         /// </summary> | ||||||
|  |         /// <param name="roleId">The identifier of the role from which the application will be removed.</param> | ||||||
|  |         /// <param name="application">The application enum value to remove.</param> | ||||||
|  |         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> | ||||||
|  |         public async ValueTask<RoleAdapter> RemoveApplicationFromRole(string roleId, ApplicationsEnum application, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             var role = await repository.FindOneAsync( | ||||||
|  |                 u => u._Id == roleId && | ||||||
|  |                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); | ||||||
|  |  | ||||||
|  |             var updatedApplications = role.Applications | ||||||
|  |                     ?.Where(c => c != application) | ||||||
|  |                     .ToArray(); | ||||||
|  |  | ||||||
|  |             role.Applications = updatedApplications; | ||||||
|  |  | ||||||
|  |             await repository.ReplaceOneAsync(role); | ||||||
|  |  | ||||||
|  |             return role; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,251 +0,0 @@ | |||||||
| // *********************************************************************** |  | ||||||
| // <copyright file="RoleService.cs"> |  | ||||||
| //     AgileWebs |  | ||||||
| // </copyright> |  | ||||||
| // *********************************************************************** |  | ||||||
| using Core.Thalos.Adapters; |  | ||||||
| using Core.Thalos.Adapters.Common.Constants; |  | ||||||
| using Core.Thalos.Adapters.Common.Enums; |  | ||||||
| using Core.Thalos.Domain.Contexts.Onboarding.Mappers; |  | ||||||
| using Core.Thalos.Domain.Contexts.Onboarding.Request; |  | ||||||
| using Core.Thalos.Infraestructure.Caching.Configs; |  | ||||||
| using Core.Thalos.Infraestructure.Caching.Contracts; |  | ||||||
| using Core.Thalos.Provider.Contracts; |  | ||||||
| using LSA.Core.Dapper.Service.Caching; |  | ||||||
| using Microsoft.AspNetCore.Http; |  | ||||||
| using Microsoft.Extensions.Logging; |  | ||||||
| using Microsoft.Extensions.Options; |  | ||||||
| using MongoDB.Bson; |  | ||||||
| using MongoDB.Driver; |  | ||||||
|  |  | ||||||
| namespace Core.Thalos.Provider.Providers.Onboarding |  | ||||||
| { |  | ||||||
|     /// <summary> |  | ||||||
|     /// Handles all services and business rules related to <see cref="RoleAdapter"/>. |  | ||||||
|     /// </summary> |  | ||||||
|     public class RoleService(ILogger<RoleService> logger, IHttpContextAccessor httpContextAccessor, ICacheService cacheService, |  | ||||||
|         IOptions<CacheSettings> cacheSettings, IMongoDatabase database) : IRoleService |  | ||||||
|     { |  | ||||||
|         private readonly CacheSettings _cacheSettings = cacheSettings.Value; |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Creates a new Role. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="entity">The Role to be created.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<RoleAdapter> CreateRoleService(RoleRequest newRole) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var entity = newRole.ToAdapter(httpContextAccessor); |  | ||||||
|                 await database.GetCollection<RoleAdapter>(CollectionNames.Role).InsertOneAsync(entity); |  | ||||||
|                 entity.Id = (entity as dynamic ?? "").Id.ToString(); |  | ||||||
|  |  | ||||||
|                 return entity; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"CreateRoleService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Gets an Role by identifier. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="id">The Role identifier.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<RoleAdapter> GetRoleByIdService(string id) |  | ||||||
|         { |  | ||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetRoleByIdService", id); |  | ||||||
|             var cachedData = await cacheService.GetAsync<RoleAdapter>(cacheKey); |  | ||||||
|  |  | ||||||
|             if (cachedData is not null) { return cachedData; } |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<RoleAdapter>.Filter.And( |  | ||||||
|                         Builders<RoleAdapter>.Filter.Eq("_id", ObjectId.Parse(id)), |  | ||||||
|                         Builders<RoleAdapter>.Filter.Eq("status", StatusEnum.Active.ToString()) |  | ||||||
|                     ); |  | ||||||
|  |  | ||||||
|                 var role = await database.GetCollection<RoleAdapter>(CollectionNames.Role) |  | ||||||
|                 .Find(filter) |  | ||||||
|                             .FirstOrDefaultAsync(); |  | ||||||
|  |  | ||||||
|                 var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings); |  | ||||||
|  |  | ||||||
|                 await cacheService.SetAsync(cacheKey, role, cacheDuration); |  | ||||||
|  |  | ||||||
|                 return role; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"GetRoleByIdService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Gets all the roles. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <returns>A <see cref="{Task{IEnumerbale{RoleAdapter}}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<IEnumerable<RoleAdapter>> GetAllRolesService() |  | ||||||
|         { |  | ||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllRolesService"); |  | ||||||
|             var cachedData = await cacheService.GetAsync<IEnumerable<RoleAdapter>>(cacheKey) ?? []; |  | ||||||
|  |  | ||||||
|             if (cachedData.Any()) return cachedData; |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<RoleAdapter>.Filter.Eq("status", StatusEnum.Active.ToString()); |  | ||||||
|  |  | ||||||
|                 var roles = await database.GetCollection<RoleAdapter>(CollectionNames.Role) |  | ||||||
|                                 .Find(filter) |  | ||||||
|                                 .ToListAsync(); |  | ||||||
|  |  | ||||||
|                 var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings); |  | ||||||
|  |  | ||||||
|                 await cacheService.SetAsync(cacheKey, roles, cacheDuration); |  | ||||||
|  |  | ||||||
|                 return roles; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"GetAllRolesService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Changes the status of the role. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="id">The role identifier.</param> |  | ||||||
|         /// <param name="newStatus">The new status of the role.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<RoleAdapter> ChangeRoleStatusService(string id, StatusEnum newStatus) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<RoleAdapter>.Filter |  | ||||||
|                     .Eq("_id", ObjectId.Parse(id)); |  | ||||||
|  |  | ||||||
|                 var update = Builders<RoleAdapter>.Update |  | ||||||
|                             //.Set(v => v.Status, newStatus) |  | ||||||
|                             .Set(v => v.UpdatedBy, Helper.GetEmail(httpContextAccessor)) |  | ||||||
|                             .Set(v => v.UpdatedAt, DateTime.UtcNow); |  | ||||||
|  |  | ||||||
|                 await database.GetCollection<RoleAdapter>(CollectionNames.Role).UpdateOneAsync(filter, update); |  | ||||||
|  |  | ||||||
|                 var updatedRole = await database.GetCollection<RoleAdapter>(CollectionNames.Role) |  | ||||||
|                                     .Find(filter) |  | ||||||
|                                     .FirstOrDefaultAsync(); |  | ||||||
|  |  | ||||||
|                 return updatedRole; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"ChangeRoleStatusService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Updates a Role by id. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="entity">The Role to be updated.</param> |  | ||||||
|         /// <param name="id">The Role identifier.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing |  | ||||||
|         /// the asynchronous execution of the service.</returns> |  | ||||||
|         public async Task<RoleAdapter> UpdateRoleService(RoleAdapter entity, string id) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<RoleAdapter>.Filter |  | ||||||
|                     .Eq("_id", ObjectId.Parse(id)); |  | ||||||
|  |  | ||||||
|                 var update = Builders<RoleAdapter>.Update |  | ||||||
|                             .Set(v => v.Name, entity.Name) |  | ||||||
|                             .Set(v => v.Description, entity.Description) |  | ||||||
|                             .Set(v => v.Applications, entity.Applications) |  | ||||||
|                             .Set(v => v.Modules, entity.Modules) |  | ||||||
|                             .Set(v => v.Permissions, entity.Permissions) |  | ||||||
|                             .Set(v => v.Status, entity.Status) |  | ||||||
|                             .Set(v => v.UpdatedBy, Helper.GetEmail(httpContextAccessor)) |  | ||||||
|                             .Set(v => v.UpdatedAt, DateTime.UtcNow); |  | ||||||
|  |  | ||||||
|                 await database.GetCollection<RoleAdapter>(CollectionNames.Role).UpdateOneAsync(filter, update); |  | ||||||
|  |  | ||||||
|                 var updatedRole = await database.GetCollection<RoleAdapter>(CollectionNames.Role) |  | ||||||
|                                     .Find(filter) |  | ||||||
|                                     .FirstOrDefaultAsync(); |  | ||||||
|  |  | ||||||
|                 return updatedRole; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"UpdateRoleService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|  |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Adds an application to the role's list of applications. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="roleId">The identifier of the role to which the application will be added.</param> |  | ||||||
|         /// <param name="application">The application enum value to add.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> |  | ||||||
|         public async Task<RoleAdapter> AddApplicationToRoleService(string roleId, ApplicationsEnum application) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<RoleAdapter>.Filter.Eq("_id", ObjectId.Parse(roleId)); |  | ||||||
|                 var update = Builders<RoleAdapter>.Update.AddToSet(r => r.Applications, application); |  | ||||||
|  |  | ||||||
|                 await database.GetCollection<RoleAdapter>(CollectionNames.Role).UpdateOneAsync(filter, update); |  | ||||||
|  |  | ||||||
|                 var updatedRole = await database.GetCollection<RoleAdapter>(CollectionNames.Role) |  | ||||||
|                                     .Find(filter) |  | ||||||
|                                     .FirstOrDefaultAsync(); |  | ||||||
|                 return updatedRole; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"AddApplicationToRoleService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|  |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         /// <summary> |  | ||||||
|         /// Removes an application from the role's list of applications. |  | ||||||
|         /// </summary> |  | ||||||
|         /// <param name="roleId">The identifier of the role from which the application will be removed.</param> |  | ||||||
|         /// <param name="application">The application enum value to remove.</param> |  | ||||||
|         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing the asynchronous operation, with the updated role object.</returns> |  | ||||||
|         public async Task<RoleAdapter> RemoveApplicationFromRoleService(string roleId, ApplicationsEnum application) |  | ||||||
|         { |  | ||||||
|             try |  | ||||||
|             { |  | ||||||
|                 var filter = Builders<RoleAdapter>.Filter.Eq("_id", ObjectId.Parse(roleId)); |  | ||||||
|                 var update = Builders<RoleAdapter>.Update.Pull(r => r.Applications, application); |  | ||||||
|  |  | ||||||
|                 await database.GetCollection<RoleAdapter>(CollectionNames.Role).UpdateOneAsync(filter, update); |  | ||||||
|  |  | ||||||
|                 var updatedRole = await database.GetCollection<RoleAdapter>(CollectionNames.Role) |  | ||||||
|                                     .Find(filter) |  | ||||||
|                                     .FirstOrDefaultAsync(); |  | ||||||
|                 return updatedRole; |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |  | ||||||
|             { |  | ||||||
|                 logger.LogError(ex, $"RemoveApplicationFromRoleService: Error in getting data - {ex.Message}"); |  | ||||||
|                 throw new Exception(ex.Message, ex); |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -4,18 +4,20 @@ | |||||||
| // </copyright> | // </copyright> | ||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
|  |  | ||||||
|  | using Core.Blueprint.Caching.Adapters; | ||||||
|  | using Core.Blueprint.Caching.Contracts; | ||||||
|  | using Core.Blueprint.Caching.Helpers; | ||||||
|  | using Core.Blueprint.Mongo; | ||||||
| using Core.Thalos.Adapters; | using Core.Thalos.Adapters; | ||||||
| using Core.Thalos.Adapters.Common.Enums; | using Core.Thalos.Adapters.Common.Enums; | ||||||
| using Core.Blueprint.Mongo; | using Core.Thalos.Provider.Contracts; | ||||||
| using Core.Blueprint.Redis; |  | ||||||
| using Core.Blueprint.Redis.Helpers; |  | ||||||
| using Mapster; | using Mapster; | ||||||
| using Microsoft.Extensions.Options; | using Microsoft.Extensions.Options; | ||||||
| using MongoDB.Driver; |  | ||||||
| using Core.Thalos.Provider.Contracts; |  | ||||||
| using MongoDB.Bson; | using MongoDB.Bson; | ||||||
| using System.Text.RegularExpressions; |  | ||||||
| using MongoDB.Bson.Serialization; | using MongoDB.Bson.Serialization; | ||||||
|  | using MongoDB.Driver; | ||||||
|  | using System.Reflection; | ||||||
|  | using System.Text.RegularExpressions; | ||||||
|  |  | ||||||
| namespace Core.Thalos.Provider.Providers.Onboarding | namespace Core.Thalos.Provider.Providers.Onboarding | ||||||
| { | { | ||||||
| @@ -26,10 +28,12 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|     { |     { | ||||||
|         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, IOptions<CacheSettings> cacheSettings) |             ICacheProvider cacheProvider, | ||||||
|  | 			IOptions<CacheSettings> cacheSettings | ||||||
|  |             ) | ||||||
|         { |         { | ||||||
|             this.repository = repository; |             this.repository = repository; | ||||||
|             this.repository.CollectionInitialization(); |             this.repository.CollectionInitialization(); | ||||||
| @@ -63,7 +67,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserById", _id); |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserById", _id); | ||||||
|             var cachedData = await cacheProvider.GetAsync<UserAdapter>(cacheKey); |             var cachedData = await cacheProvider.GetAsync<UserAdapter>(cacheKey); | ||||||
|  |  | ||||||
|             if (cachedData is not null) { return cachedData; } |             //if (cachedData is not null) { return cachedData; } | ||||||
|  |  | ||||||
|             var user = await repository.FindByIdAsync(_id); |             var user = await repository.FindByIdAsync(_id); | ||||||
|  |  | ||||||
| @@ -102,7 +106,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserByEmail", email); |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserByEmail", email); | ||||||
|             var cachedData = await cacheProvider.GetAsync<UserAdapter>(cacheKey); |             var cachedData = await cacheProvider.GetAsync<UserAdapter>(cacheKey); | ||||||
|  |  | ||||||
|             if (cachedData is not null) { return cachedData; } |             //if (cachedData is not null) { return cachedData; } | ||||||
|  |  | ||||||
|             var user = await repository.FindOneAsync( |             var user = await repository.FindOneAsync( | ||||||
|                 u => u.Email == email &&  |                 u => u.Email == email &&  | ||||||
| @@ -119,20 +123,24 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <param name="email">The User email.</param> |         /// <param name="email">The User email.</param> | ||||||
|         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing |         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         public async ValueTask<UserAdapter> ValidateUserExistence(string? email, CancellationToken cancellationToken) |         public async ValueTask<UserExistenceAdapter> ValidateUserExistence(string? email, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserByEmail", email); |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserByEmail", email); | ||||||
|             var cachedData = await cacheProvider.GetAsync<UserAdapter>(cacheKey); |             var cachedData = await cacheProvider.GetAsync<UserAdapter>(cacheKey); | ||||||
|  |  | ||||||
|             if (cachedData is not null) { return cachedData; } |             //if (cachedData is not null) { return cachedData; } | ||||||
|  |  | ||||||
|             var user = await repository.FindOneAsync( |             var user = await repository.FindOneAsync( | ||||||
|                 u => u.Email == email && |                 u => u.Email == email && | ||||||
|                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); |                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); | ||||||
|  |  | ||||||
|             await cacheProvider.SetAsync(cacheKey, user); |             UserExistenceAdapter userExistance = new UserExistenceAdapter(); | ||||||
|  |  | ||||||
|             return user; |             userExistance.Existence = (user != null) ? true : false; | ||||||
|  |  | ||||||
|  |             await cacheProvider.SetAsync(cacheKey, userExistance); | ||||||
|  |  | ||||||
|  |             return userExistance; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -213,7 +221,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         public async ValueTask<UserAdapter> AddCompanyToUser(string userId, string companyId, CancellationToken cancellationToken) |         public async ValueTask<UserAdapter> AddCompanyToUser(string userId, string companyId, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var user = await repository.FindOneAsync( |             var user = await repository.FindOneAsync( | ||||||
|                 u => u.Id == userId && |                 u => u._Id == userId && | ||||||
|                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); |                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); | ||||||
|  |  | ||||||
|             var updatedCompanies = user.Companies.Append(companyId).Distinct().ToArray(); |             var updatedCompanies = user.Companies.Append(companyId).Distinct().ToArray(); | ||||||
| @@ -233,7 +241,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         public async ValueTask<UserAdapter> RemoveCompanyFromUser(string userId, string companyId, CancellationToken cancellationToken) |         public async ValueTask<UserAdapter> RemoveCompanyFromUser(string userId, string companyId, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var user = await repository.FindOneAsync( |             var user = await repository.FindOneAsync( | ||||||
|                 u => u.Id == userId && |                 u => u._Id == userId && | ||||||
|                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); |                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); | ||||||
|  |  | ||||||
|             var updatedCompanies = user.Companies |             var updatedCompanies = user.Companies | ||||||
| @@ -256,11 +264,11 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         public async ValueTask<UserAdapter> AddProjectToUser(string userId, string projectId, CancellationToken cancellationToken) |         public async ValueTask<UserAdapter> AddProjectToUser(string userId, string projectId, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var user = await repository.FindOneAsync( |             var user = await repository.FindOneAsync( | ||||||
|                 u => u.Id == userId && |                 u => u._Id == userId && | ||||||
|                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); |                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); | ||||||
|  |  | ||||||
|             var updatedProjects = user.Projects.Append(projectId).Distinct().ToArray(); |             var updatedProjects = user.Projects.Append(projectId).Distinct().ToArray(); | ||||||
|             user.Companies = updatedProjects; |             user.Projects = updatedProjects; | ||||||
|  |  | ||||||
|             await repository.ReplaceOneAsync(user); |             await repository.ReplaceOneAsync(user); | ||||||
|  |  | ||||||
| @@ -276,14 +284,14 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         public async ValueTask<UserAdapter> RemoveProjectFromUser(string userId, string projectId, CancellationToken cancellationToken) |         public async ValueTask<UserAdapter> RemoveProjectFromUser(string userId, string projectId, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var user = await repository.FindOneAsync( |             var user = await repository.FindOneAsync( | ||||||
|                 u => u.Id == userId && |                 u => u._Id == userId && | ||||||
|                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); |                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active); | ||||||
|  |  | ||||||
|             var updatedProjects = user.Projects |             var updatedProjects = user.Projects | ||||||
|                     ?.Where(c => c != projectId) |                     ?.Where(c => c != projectId) | ||||||
|                     .ToArray(); |                     .ToArray(); | ||||||
|  |  | ||||||
|             user.Companies = updatedProjects; |             user.Projects = updatedProjects; | ||||||
|  |  | ||||||
|             await repository.ReplaceOneAsync(user); |             await repository.ReplaceOneAsync(user); | ||||||
|  |  | ||||||
| @@ -399,53 +407,106 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|                     User = new UserAdapter |                     User = new UserAdapter | ||||||
|                     { |                     { | ||||||
|                         Id = result["_id"]?.ToString() ?? "", |                         Id = result["_id"]?.ToString() ?? "", | ||||||
|                         Guid = result["guid"].AsString, |                         Guid = result.Contains("guid") && !result["guid"].IsBsonNull ? result["guid"].AsString : "", | ||||||
|                         Email = result["email"].AsString, |                         Email = result.Contains("email") && !result["email"].IsBsonNull ? result["email"].AsString : "", | ||||||
|                         Name = result["name"].AsString, |                         Name = result.Contains("name") && !result["name"].IsBsonNull ? result["name"].AsString : "", | ||||||
|                         MiddleName = result["middleName"].AsString, |                         MiddleName = result.Contains("middleName") && !result["middleName"].IsBsonNull ? result["middleName"].AsString : "", | ||||||
|                         LastName = result["lastName"].AsString, |                         LastName = result.Contains("lastName") && !result["lastName"].IsBsonNull ? result["lastName"].AsString : "", | ||||||
|                         DisplayName = result["displayName"].AsString, |                         DisplayName = result.Contains("displayName") && !result["displayName"].IsBsonNull ? result["displayName"].AsString : "", | ||||||
|                         RoleId = result["roleId"]?.ToString() ?? "", |                         RoleId = result.Contains("roleId") && !result["roleId"].IsBsonNull ? result["roleId"].ToString() : "", | ||||||
|                         Companies = result["companies"].AsBsonArray |                         Companies = result.Contains("companies") && result["companies"].IsBsonArray | ||||||
|  |                             ? result["companies"].AsBsonArray | ||||||
|  |                                 .Where(c => c != null && !c.IsBsonNull) | ||||||
|                                 .Select(c => c.AsString) |                                 .Select(c => c.AsString) | ||||||
|                             .ToArray(), |                                 .ToArray() | ||||||
|                         Projects = result["projects"].AsBsonArray |                             : Array.Empty<string>(), | ||||||
|                             .Select(c => c.AsString) |                                         Projects = result.Contains("projects") && result["projects"].IsBsonArray | ||||||
|                             .ToArray(), |                             ? result["projects"].AsBsonArray | ||||||
|                         LastLogIn = result["lastLogIn"].ToUniversalTime(), |                                 .Where(p => p != null && !p.IsBsonNull) | ||||||
|                         LastLogOut = result["lastLogOut"].ToUniversalTime(), |                                 .Select(p => p.AsString) | ||||||
|                         CreatedAt = result["createdAt"].ToUniversalTime(), |                                 .ToArray() | ||||||
|                         CreatedBy = result["createdBy"].AsString, |                             : Array.Empty<string>(), | ||||||
|                         UpdatedAt = result["updatedAt"].ToUniversalTime(), |                         LastLogIn = result.Contains("lastLogIn") && !result["lastLogIn"].IsBsonNull ? result["lastLogIn"].ToUniversalTime() : DateTime.MinValue, | ||||||
|                         UpdatedBy = result["updatedBy"].AsString, |                         LastLogOut = result.Contains("lastLogOut") && !result["lastLogOut"].IsBsonNull ? result["lastLogOut"].ToUniversalTime() : DateTime.MinValue, | ||||||
|                         Status = (Core.Blueprint.Mongo.StatusEnum)Enum.Parse(typeof(Core.Blueprint.Mongo.StatusEnum), result["status"].AsString), |                         CreatedAt = result.Contains("createdAt") && !result["createdAt"].IsBsonNull ? result["createdAt"].ToUniversalTime() : DateTime.MinValue, | ||||||
|  |                         CreatedBy = result.Contains("createdBy") && !result["createdBy"].IsBsonNull ? result["createdBy"].AsString : "", | ||||||
|  |                         UpdatedAt = result.Contains("updatedAt") && !result["updatedAt"].IsBsonNull ? result["updatedAt"].ToUniversalTime() : DateTime.MinValue, | ||||||
|  |                         UpdatedBy = result.Contains("updatedBy") && !result["updatedBy"].IsBsonNull ? result["updatedBy"].AsString : "", | ||||||
|  |                         Status = result.Contains("status") && !result["status"].IsBsonNull | ||||||
|  |                             ? (Core.Blueprint.Mongo.StatusEnum)Enum.Parse(typeof(Core.Blueprint.Mongo.StatusEnum), result["status"].AsString) | ||||||
|  |                             : Core.Blueprint.Mongo.StatusEnum.Inactive | ||||||
|                     }, |                     }, | ||||||
|                     Role = new RoleAdapter |                     Role = new RoleAdapter | ||||||
|                     { |                     { | ||||||
|                         Id = result["role"]["_id"]?.ToString() ?? "", |                         Id = result.Contains("role") && result["role"].IsBsonDocument && result["role"].AsBsonDocument.Contains("_id") | ||||||
|                         Name = result["role"]["name"].AsString, |                             ? result["role"]["_id"]?.ToString() ?? "" | ||||||
|                         Description = result["role"]["description"].AsString, |                             : "", | ||||||
|                         Applications = result["role"]["applications"].AsBsonArray |                         Name = result.Contains("role") && result["role"].IsBsonDocument && result["role"].AsBsonDocument.Contains("name") | ||||||
|                             .Select(c => (ApplicationsEnum)c.AsInt32) |                             ? result["role"]["name"]?.AsString ?? "" | ||||||
|                             .ToArray(), |                             : "", | ||||||
|                         Modules = result["role"]["modules"].AsBsonArray |                         Description = result.Contains("role") && result["role"].IsBsonDocument && result["role"].AsBsonDocument.Contains("description") | ||||||
|                             .Select(c => c.ToString() ?? "") |                             ? result["role"]["description"]?.AsString ?? "" | ||||||
|                             .ToArray(), |                             : "", | ||||||
|                         Permissions = result["role"]["permissions"].AsBsonArray |                         Applications = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|                             .Select(c => c.ToString() ?? "") |                        result["role"].AsBsonDocument.Contains("applications") && | ||||||
|                             .ToArray(), |                        result["role"]["applications"].IsBsonArray | ||||||
|                         Status = (Core.Blueprint.Mongo.StatusEnum)Enum.Parse(typeof(Core.Blueprint.Mongo.StatusEnum), result["role"]["status"].AsString), |                             ? result["role"]["applications"].AsBsonArray | ||||||
|                         CreatedAt = result["role"]["createdAt"].ToUniversalTime(), |                                 .Where(app => app != null && app.IsInt32) | ||||||
|                         UpdatedAt = result["role"]["updatedAt"].ToUniversalTime(), |                                 .Select(app => (ApplicationsEnum)app.AsInt32) | ||||||
|                         CreatedBy = result["role"]["createdBy"].AsString, |                                 .ToArray() | ||||||
|                         UpdatedBy = result["role"]["updatedBy"].AsString |                             : Array.Empty<ApplicationsEnum>(), | ||||||
|  |                         Modules = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|  |                             result["role"].AsBsonDocument.Contains("modules") && | ||||||
|  |                             result["role"]["modules"].IsBsonArray | ||||||
|  |                             ? result["role"]["modules"].AsBsonArray | ||||||
|  |                                 .Where(m => m != null) | ||||||
|  |                                 .Select(m => m.ToString() ?? "") | ||||||
|  |                                 .ToArray() | ||||||
|  |                             : Array.Empty<string>(), | ||||||
|  |                         Permissions = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|  |                             result["role"].AsBsonDocument.Contains("permissions") && | ||||||
|  |                             result["role"]["permissions"].IsBsonArray | ||||||
|  |                             ? result["role"]["permissions"].AsBsonArray | ||||||
|  |                                 .Where(p => p != null) | ||||||
|  |                                 .Select(p => p.ToString() ?? "") | ||||||
|  |                                 .ToArray() | ||||||
|  |                             : Array.Empty<string>(), | ||||||
|  |                         Status = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|  |                              result["role"].AsBsonDocument.Contains("status") && | ||||||
|  |                              !result["role"]["status"].IsBsonNull | ||||||
|  |                             ? (Core.Blueprint.Mongo.StatusEnum)Enum.Parse(typeof(Core.Blueprint.Mongo.StatusEnum), result["role"]["status"].AsString) | ||||||
|  |                             : Core.Blueprint.Mongo.StatusEnum.Inactive, | ||||||
|  |                         CreatedAt = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|  |                             result["role"].AsBsonDocument.Contains("createdAt") && | ||||||
|  |                             !result["role"]["createdAt"].IsBsonNull | ||||||
|  |                             ? result["role"]["createdAt"].ToUniversalTime() | ||||||
|  |                             : DateTime.MinValue, | ||||||
|  |                         UpdatedAt = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|  |                             result["role"].AsBsonDocument.Contains("updatedAt") && | ||||||
|  |                             !result["role"]["updatedAt"].IsBsonNull | ||||||
|  |                             ? result["role"]["updatedAt"].ToUniversalTime() | ||||||
|  |                             : DateTime.MinValue, | ||||||
|  |                         CreatedBy = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|  |                             result["role"].AsBsonDocument.Contains("createdBy") && | ||||||
|  |                             !result["role"]["createdBy"].IsBsonNull | ||||||
|  |                             ? result["role"]["createdBy"].AsString | ||||||
|  |                             : "", | ||||||
|  |                         UpdatedBy = result.Contains("role") && result["role"].IsBsonDocument && | ||||||
|  |                             result["role"].AsBsonDocument.Contains("updatedBy") && | ||||||
|  |                             !result["role"]["updatedBy"].IsBsonNull | ||||||
|  |                             ? result["role"]["updatedBy"].AsString | ||||||
|  |                             : "" | ||||||
|                     }, |                     }, | ||||||
|                     Permissions = result["permissions"].AsBsonArray |                     Permissions = result.Contains("permissions") && result["permissions"].IsBsonArray | ||||||
|                         .Select(permission => BsonSerializer.Deserialize<PermissionAdapter>(permission.AsBsonDocument)) |                         ? result["permissions"].AsBsonArray | ||||||
|                         .Where(permission => permission.Status == Core.Blueprint.Mongo.StatusEnum.Active) |                             .Where(p => p != null && p.IsBsonDocument) | ||||||
|  |                             .Select(p => BsonSerializer.Deserialize<PermissionAdapter>(p.AsBsonDocument)) | ||||||
|  |                             .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active) | ||||||
|                             .ToList() |                             .ToList() | ||||||
|  |                         : new List<PermissionAdapter>() | ||||||
|                 }; |                 }; | ||||||
|  |  | ||||||
|  |  | ||||||
|                 return tokenAdapter; |                 return tokenAdapter; | ||||||
|  |  | ||||||
|             } |             } | ||||||
|   | |||||||
| @@ -1,4 +1,6 @@ | |||||||
| using Core.Thalos.Infraestructure.Caching.Contracts; | using Core.Blueprint.Mongo; | ||||||
|  | using Core.Thalos.Adapters; | ||||||
|  | using Core.Thalos.Infraestructure.Caching.Contracts; | ||||||
| using Core.Thalos.Infraestructure.Contexts.Mongo; | 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; | ||||||
| @@ -14,60 +16,21 @@ namespace Core.Thalos.Provider | |||||||
| { | { | ||||||
|     public static class ServiceCollectionExtensions |     public static class ServiceCollectionExtensions | ||||||
|     { |     { | ||||||
|         public static IServiceCollection AddDALLayer(this IServiceCollection services, IConfiguration configuration) |         public static IServiceCollection AddDALLayerServices(this IServiceCollection services, IConfiguration configuration) | ||||||
|         { |         { | ||||||
|             var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? string.Empty; |             //Mongo | ||||||
|  |             services.AddScoped<IModuleProvider, ModuleProvider>(); | ||||||
|  |             services.AddScoped<CollectionRepository<ModuleAdapter>>(); | ||||||
|  |  | ||||||
|             var connectionString = configuration.GetSection("ConnectionStrings:MongoDB").Value ?? string.Empty; |             services.AddScoped<IPermissionProvider, PermissionProvider>(); | ||||||
|             var databaseName = configuration.GetSection("MongoDB:DatabaseName").Value ?? string.Empty; |             services.AddScoped<CollectionRepository<PermissionAdapter>>(); | ||||||
|             var audience = (environment == "Local") |  | ||||||
|                 ? configuration.GetSection("MongoDB:LocalAudience").Value |  | ||||||
|                 : configuration.GetSection("MongoDB:Audience").Value; |  | ||||||
|  |  | ||||||
|             if (string.IsNullOrEmpty(connectionString) || string.IsNullOrEmpty(databaseName) || string.IsNullOrEmpty(audience)) |             services.AddScoped<IRoleProvider, RoleProvider>(); | ||||||
|             { |             services.AddScoped<CollectionRepository<RoleAdapter>>(); | ||||||
|                 throw new InvalidOperationException("Mongo connection is not configured correctly."); |  | ||||||
|             } |  | ||||||
|  |  | ||||||
|             services.Configure<MongoConnSettings>(options => |  | ||||||
|             { |  | ||||||
|                 options.ConnectionString = connectionString; |  | ||||||
|                 options.Databasename = databaseName; |  | ||||||
|                 options.Audience = audience ?? string.Empty; |  | ||||||
|             }); |  | ||||||
|  |  | ||||||
|             services.AddSingleton<IMongoClient>(serviceProvider => |  | ||||||
|             { |  | ||||||
|                 var settings = serviceProvider.GetRequiredService<IOptions<MongoConnSettings>>().Value; |  | ||||||
|                 var mongoClientSettings = MongoClientSettings.FromConnectionString(settings.ConnectionString); |  | ||||||
|                 mongoClientSettings.Credential = MongoCredential.CreateOidcCredential(new HeathOidcCallback(settings.Audience)); |  | ||||||
|                 return new MongoClient(mongoClientSettings); |  | ||||||
|             }); |  | ||||||
|  |  | ||||||
|             services.AddSingleton<IMongoDatabase>(serviceProvider => |  | ||||||
|             { |  | ||||||
|                 var settings = serviceProvider.GetRequiredService<IOptions<MongoConnSettings>>().Value; |  | ||||||
|                 var client = serviceProvider.GetRequiredService<IMongoClient>(); |  | ||||||
|                 return client.GetDatabase(settings.Databasename); |  | ||||||
|             }); |  | ||||||
|  |  | ||||||
|             services.AddDALConfigurationLayer(); |  | ||||||
|             services.AddLogs(); |  | ||||||
|             services.AddRedisCacheService(configuration); |  | ||||||
|  |  | ||||||
|             return services; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|  |  | ||||||
|         private static IServiceCollection AddDALConfigurationLayer(this IServiceCollection services) |  | ||||||
|         { |  | ||||||
|             services.AddHttpContextAccessor(); |  | ||||||
|  |  | ||||||
|             services.AddScoped<IUserProvider, UserProvider>(); |             services.AddScoped<IUserProvider, UserProvider>(); | ||||||
|             services.AddScoped<IRoleService, RoleService>(); |             services.AddScoped<CollectionRepository<UserAdapter>>(); | ||||||
|             services.AddScoped<IPermissionService, PermissionService>(); |  | ||||||
|             services.AddScoped<IPermissionService, PermissionService>(); |  | ||||||
|             services.AddScoped<IModuleProvider, ModuleProvider>(); |  | ||||||
|             return services; |             return services; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user