Configure authentication in program.cs and endpoints

Adapt packages from gitea

Core.Thalos.DAL.API/Controllers/ModuleController.cs

@@ -5,16 +5,17 @@
 // ***********************************************************************
 
 using Asp.Versioning;
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters;
 using Core.Thalos.Adapters.Attributes;
 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 Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Graph;
+using ModuleRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.ModuleRequest;
 
-namespace LSA.Core.Kerberos.API.Controllers
+namespace LSA.Core.Thalos.API.Controllers
 {
     /// <summary>
     /// Handles all requests for module authentication.
@@ -24,7 +25,8 @@ namespace LSA.Core.Kerberos.API.Controllers
     [Produces(MimeTypes.ApplicationJson)]
     [Consumes(MimeTypes.ApplicationJson)]
     [ApiController]
-    public class ModuleController(IModuleService service, ILogger<ModuleController> logger) : ControllerBase
+    [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+    public class ModuleController(IModuleProvider service) : ControllerBase
     {
         /// <summary>
         /// Gets all the modules.
@@ -37,21 +39,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("ModuleManagement.Read, RoleManagement.Read")]
-        public async Task<IActionResult> GetAllModulesAsync()
+        public async Task<IActionResult> GetAllModulesAsync(CancellationToken cancellationToken)
         {
-            try
+            var result = await service.GetAllModules(cancellationToken).ConfigureAwait(false);
-            {
+            return Ok(result);
-                var result = await service.GetAllModulesService();
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in GetAllModulesAsync");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -67,31 +59,16 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("ModuleManagement.Read")]
-        public async Task<IActionResult> GetAllModulesByList([FromBody] string[] modules)
+        public async Task<IActionResult> GetAllModulesByList([FromBody] string[] modules, CancellationToken cancellationToken)
         {
             if (modules == null || !modules.Any())
             {
                 return BadRequest("Module identifiers are required.");
             }
 
-            try
+            var result = await service.GetAllModulesByList(modules, cancellationToken).ConfigureAwait(false);
-            {
+            return Ok(result);
-                var result = await service.GetAllModulesByListService(modules);
-
-                if (result == null || !result.Any())
-                {
-                    return NotFound("No modules found for the given identifiers.");
-                }
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in GetAllModulesByList");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
 
@@ -108,23 +85,17 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("ModuleManagement.Read")]
-        public async Task<IActionResult> GetModuleByIdAsync([FromRoute] string id)
+        public async Task<IActionResult> GetModuleByIdAsync([FromRoute] string id, CancellationToken cancellationToken)
         {
-            try
+            var result = await service.GetModuleById(id, cancellationToken).ConfigureAwait(false);
-            {
-                var result = await service.GetModuleByIdService(id);
 
-                if (result is null) return NotFound($"module with id: '{id}' not found");
+            if (result == null)
-
-                return Ok(result);
-            }
-            catch (Exception ex)
             {
-                logger.LogError(ex, "Error in GetModuleByIdAsync");
+                return NotFound("Entity not found");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
             }
+
+            return Ok(result);
         }
 
         /// <summary>
@@ -137,20 +108,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         /// <response code="500">The service internal e|ror.</response>
         [HttpPost]
         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status201Created)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("ModuleManagement.Write")]
-        public async Task<IActionResult> CreateModuleAsync([FromBody] ModuleRequest newModule)
+        public async Task<IActionResult> CreateModuleAsync([FromBody] ModuleRequest newModule, CancellationToken cancellationToken)
         {
-            try
+            var result = await service.CreateModule(newModule, cancellationToken).ConfigureAwait(false);
-            {
+            return Created("CreatedWithIdAsync", result);
-                var result = await service.CreateModuleService(newModule).ConfigureAwait(false);
-                return Created("CreatedWithIdService", result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in CreateModuleAsync");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -168,21 +130,17 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("ModuleManagement.Write")]
-        public async Task<IActionResult> UpdateModuleAsync(ModuleAdapter entity, string id)
+        public async Task<IActionResult> UpdateModuleAsync([FromRoute] string id, ModuleAdapter entity, CancellationToken cancellationToken)
         {
-            try
+            if (id != entity.Id?.ToString())
             {
-                var result = await service.UpdateModuleService(entity, id);
+                return BadRequest("Module ID mismatch");
+            }
 
-                return Ok(result);
+            var result = await service.UpdateModule(entity, cancellationToken).ConfigureAwait(false);
-            }
+
-            catch (Exception ex)
+            return Ok(result);
-            {
-                logger.LogError(ex, "Error in UpdateModuleAsync");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -200,21 +158,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("ModuleManagement.Write")]
-        public async Task<IActionResult> ChangeModuleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus)
+        public async Task<IActionResult> ChangeModuleStatus([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
         {
-            try
+            var result = await service.ChangeModuleStatus(id, newStatus, cancellationToken).ConfigureAwait(false);
-            {
+            return Ok(result);
-                var result = await service.ChangeModuleStatusService(id, newStatus);
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in ChangeModuleStatus");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
     }
 }

Core.Thalos.DAL.API/Controllers/PermissionController.cs

@@ -5,16 +5,17 @@
 // ***********************************************************************
 
 using Asp.Versioning;
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters;
 using Core.Thalos.Adapters.Attributes;
 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 Microsoft.AspNetCore.Authorization;
 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>
     /// Handles all requests for permission authentication.
@@ -24,7 +25,8 @@ namespace LSA.Core.Kerberos.API.Controllers
     [Produces(MimeTypes.ApplicationJson)]
     [Consumes(MimeTypes.ApplicationJson)]
     [ApiController]
-    public class PermissionController(IPermissionService service, ILogger<PermissionController> logger) : ControllerBase
+    [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+    public class PermissionController(IPermissionProvider service) : ControllerBase
     {
         /// <summary>
         /// Gets all the permissions.
@@ -37,21 +39,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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);
-            {
+            return Ok(result);
-                var result = await service.GetAllPermissionsService();
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in GetAllPermissionsAsync");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -67,31 +59,16 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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())
             {
-                return BadRequest("Permission identifiers are required.");
+                return BadRequest("Permissions identifiers are required.");
             }
 
-            try
+            var result = await service.GetAllPermissionsByList(permissions, cancellationToken).ConfigureAwait(false);
-            {
+            return Ok(result);
-                var result = await service.GetAllPermissionsByListService(permissions);
-
-                if (result == null || !result.Any())
-                {
-                    return NotFound("No permissions found for the given identifiers.");
-                }
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in GetAllPermissionsByList");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -107,23 +84,17 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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 Ok(result);
-            }
-            catch (Exception ex)
             {
-                logger.LogError(ex, "Error in GetPermissionByIdAsync");
+                return NotFound("Entity not found");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
             }
+
+            return Ok(result);
         }
 
         /// <summary>
@@ -136,20 +107,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         /// <response code="500">The service internal e|ror.</response>
         [HttpPost]
         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status201Created)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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>
@@ -167,21 +129,17 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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");
+            }
 
-                return Ok(result);
+            var result = await service.UpdatePermission(entity, cancellationToken).ConfigureAwait(false);
-            }
+
-            catch (Exception ex)
+            return Ok(result);
-            {
-                logger.LogError(ex, "Error in UpdatePermissionAsync");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -199,21 +157,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Consumes(MimeTypes.ApplicationJson)]
         [Produces(MimeTypes.ApplicationJson)]
         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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);
-            {
+            return Ok(result);
-                var result = await service.ChangePermissionStatusService(id, newStatus);
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in ChangePermissionStatus");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
     }
 }

Core.Thalos.DAL.API/Controllers/RoleController.cs

@@ -12,8 +12,9 @@ using Core.Thalos.Domain.Contexts.Onboarding.Request;
 using Core.Thalos.Provider.Contracts;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using StatusEnum = Core.Blueprint.Mongo.StatusEnum;
 
-namespace LSA.Core.Kerberos.API.Controllers
+namespace LSA.Core.Thalos.API.Controllers
 {
     /// <summary>
     /// Handles all requests for role authentication.
@@ -23,7 +24,8 @@ namespace LSA.Core.Kerberos.API.Controllers
     [Produces(MimeTypes.ApplicationJson)]
     [Consumes(MimeTypes.ApplicationJson)]
     [ApiController]
-    public class RoleController(IRoleService service, ILogger<RoleController> logger) : ControllerBase
+    [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
+    public class RoleController(IRoleProvider service) : ControllerBase
     {
         /// <summary>
         /// Gets all the roles.
@@ -34,21 +36,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         /// <response code="500">The service internal error.</response>
         [HttpGet]
         [ProducesResponseType(typeof(IEnumerable<RoleAdapter>), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [Permission("RoleManagement.Read")]
-        public async Task<IActionResult> GetAllRolesAsync()
+        public async Task<IActionResult> GetAllRolesAsync(CancellationToken cancellationToken)
         {
-            try
+            var result = await service.GetAllRoles(cancellationToken).ConfigureAwait(false);
-            {
+            return Ok(result);
-                var result = await service.GetAllRolesService();
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in GetAllRolesAsync");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -62,23 +54,17 @@ namespace LSA.Core.Kerberos.API.Controllers
         [HttpGet]
         [Route(Routes.Id)]
         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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 Ok(result);
-            }
-            catch (Exception ex)
             {
-                logger.LogError(ex, "Error in GetRoleByIdAsync");
+                return NotFound("Entity not found");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
             }
+
+            return Ok(result);
         }
 
         /// <summary>
@@ -91,21 +77,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         /// <response code="500">The service internal error.</response>
         [HttpPost]
         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status201Created)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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>
@@ -121,21 +97,17 @@ namespace LSA.Core.Kerberos.API.Controllers
         [HttpPut]
         [Route(Routes.Id)]
         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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");
+            }
 
-                return Ok(result);
+            var result = await service.UpdateRole(entity, cancellationToken).ConfigureAwait(false);
-            }
+
-            catch (Exception ex)
+            return Ok(result);
-            {
-                logger.LogError(ex, "Error in UpdateRoleAsync");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
         }
 
         /// <summary>
@@ -151,22 +123,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         [HttpPatch]
         [Route(Routes.ChangeStatus)]
         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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);
-            {
+            return Ok(result);
-                var result = await service.ChangeRoleStatusService(id, newStatus);
-
-                return Ok(result);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error in ChangeRoleStatus");
-                return StatusCode(500, $"Internal server error, ErrorMessage: {ex.Message}");
-            }
-
         }
 
         /// <summary>
@@ -181,22 +142,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         /// <response code="500">The service internal error.</response>
         [HttpPost(Routes.AddApplication)]
         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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>
@@ -211,21 +161,11 @@ namespace LSA.Core.Kerberos.API.Controllers
         /// <response code="500">The service internal error.</response>
         [HttpDelete(Routes.RemoveApplication)]
         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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}");
-            }
         }
     }
 }

Core.Thalos.DAL.API/Controllers/UserController.cs

@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Graph;
 using UserRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.UserRequest;
 
-namespace LSA.Core.Kerberos.API.Controllers
+namespace LSA.Core.Thalos.API.Controllers
 {
     /// <summary>
     /// Handles all requests for user authentication.
@@ -56,9 +56,9 @@ namespace LSA.Core.Kerberos.API.Controllers
         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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)
             {
@@ -79,7 +79,7 @@ namespace LSA.Core.Kerberos.API.Controllers
         [HttpGet]
         [Route(Routes.Email)]
         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")]
+        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
         public async Task<IActionResult> GetUserByEmail([FromRoute] string email, CancellationToken cancellationToken)
         {
             var result = await service.GetUserByEmail(email, cancellationToken).ConfigureAwait(false);
@@ -150,9 +150,9 @@ namespace LSA.Core.Kerberos.API.Controllers
         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
         [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");
             }
@@ -173,7 +173,7 @@ namespace LSA.Core.Kerberos.API.Controllers
         /// <response code="500">The service internal error.</response>
         [HttpPatch(Routes.LogIn)]
         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")]
+        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
         public async Task<IActionResult> LoginUserAsync([FromRoute] string email, CancellationToken cancellationToken)
         {
             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>
         [HttpPatch(Routes.LogOut)]
         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")]
+        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
         public async Task<IActionResult> LogOutUserSessionAsync([FromRoute] string email, CancellationToken cancellationToken)
         {
             var result = await service.LogOutUserSession(email, cancellationToken).ConfigureAwait(false);
@@ -300,7 +300,7 @@ namespace LSA.Core.Kerberos.API.Controllers
         [Permission("UserManagement.Write")]
         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);
         }
 
@@ -315,7 +315,7 @@ namespace LSA.Core.Kerberos.API.Controllers
         [HttpGet]
         [Route("{email}/GetTokenAdapter")]
         [ProducesResponseType(typeof(TokenAdapter), StatusCodes.Status200OK)]
-        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.AzureScheme}")]
+        [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")]
         public async Task<IActionResult> GetTokenAdapter([FromRoute] string email, CancellationToken cancellationToken)
         {
             var tokenAdapter = await service.GetToken(email, cancellationToken).ConfigureAwait(false);

Core.Thalos.DAL.API/Core.Thalos.DAL.API.csproj

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

Core.Thalos.DAL.API/Extensions/SwaggerExtensions.cs

@@ -0,0 +1,104 @@
+using Asp.Versioning.ApiExplorer;
+using Microsoft.Extensions.Options;
+using Microsoft.Graph.ExternalConnectors;
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
+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, IConfiguration configuration)
+        {
+            services.AddEndpointsApiExplorer();
+            AddSwaggerGen(services, configuration);
+            services.AddTransient<IConfigureOptions<SwaggerGenOptions>, ConfigureSwaggerOptions>();
+        }
+
+        public static void AddSwaggerGen(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddSwaggerGen(c =>
+            {
+                c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+                {
+                    Description = "JWT Authorization header using the Bearer scheme",
+                    Name = "Authorization",
+                    In = ParameterLocation.Header,
+                    Type = SecuritySchemeType.Http,
+                    Scheme = "bearer",
+                    BearerFormat = "JWT"
+                });
+
+                c.AddSecurityRequirement(new OpenApiSecurityRequirement
+                {
+                    {
+                        new OpenApiSecurityScheme
+                        {
+                            Reference = new OpenApiReference
+                            {
+                                Type = ReferenceType.SecurityScheme,
+                                Id = "Bearer"
+                            }
+                        },
+                        Array.Empty<string>()
+                    }
+                });
+            });
+        }
+
+        public static void ConfigureSwagger(this WebApplication app)
+        {
+            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("+", "."));
+        }
+    }
+}

Core.Thalos.DAL.API/Program.cs

@@ -1,90 +1,85 @@
+using Core.Blueprint.Caching.Configuration;
+using Core.Blueprint.DAL.Mongo.Configuration;
 using Core.Blueprint.Logging.Configuration;
 using Core.Thalos.Adapters.Extensions;
-using Core.Thalos.Adapters.Helpers;
+using Core.Thalos.BuildingBlocks.Authentication.Extensions;
+using Core.Thalos.DAL.API.Extensions;
 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.Threading.RateLimiting;
+using System.Text.Json.Serialization;
 
 var builder = WebApplication.CreateBuilder(args);
 
-var authSettings = AuthHelper.GetAuthSettings(builder, "thalos_dal");
+builder.Services.ConfigureAuthentication(builder.Configuration);
 
-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.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.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(builder.Configuration);
+
+    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();
 
-app.UseSwaggerUI(builder.Configuration, authSettings);
+app.UseSwagger();
-app.ConfigureSwagger(builder.Configuration);
+app.UseSwaggerUI();
-app.UseLogging(builder.Configuration);
-app.UseHttpsRedirection();
-app.UseAuthorization();
 app.MapControllers();
+app.UseCors();
+app.ConfigureSwagger();
+app.UseHttpsRedirection();
+app.UseStaticFiles();
+app.UseRouting();
+app.UseResponseCompression();
+app.UseOutputCache();
+app.UseResponseCaching();
+app.UseAuthentication();
+app.UseAuthorization();
+app.UseLogging(builder.Configuration);
+app.MapHealthChecks("/health");
 
 app.Run();

Core.Thalos.DAL.API/appsettings.Development.json

@@ -5,4 +5,18 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "MongoDB": "mongodb://localhost:27017",
+    "Redis": "localhost:6379"
+  },
+  "MongoDb": {
+    "DatabaseName": "Thalos",
+    "LocalAudience": ""
+  },
+  "DetailedErrors": true,
+  "UseRedisCache": true,
+  "CacheSettings": {
+    "DefaultCacheDurationInMinutes": 3
+  }
 }

Core.Thalos.DAL.API/appsettings.json

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

Core.Thalos.DAL.API/sample.settings.json

@@ -26,7 +26,7 @@
     "AuthorizationUrl": "", // URL for authorization endpoint (STORED IN KEY VAULT)
     "TokenUrl": "", // URL for token endpoint (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": {
     "Scopes": "", // Scopes for Microsoft Graph API access

Core.Thalos.Domain/Core.Thalos.Domain.csproj

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

Core.Thalos.Provider/Contracts/IModuleProvider.cs

@@ -3,13 +3,13 @@
 //     AgileWebs
 // </copyright>
 // ***********************************************************************
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters;
-using Core.Thalos.Adapters.Common.Enums;
 using Core.Thalos.Domain.Contexts.Onboarding.Request;
 
 namespace Core.Thalos.Provider.Contracts
 {
-    public interface IModuleService
+    public interface IModuleProvider
     {
         /// <summary>
         /// Creates a new Module.
@@ -17,7 +17,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="entity">The Module to be created.</param>
         /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<ModuleAdapter> CreateModuleService(ModuleRequest newModule);
+        ValueTask<ModuleAdapter> CreateModule(ModuleRequest newModule, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets an Module by identifier.
@@ -25,14 +25,14 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="id">The Module identifier.</param>
         /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<ModuleAdapter> GetModuleByIdService(string id);
+        ValueTask<ModuleAdapter> GetModuleById(string _id, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets all the roles.
         /// </summary>
         /// <returns>A <see cref="{Task{IEnumerbale{ModuleAdapter}}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<IEnumerable<ModuleAdapter>> GetAllModulesService();
+        ValueTask<IEnumerable<ModuleAdapter>> GetAllModules(CancellationToken cancellationToken);
 
         /// <summary>
         /// 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>
         /// <returns>A <see cref="Task{IEnumerable{ModuleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<IEnumerable<ModuleAdapter>> GetAllModulesByListService(string[] permissions);
+        ValueTask<IEnumerable<ModuleAdapter>> GetAllModulesByList(string[] modules, CancellationToken cancellationToken);
 
         /// <summary>
         /// Changes the status of the permission.
@@ -50,7 +50,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <returns>The <see cref="ModuleAdapter"/> updated entity.</returns>
         /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<ModuleAdapter> ChangeModuleStatusService(string id, StatusEnum newStatus);
+        ValueTask<ModuleAdapter> ChangeModuleStatus(string id, StatusEnum newStatus, CancellationToken cancellationToken);
 
         /// <summary>
         /// Updates a Module by id.
@@ -59,6 +59,6 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="id">The Module identifier.</param>
         /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<ModuleAdapter> UpdateModuleService(ModuleAdapter entity, string id);
+        ValueTask<ModuleAdapter> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken);
     }
 }

Core.Thalos.Provider/Contracts/IPermissionProvider.cs

@@ -3,13 +3,13 @@
 //     AgileWebs
 // </copyright>
 // ***********************************************************************
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters;
-using Core.Thalos.Adapters.Common.Enums;
 using Core.Thalos.Domain.Contexts.Onboarding.Request;
 
 namespace Core.Thalos.Provider.Contracts
 {
-    public interface IPermissionService
+    public interface IPermissionProvider
     {
         /// <summary>
         /// Creates a new Permission.
@@ -17,7 +17,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="entity">The Permission to be created.</param>
         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<PermissionAdapter> CreatePermissionService(PermissionRequest newPermission);
+        ValueTask<PermissionAdapter> CreatePermission(PermissionRequest newPermission, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets an Permission by identifier.
@@ -25,14 +25,14 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="id">The Permission identifier.</param>
         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<PermissionAdapter> GetPermissionByIdService(string id);
+        ValueTask<PermissionAdapter> GetPermissionById(string _id, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets all the roles.
         /// </summary>
         /// <returns>A <see cref="{Task{IEnumerbale{PermissionAdapter}}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<IEnumerable<PermissionAdapter>> GetAllPermissionsService();
+        ValueTask<IEnumerable<PermissionAdapter>> GetAllPermissions(CancellationToken cancellationToken);
 
         /// <summary>
         /// 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>
         /// <returns>A <see cref="Task{IEnumerable{PermissionAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<IEnumerable<PermissionAdapter>> GetAllPermissionsByListService(string[] permissions);
+        ValueTask<IEnumerable<PermissionAdapter>> GetAllPermissionsByList(string[] permissions, CancellationToken cancellationToken);
 
         /// <summary>
         /// Changes the status of the permission.
@@ -50,7 +50,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <returns>The <see cref="PermissionAdapter"/> updated entity.</returns>
         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<PermissionAdapter> ChangePermissionStatusService(string id, StatusEnum newStatus);
+        ValueTask<PermissionAdapter> ChangePermissionStatus(string id, StatusEnum newStatus, CancellationToken cancellationToken);
 
         /// <summary>
         /// Updates a Permission by id.
@@ -59,6 +59,6 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="id">The Permission identifier.</param>
         /// <returns>A <see cref="{Task{PermissionAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<PermissionAdapter> UpdatePermissionService(PermissionAdapter entity, string id);
+        ValueTask<PermissionAdapter> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken);
     }
 }

Core.Thalos.Provider/Contracts/IRoleProvider.cs

@@ -9,7 +9,7 @@ using Core.Thalos.Domain.Contexts.Onboarding.Request;
 
 namespace Core.Thalos.Provider.Contracts
 {
-    public interface IRoleService
+    public interface IRoleProvider
     {
         /// <summary>
         /// Creates a new Role.
@@ -17,7 +17,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="entity">The Role to be created.</param>
         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<RoleAdapter> CreateRoleService(RoleRequest newRole);
+        ValueTask<RoleAdapter> CreateRole(RoleRequest newRole, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets an Role by identifier.
@@ -25,14 +25,14 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="id">The Role identifier.</param>
         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<RoleAdapter> GetRoleByIdService(string id);
+        ValueTask<RoleAdapter> GetRoleById(string _id, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets all the roles.
         /// </summary>
         /// <returns>A <see cref="{Task{IEnumerbale{RoleAdapter}}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<IEnumerable<RoleAdapter>> GetAllRolesService();
+        ValueTask<IEnumerable<RoleAdapter>> GetAllRoles(CancellationToken cancellationToken);
 
         /// <summary>
         /// Changes the status of the role.
@@ -42,7 +42,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <returns>The <see cref="RoleAdapter"/> updated entity.</returns>
         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing
         /// 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>
         /// Updates a Role by id.
@@ -51,7 +51,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="id">The Role identifier.</param>
         /// <returns>A <see cref="{Task{RoleAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        Task<RoleAdapter> UpdateRoleService(RoleAdapter entity, string id);
+        ValueTask<RoleAdapter> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken);
 
         /// <summary>
         /// 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="application">The application enum value to add.</param>
         /// <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>
         /// 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="application">The application enum value to remove.</param>
         /// <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);
     }
 }

Core.Thalos.Provider/Contracts/IUserProvider.cs

@@ -49,7 +49,7 @@ namespace Core.Thalos.Provider.Contracts
         /// <param name="eamil">The User email.</param>
         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing
         /// the asynchronous execution of the service.</returns>
-        ValueTask<UserAdapter> ValidateUserExistence(string? email, CancellationToken cancellationToken);
+        ValueTask<UserExistenceAdapter> ValidateUserExistence(string? email, CancellationToken cancellationToken);
 
         /// <summary>
         /// Changes the status of the user.

Core.Thalos.Provider/Core.Thalos.Provider.csproj

@@ -11,9 +11,8 @@
   </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" />
   </ItemGroup>
 

Core.Thalos.Provider/Providers/Onboarding/ModuleProvider.cs

@@ -0,0 +1,155 @@
+// ***********************************************************************
+// <copyright file="ModuleService.cs">
+//     AgileWebs
+// </copyright>
+// ***********************************************************************
+using Core.Thalos.Adapters;
+using Core.Blueprint.Mongo;
+using Core.Blueprint.Caching.Helpers;
+using Mapster;
+using Microsoft.Extensions.Options;
+using MongoDB.Driver;
+using Core.Thalos.Provider.Contracts;
+using Core.Thalos.Domain.Contexts.Onboarding.Request;
+using Core.Blueprint.Caching.Contracts;
+using Core.Blueprint.Caching.Adapters;
+
+namespace Core.Thalos.Provider.Providers.Onboarding
+{
+    /// <summary>
+    /// Handles all services and business rules related to <see cref="ModuleAdapter"/>.
+    /// </summary>
+    public class ModuleProvider : IModuleProvider
+    {
+        private readonly CollectionRepository<ModuleAdapter> repository;
+        private readonly CacheSettings cacheSettings;
+        private readonly ICacheProvider cacheProvider;
+
+        public ModuleProvider(CollectionRepository<ModuleAdapter> repository,
+            ICacheProvider cacheProvider,
+            IOptions<CacheSettings> cacheSettings)
+        {
+            this.repository = repository;
+            this.repository.CollectionInitialization();
+            this.cacheSettings = cacheSettings.Value;
+            this.cacheProvider = cacheProvider;
+        }
+
+        /// <summary>
+        /// Creates a new Module.
+        /// </summary>
+        /// <param name="entity">The Module to be created.</param>
+        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
+        /// the asynchronous execution of the service.</returns>
+        public async ValueTask<ModuleAdapter> CreateModule(ModuleRequest newModule, CancellationToken cancellationToken)
+        {
+            var moduleCollection = newModule.Adapt<ModuleAdapter>();
+
+            await repository.InsertOneAsync(moduleCollection);
+
+            return moduleCollection;
+        }
+
+        /// <summary>
+        /// Gets an Module by identifier.
+        /// </summary>
+        /// <param name="id">The Module identifier.</param>
+        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
+        /// the asynchronous execution of the service.</returns>0
+        public async ValueTask<ModuleAdapter> GetModuleById(string _id, CancellationToken cancellationToken)
+        {
+            var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetModuleById", _id);
+            var cachedData = await cacheProvider.GetAsync<ModuleAdapter>(cacheKey);
+
+            if (cachedData is not null) { return cachedData; }
+
+            var module = await repository.FindByIdAsync(_id);
+
+            await cacheProvider.SetAsync(cacheKey, module);
+
+            return module;
+        }
+
+        /// <summary>
+        /// Gets all the modules.
+        /// </summary>
+        /// <returns>A <see cref="{Task{IEnumerbale{ModuleAdapter}}}"/> representing
+        /// the asynchronous execution of the service.</returns>
+        public async ValueTask<IEnumerable<ModuleAdapter>> GetAllModules(CancellationToken cancellationToken)
+        {
+            var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetModules");
+            var cachedData = await cacheProvider.GetAsync<IEnumerable<ModuleAdapter>>(cacheKey) ?? [];
+
+            if (cachedData.Any()) return cachedData;
+
+            var modules = await repository.AsQueryable();
+
+            await cacheProvider.SetAsync(cacheKey, modules);
+
+            return modules;
+        }
+
+        /// <summary>
+        /// Gets all the modules by modules identifier list.
+        /// </summary>
+        /// <param name="modules">The list of modules identifiers.</param>
+        /// <returns>A <see cref="Task{IEnumerable{ModuleAdapter}}"/> representing
+        /// the asynchronous execution of the service.</returns>
+        public async ValueTask<IEnumerable<ModuleAdapter>> GetAllModulesByList(string[] modules, CancellationToken cancellationToken)
+        {
+            var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllModulesByList", modules);
+
+            var cachedData = await cacheProvider.GetAsync<IEnumerable<ModuleAdapter>>(cacheKey) ?? [];
+
+            if (cachedData.Any()) return cachedData;
+
+            var builder = Builders<ModuleAdapter>.Filter;
+            var filters = new List<FilterDefinition<ModuleAdapter>>();
+
+            if (modules != null || !modules.Any())
+            {
+                filters.Add(builder.In(x => x._Id, modules));
+            }
+
+            var finalFilter = filters.Any() ? builder.And(filters) : builder.Empty;
+
+            var modulesList = await repository.FilterByMongoFilterAsync(finalFilter);
+
+            await cacheProvider.SetAsync(cacheKey, modulesList);
+
+            return modulesList;
+        }
+
+
+        /// <summary>
+        /// Changes the status of the module.
+        /// </summary>
+        /// <param name="id">The module identifier.</param>
+        /// <param name="newStatus">The new status of the module.</param>
+        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
+        /// the asynchronous execution of the service.</returns>
+        public async ValueTask<ModuleAdapter> ChangeModuleStatus(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 Module by id.
+        /// </summary>
+        /// <param name="entity">The Module to be updated.</param>
+        /// <param name="id">The Module identifier.</param>
+        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
+        /// the asynchronous execution of the service.</returns>
+        public async ValueTask<ModuleAdapter> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken)
+        {
+            await repository.ReplaceOneAsync(entity);
+
+            return entity;
+        }
+    }
+}

Core.Thalos.Provider/Providers/Onboarding/ModuleService.cs

@@ -1,256 +0,0 @@
-// ***********************************************************************
-// <copyright file="ModuleService.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="ModuleAdapter"/>.
-    /// </summary>
-    public class ModuleService(ILogger<ModuleService> logger, IHttpContextAccessor httpContextAccessor, ICacheService cacheService,
-        IOptions<CacheSettings> cacheSettings, IMongoDatabase database) : IModuleService
-    {
-        private readonly CacheSettings _cacheSettings = cacheSettings.Value;
-
-        /// <summary>
-        /// Creates a new Module.
-        /// </summary>
-        /// <param name="entity">The Module to be created.</param>
-        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
-        /// the asynchronous execution of the service.</returns>
-        public async Task<ModuleAdapter> CreateModuleService(ModuleRequest newModule)
-        {
-            try
-            {
-                var entity = newModule.ToAdapter(httpContextAccessor);
-                entity.Order = (entity.Order is not null) ? entity.Order : await GetLastOrderModule(newModule);
-                await database.GetCollection<ModuleAdapter>(CollectionNames.Module).InsertOneAsync(entity);
-                entity.Id = (entity as dynamic ?? "").Id.ToString();
-
-                return entity;
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, $"CreateModuleService: Error in getting data - {ex.Message}");
-                throw new Exception(ex.Message, ex);
-            }
-        }
-
-        /// <summary>
-        /// Gets an Module by identifier.
-        /// </summary>
-        /// <param name="id">The Module identifier.</param>
-        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
-        /// the asynchronous execution of the service.</returns>0
-        public async Task<ModuleAdapter> GetModuleByIdService(string id)
-        {
-            var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetModuleByIdService", id);
-            var cachedData = await cacheService.GetAsync<ModuleAdapter>(cacheKey);
-
-            if (cachedData is not null) { return cachedData; }
-
-            try
-            {
-                var filter = Builders<ModuleAdapter>.Filter.And(
-                    Builders<ModuleAdapter>.Filter.Eq("_id", ObjectId.Parse(id)),
-                    Builders<ModuleAdapter>.Filter.Eq("status", StatusEnum.Active.ToString())
-                );
-
-                var module = await database.GetCollection<ModuleAdapter>(CollectionNames.Module)
-                                    .Find(filter)
-                                    .FirstOrDefaultAsync();
-
-                var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings);
-
-                await cacheService.SetAsync(cacheKey, module, cacheDuration);
-
-                return module;
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, $"GetModuleByIdService: Error in getting data - {ex.Message}");
-                throw new Exception(ex.Message, ex);
-            }
-        }
-
-        /// <summary>
-        /// Gets all the modules.
-        /// </summary>
-        /// <returns>A <see cref="{Task{IEnumerbale{ModuleAdapter}}}"/> representing
-        /// the asynchronous execution of the service.</returns>
-        public async Task<IEnumerable<ModuleAdapter>> GetAllModulesService()
-        {
-            var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllModulesService");
-            var cachedData = await cacheService.GetAsync<IEnumerable<ModuleAdapter>>(cacheKey) ?? [];
-
-            if (cachedData.Any()) return cachedData;
-
-            try
-            {
-                var filter = Builders<ModuleAdapter>.Filter.Eq("status", StatusEnum.Active.ToString());
-
-                var roles = await database.GetCollection<ModuleAdapter>(CollectionNames.Module)
-                                    .Find(filter)
-                                    .SortBy(m => m.Application)
-                                    .ThenBy(m => m.Order)
-                                    .ToListAsync();
-
-                var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings);
-
-                await cacheService.SetAsync(cacheKey, roles, cacheDuration);
-
-                return roles;
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, $"GetAllModulesService: Error in getting data - {ex.Message}");
-                throw new Exception(ex.Message, ex);
-            }
-        }
-
-        /// <summary>
-        /// Gets all the modules by modules identifier list.
-        /// </summary>
-        /// <param name="modules">The list of modules identifiers.</param>
-        /// <returns>A <see cref="Task{IEnumerable{ModuleAdapter}}"/> representing
-        /// the asynchronous execution of the service.</returns>
-        public async Task<IEnumerable<ModuleAdapter>> GetAllModulesByListService(string[] modules)
-        {
-            var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllModulesByListService", modules);
-
-            var cachedData = await cacheService.GetAsync<IEnumerable<ModuleAdapter>>(cacheKey);
-
-            if (cachedData != null && cachedData.Any()) return cachedData;
-
-            try
-            {
-                var objectIds = modules.Select(id => ObjectId.Parse(id)).ToArray();
-
-                var filter = Builders<ModuleAdapter>.Filter.In("_id", objectIds)
-                                & Builders<ModuleAdapter>.Filter.Eq("status", StatusEnum.Active.ToString());
-
-                var roles = await database.GetCollection<ModuleAdapter>(CollectionNames.Module)
-                                          .Find(filter)
-                                          .SortBy(m => m.Application)
-                                          .ThenBy(m => m.Order)
-                                          .ToListAsync();
-
-                var cacheDuration = CacheHelper.GetCacheDuration(_cacheSettings);
-
-                await cacheService.SetAsync(cacheKey, roles, cacheDuration);
-
-                return roles;
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, $"GetAllModulesByListService: Error in getting data - {ex.Message}");
-                throw new Exception(ex.Message, ex);
-            }
-        }
-
-
-        /// <summary>
-        /// Changes the status of the module.
-        /// </summary>
-        /// <param name="id">The module identifier.</param>
-        /// <param name="newStatus">The new status of the module.</param>
-        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
-        /// the asynchronous execution of the service.</returns>
-        public async Task<ModuleAdapter> ChangeModuleStatusService(string id, StatusEnum newStatus)
-        {
-            try
-            {
-                var filter = Builders<ModuleAdapter>.Filter
-                    .Eq("_id", ObjectId.Parse(id));
-
-                var update = Builders<ModuleAdapter>.Update
-                            //.Set(v => v.Status, newStatus)
-                            .Set(v => v.UpdatedBy, Helper.GetEmail(httpContextAccessor))
-                            .Set(v => v.UpdatedAt, DateTime.UtcNow);
-
-                await database.GetCollection<ModuleAdapter>(CollectionNames.Module).UpdateOneAsync(filter, update);
-
-                var updatedModule = await database.GetCollection<ModuleAdapter>(CollectionNames.Module)
-                                    .Find(filter)
-                                    .FirstOrDefaultAsync();
-
-                return updatedModule;
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, $"ChangeModuleStatusService: Error in getting data - {ex.Message}");
-                throw new Exception(ex.Message, ex);
-            }
-        }
-
-        /// <summary>
-        /// Updates a Module by id.
-        /// </summary>
-        /// <param name="entity">The Module to be updated.</param>
-        /// <param name="id">The Module identifier.</param>
-        /// <returns>A <see cref="{Task{ModuleAdapter}}"/> representing
-        /// the asynchronous execution of the service.</returns>
-        public async Task<ModuleAdapter> UpdateModuleService(ModuleAdapter entity, string id)
-        {
-            try
-            {
-                var filter = Builders<ModuleAdapter>.Filter
-                    .Eq("_id", ObjectId.Parse(id));
-
-                var update = Builders<ModuleAdapter>.Update
-                            .Set(v => v.Name, entity.Name)
-                            .Set(v => v.Description, entity.Description)
-                            .Set(v => v.Icon, entity.Icon)
-                            .Set(v => v.Route, entity.Route)
-                            .Set(v => v.Order, entity.Order)
-                            .Set(v => v.Application, entity.Application)
-                            .Set(v => v.Status, entity.Status)
-                            .Set(v => v.UpdatedBy, Helper.GetEmail(httpContextAccessor))
-                            .Set(v => v.UpdatedAt, DateTime.UtcNow);
-
-                await database.GetCollection<ModuleAdapter>(CollectionNames.Module).UpdateOneAsync(filter, update);
-
-                var updatedModule = await database.GetCollection<ModuleAdapter>(CollectionNames.Module)
-                                            .Find(filter)
-                                            .FirstOrDefaultAsync();
-
-                return updatedModule;
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, $"UpdateModuleService: Error in getting data - {ex.Message}");
-                throw new Exception(ex.Message, ex);
-            }
-        }
-
-        private async Task<int?> GetLastOrderModule(ModuleRequest newModule)
-        {
-            var filter = Builders<ModuleAdapter>.Filter.And(
-                Builders<ModuleAdapter>.Filter.Eq("status", StatusEnum.Active.ToString()),
-                Builders<ModuleAdapter>.Filter.Eq("application", newModule.Application.ToString()));
-
-            var maxOrderModule = await database.GetCollection<ModuleAdapter>(CollectionNames.Module)
-                                               .Find(filter)
-                                               .SortByDescending(m => m.Order)
-                                               .FirstOrDefaultAsync();
-
-            return (maxOrderModule is not null && maxOrderModule.Order is not null) ? maxOrderModule.Order : 0;
-        }
-    }
-}

Core.Thalos.Provider/Providers/Onboarding/PermissionProvider.cs

@@ -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;
+        }
+    }
+}

Core.Thalos.Provider/Providers/Onboarding/PermissionService.cs

@@ -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);
-            }
-        }
-    }
-}

Core.Thalos.Provider/Providers/Onboarding/RoleProvider.cs

@@ -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;
+        }
+    }
+}

Core.Thalos.Provider/Providers/Onboarding/RoleService.cs

@@ -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);
-            }
-        }
-    }
-}

Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs

@@ -4,18 +4,20 @@
 // </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.Blueprint.Mongo;
+using Core.Thalos.Provider.Contracts;
-using Core.Blueprint.Redis;
-using Core.Blueprint.Redis.Helpers;
 using Mapster;
 using Microsoft.Extensions.Options;
-using MongoDB.Driver;
-using Core.Thalos.Provider.Contracts;
 using MongoDB.Bson;
-using System.Text.RegularExpressions;
 using MongoDB.Bson.Serialization;
+using MongoDB.Driver;
+using System.Reflection;
+using System.Text.RegularExpressions;
 
 namespace Core.Thalos.Provider.Providers.Onboarding
 {
@@ -25,17 +27,19 @@ namespace Core.Thalos.Provider.Providers.Onboarding
     public class UserProvider : IUserProvider
     {
         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.CollectionInitialization();
-            this.cacheSettings = cacheSettings.Value;
+			this.cacheSettings = cacheSettings.Value;
-            this.cacheProvider = cacheProvider;
+			this.cacheProvider = cacheProvider;
-        }
+		}
 
         /// <summary>
         /// Creates a new User.
@@ -63,7 +67,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding
             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserById", _id);
             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);
 
@@ -102,7 +106,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding
             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetUserByEmail", email);
             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(
                 u => u.Email == email && 
@@ -119,20 +123,24 @@ namespace Core.Thalos.Provider.Providers.Onboarding
         /// <param name="email">The User email.</param>
         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing
         /// 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 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(
                 u => u.Email == email &&
                 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>
@@ -213,7 +221,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding
         public async ValueTask<UserAdapter> AddCompanyToUser(string userId, string companyId, CancellationToken cancellationToken)
         {
             var user = await repository.FindOneAsync(
-                u => u.Id == userId &&
+                u => u._Id == userId &&
                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active);
 
             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)
         {
             var user = await repository.FindOneAsync(
-                u => u.Id == userId &&
+                u => u._Id == userId &&
                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active);
 
             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)
         {
             var user = await repository.FindOneAsync(
-                u => u.Id == userId &&
+                u => u._Id == userId &&
                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active);
 
             var updatedProjects = user.Projects.Append(projectId).Distinct().ToArray();
-            user.Companies = updatedProjects;
+            user.Projects = updatedProjects;
 
             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)
         {
             var user = await repository.FindOneAsync(
-                u => u.Id == userId &&
+                u => u._Id == userId &&
                 u.Status == Core.Blueprint.Mongo.StatusEnum.Active);
 
             var updatedProjects = user.Projects
                     ?.Where(c => c != projectId)
                     .ToArray();
 
-            user.Companies = updatedProjects;
+            user.Projects = updatedProjects;
 
             await repository.ReplaceOneAsync(user);
 
@@ -399,53 +407,106 @@ namespace Core.Thalos.Provider.Providers.Onboarding
                     User = new UserAdapter
                     {
                         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
-                            .Select(c => c.AsString)
+                            ? result["companies"].AsBsonArray
-                            .ToArray(),
+                                .Where(c => c != null && !c.IsBsonNull)
-                        Projects = result["projects"].AsBsonArray
+                                .Select(c => c.AsString)
-                            .Select(c => c.AsString)
+                                .ToArray()
-                            .ToArray(),
+                            : Array.Empty<string>(),
-                        LastLogIn = result["lastLogIn"].ToUniversalTime(),
+                                        Projects = result.Contains("projects") && result["projects"].IsBsonArray
-                        LastLogOut = result["lastLogOut"].ToUniversalTime(),
+                            ? result["projects"].AsBsonArray
-                        CreatedAt = result["createdAt"].ToUniversalTime(),
+                                .Where(p => p != null && !p.IsBsonNull)
-                        CreatedBy = result["createdBy"].AsString,
+                                .Select(p => p.AsString)
-                        UpdatedAt = result["updatedAt"].ToUniversalTime(),
+                                .ToArray()
-                        UpdatedBy = result["updatedBy"].AsString,
+                            : Array.Empty<string>(),
-                        Status = (Core.Blueprint.Mongo.StatusEnum)Enum.Parse(typeof(Core.Blueprint.Mongo.StatusEnum), result["status"].AsString),
+                        LastLogIn = result.Contains("lastLogIn") && !result["lastLogIn"].IsBsonNull ? result["lastLogIn"].ToUniversalTime() : DateTime.MinValue,
+                        LastLogOut = result.Contains("lastLogOut") && !result["lastLogOut"].IsBsonNull ? result["lastLogOut"].ToUniversalTime() : DateTime.MinValue,
+                        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
                     {
-                        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)
-                        .ToList()
+                            .Select(p => BsonSerializer.Deserialize<PermissionAdapter>(p.AsBsonDocument))
+                            .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active)
+                            .ToList()
+                        : new List<PermissionAdapter>()
                 };
 
+
                 return tokenAdapter;
 
             }

Core.Thalos.Provider/ServiceCollectionExtensions.cs

@@ -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.Provider.Contracts;
 using Core.Thalos.Provider.Providers;
@@ -14,60 +16,21 @@ namespace Core.Thalos.Provider
 {
     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<IRoleService, RoleService>();
+            services.AddScoped<CollectionRepository<UserAdapter>>();
-            services.AddScoped<IPermissionService, PermissionService>();
+
-            services.AddScoped<IPermissionService, PermissionService>();
-            services.AddScoped<IModuleService, ModuleService>();
             return services;
         }