Compare commits
	
		
			10 Commits
		
	
	
		
			feature/ad
			...
			2bab87fe8d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2bab87fe8d | |||
| cd613cb5b8 | |||
| 39b415065a | |||
|   | 75962160af | ||
| 0f67d57bed | |||
| b3dec4a601 | |||
| 63173eac5a | |||
| d36e24cfbf | |||
| 32131d032b | |||
| 35a0a01221 | 
| @@ -7,7 +7,6 @@ | |||||||
| using Asp.Versioning; | using Asp.Versioning; | ||||||
| using Core.Thalos.BuildingBlocks; | using Core.Thalos.BuildingBlocks; | ||||||
| using Core.Thalos.Provider.Contracts; | using Core.Thalos.Provider.Contracts; | ||||||
| using Microsoft.AspNetCore.Authorization; |  | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using ModuleRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.ModuleRequest; | using ModuleRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.ModuleRequest; | ||||||
| using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | ||||||
| @@ -22,7 +21,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|     [Produces(MimeTypes.ApplicationJson)] |     [Produces(MimeTypes.ApplicationJson)] | ||||||
|     [Consumes(MimeTypes.ApplicationJson)] |     [Consumes(MimeTypes.ApplicationJson)] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |     //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|     public class ModuleController(IModuleProvider service) : ControllerBase |     public class ModuleController(IModuleProvider service) : ControllerBase | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -30,7 +29,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// </summary> |         /// </summary> | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)] | ||||||
|         [Permission("ModuleManagement.Read, RoleManagement.Read")] |         //[Permission("ModuleManagement.Read, RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllModulesAsync(CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllModulesAsync(CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetAllModules(cancellationToken); |             var result = await service.GetAllModules(cancellationToken); | ||||||
| @@ -43,7 +42,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpPost] |         [HttpPost] | ||||||
|         [Route(Routes.GetModuleList)] |         [Route(Routes.GetModuleList)] | ||||||
|         [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(IEnumerable<ModuleAdapter>), StatusCodes.Status200OK)] | ||||||
|         [Permission("ModuleManagement.Read")] |         //[Permission("ModuleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllModulesByList([FromBody] string[] modules, CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllModulesByList([FromBody] string[] modules, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (modules == null || !modules.Any()) |             if (modules == null || !modules.Any()) | ||||||
| @@ -60,13 +59,13 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] | ||||||
|         [ProducesResponseType(StatusCodes.Status404NotFound)] |         [ProducesResponseType(StatusCodes.Status404NotFound)] | ||||||
|         [Permission("ModuleManagement.Read")] |         //[Permission("ModuleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetModuleByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> GetModuleByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetModuleById(_id, cancellationToken); |             var result = await service.GetModuleById(_id, cancellationToken); | ||||||
|  |  | ||||||
|             if (result == null) |             if (result == null) | ||||||
|                 return NotFound("Entity not found"); |                 return NotFound("Module not found"); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
| @@ -77,7 +76,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpPost] |         [HttpPost] | ||||||
|         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status201Created)] |         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status201Created)] | ||||||
|         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)] |         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)] | ||||||
|         [Permission("ModuleManagement.Write")] |         //[Permission("ModuleManagement.Write")] | ||||||
|         public async Task<IActionResult> CreateModuleAsync([FromBody] ModuleRequest newModule, CancellationToken cancellationToken) |         public async Task<IActionResult> CreateModuleAsync([FromBody] ModuleRequest newModule, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.CreateModule(newModule, cancellationToken); |             var result = await service.CreateModule(newModule, cancellationToken); | ||||||
| @@ -92,7 +91,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] | ||||||
|         [ProducesResponseType(StatusCodes.Status400BadRequest)] |         [ProducesResponseType(StatusCodes.Status400BadRequest)] | ||||||
|         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)] |         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)] | ||||||
|         [Permission("ModuleManagement.Write")] |         //[Permission("ModuleManagement.Write")] | ||||||
|         public async Task<IActionResult> UpdateModuleAsync([FromRoute] string _id, [FromBody] ModuleAdapter entity, CancellationToken cancellationToken) |         public async Task<IActionResult> UpdateModuleAsync([FromRoute] string _id, [FromBody] ModuleAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (_id != entity._Id) |             if (_id != entity._Id) | ||||||
| @@ -108,10 +107,14 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpPatch] |         [HttpPatch] | ||||||
|         [Route(Routes.ChangeStatus)] |         [Route(Routes.ChangeStatus)] | ||||||
|         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("ModuleManagement.Write")] |         //[Permission("ModuleManagement.Write")] | ||||||
|         public async Task<IActionResult> ChangeModuleStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) |         public async Task<IActionResult> ChangeModuleStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.ChangeModuleStatus(_id, newStatus, cancellationToken); |             var result = await service.ChangeModuleStatus(_id, newStatus, cancellationToken); | ||||||
|  |  | ||||||
|  |             if (result == null) | ||||||
|  |                 return NotFound("Module not found"); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -128,12 +131,12 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(ModuleAdapter), StatusCodes.Status200OK)] | ||||||
|         [ProducesResponseType(StatusCodes.Status404NotFound)] |         [ProducesResponseType(StatusCodes.Status404NotFound)] | ||||||
|         [Permission("ModuleManagement.Write")] |         //[Permission("ModuleManagement.Write")] | ||||||
|         public async Task<IActionResult> DeleteModuleAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> DeleteModuleAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.DeleteModule(_id, cancellationToken); |             var result = await service.DeleteModule(_id, cancellationToken); | ||||||
|             if (result == null) |             if (result == null) | ||||||
|                 return NotFound("Entity not found"); |                 return NotFound("Module not found"); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -9,7 +9,6 @@ using Core.Thalos.BuildingBlocks; | |||||||
| using Core.Thalos.Provider.Contracts; | using Core.Thalos.Provider.Contracts; | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.Graph; |  | ||||||
| using PermissionRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.PermissionRequest; | using PermissionRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.PermissionRequest; | ||||||
| using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | ||||||
|  |  | ||||||
| @@ -23,7 +22,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|     [Produces(MimeTypes.ApplicationJson)] |     [Produces(MimeTypes.ApplicationJson)] | ||||||
|     [Consumes(MimeTypes.ApplicationJson)] |     [Consumes(MimeTypes.ApplicationJson)] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |     //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|     public class PermissionController(IPermissionProvider service) : ControllerBase |     public class PermissionController(IPermissionProvider service) : ControllerBase | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -37,7 +36,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)] | ||||||
|         [Permission("PermissionManagement.Read, RoleManagement.Read")] |         //[Permission("PermissionManagement.Read, RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllPermissionsAsync(CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllPermissionsAsync(CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetAllPermissions(cancellationToken).ConfigureAwait(false); |             var result = await service.GetAllPermissions(cancellationToken).ConfigureAwait(false); | ||||||
| @@ -58,7 +57,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(IEnumerable<PermissionAdapter>), StatusCodes.Status200OK)] | ||||||
|         [Permission("PermissionManagement.Read")] |         //[Permission("PermissionManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllPermissionsByList([FromBody] string[] permissions, CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllPermissionsByList([FromBody] string[] permissions, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (permissions == null || !permissions.Any()) |             if (permissions == null || !permissions.Any()) | ||||||
| @@ -84,14 +83,14 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("PermissionManagement.Read")] |         //[Permission("PermissionManagement.Read")] | ||||||
|         public async Task<IActionResult> GetPermissionByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> GetPermissionByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetPermissionById(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.GetPermissionById(_id, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|             if (result == null) |             if (result == null) | ||||||
|             { |             { | ||||||
|                 return NotFound("Entity not found"); |                 return NotFound("Permission not found"); | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
| @@ -108,7 +107,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <response code="500">Internal server error.</response> |         /// <response code="500">Internal server error.</response> | ||||||
|         [HttpPost] |         [HttpPost] | ||||||
|         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status201Created)] |         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status201Created)] | ||||||
|         [Permission("PermissionManagement.Write")] |         //[Permission("PermissionManagement.Write")] | ||||||
|         public async Task<IActionResult> CreatePermissionAsync([FromBody] PermissionRequest newPermission, CancellationToken cancellationToken) |         public async Task<IActionResult> CreatePermissionAsync([FromBody] PermissionRequest newPermission, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.CreatePermission(newPermission, cancellationToken).ConfigureAwait(false); |             var result = await service.CreatePermission(newPermission, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -131,7 +130,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("PermissionManagement.Write")] |         //[Permission("PermissionManagement.Write")] | ||||||
|         public async Task<IActionResult> UpdatePermissionAsync([FromRoute] string _id, [FromBody] PermissionAdapter entity, CancellationToken cancellationToken) |         public async Task<IActionResult> UpdatePermissionAsync([FromRoute] string _id, [FromBody] PermissionAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (_id != entity._Id) |             if (_id != entity._Id) | ||||||
| @@ -158,10 +157,14 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("PermissionManagement.Write")] |         //[Permission("PermissionManagement.Write")] | ||||||
|         public async Task<IActionResult> ChangePermissionStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) |         public async Task<IActionResult> ChangePermissionStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.ChangePermissionStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); |             var result = await service.ChangePermissionStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|  |             if (result == null) | ||||||
|  |                 return NotFound("Permission not found"); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -177,7 +180,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpDelete] |         [HttpDelete] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(PermissionAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("PermissionManagement.Write")] |         //[Permission("PermissionManagement.Write")] | ||||||
|         public async Task<IActionResult> DeletePermissionAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> DeletePermissionAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.DeletePermission(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.DeletePermission(_id, cancellationToken).ConfigureAwait(false); | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|     [Produces(MimeTypes.ApplicationJson)] |     [Produces(MimeTypes.ApplicationJson)] | ||||||
|     [Consumes(MimeTypes.ApplicationJson)] |     [Consumes(MimeTypes.ApplicationJson)] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |     //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|     public class RoleController(IRoleProvider service) : ControllerBase |     public class RoleController(IRoleProvider service) : ControllerBase | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -34,7 +34,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <response code="500">The service internal error.</response> |         /// <response code="500">The service internal error.</response> | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [ProducesResponseType(typeof(IEnumerable<RoleAdapter>), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(IEnumerable<RoleAdapter>), StatusCodes.Status200OK)] | ||||||
|         [Permission("RoleManagement.Read")] |         //[Permission("RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllRolesAsync(CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllRolesAsync(CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetAllRoles(cancellationToken).ConfigureAwait(false); |             var result = await service.GetAllRoles(cancellationToken).ConfigureAwait(false); | ||||||
| @@ -53,14 +53,14 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("RoleManagement.Read")] |         //[Permission("RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetRoleByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> GetRoleByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetRoleById(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.GetRoleById(_id, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|             if (result == null) |             if (result == null) | ||||||
|             { |             { | ||||||
|                 return NotFound("Entity not found"); |                 return NotFound("Role not found"); | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
| @@ -77,7 +77,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <response code="500">The service internal error.</response> |         /// <response code="500">The service internal error.</response> | ||||||
|         [HttpPost] |         [HttpPost] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status201Created)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status201Created)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> CreateRoleAsync([FromBody] RoleRequest newRole, CancellationToken cancellationToken) |         public async Task<IActionResult> CreateRoleAsync([FromBody] RoleRequest newRole, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.CreateRole(newRole, cancellationToken).ConfigureAwait(false); |             var result = await service.CreateRole(newRole, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -98,7 +98,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpPut] |         [HttpPut] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> UpdateRoleAsync([FromRoute] string _id, [FromBody] RoleAdapter entity, CancellationToken cancellationToken) |         public async Task<IActionResult> UpdateRoleAsync([FromRoute] string _id, [FromBody] RoleAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (_id != entity._Id) |             if (_id != entity._Id) | ||||||
| @@ -122,10 +122,14 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpPatch] |         [HttpPatch] | ||||||
|         [Route(Routes.ChangeStatus)] |         [Route(Routes.ChangeStatus)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> ChangeRoleStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) |         public async Task<IActionResult> ChangeRoleStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.ChangeRoleStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); |             var result = await service.ChangeRoleStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|  |             if (result == null) | ||||||
|  |                 return NotFound("Role not found"); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -140,7 +144,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <response code="500">The service internal error.</response> |         /// <response code="500">The service internal error.</response> | ||||||
|         [HttpPost(Routes.AddApplication)] |         [HttpPost(Routes.AddApplication)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> AddApplicationToRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) |         public async Task<IActionResult> AddApplicationToRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.AddApplicationToRole(roleId, application, cancellationToken).ConfigureAwait(false); |             var result = await service.AddApplicationToRole(roleId, application, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -158,7 +162,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <response code="500">The service internal error.</response> |         /// <response code="500">The service internal error.</response> | ||||||
|         [HttpDelete(Routes.RemoveApplication)] |         [HttpDelete(Routes.RemoveApplication)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> RemoveApplicationFromRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) |         public async Task<IActionResult> RemoveApplicationFromRoleAsync([FromRoute] string roleId, [FromRoute] ApplicationsEnum application, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.RemoveApplicationFromRole(roleId, application, cancellationToken).ConfigureAwait(false); |             var result = await service.RemoveApplicationFromRole(roleId, application, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -177,7 +181,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpDelete] |         [HttpDelete] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(RoleAdapter), StatusCodes.Status200OK)] | ||||||
|         [Permission("RoleManagement.Write")] |         //[Permission("RoleManagement.Write")] | ||||||
|         public async Task<IActionResult> DeleteRoleAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> DeleteRoleAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.DeleteRole(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.DeleteRole(_id, cancellationToken).ConfigureAwait(false); | ||||||
|   | |||||||
| @@ -7,6 +7,7 @@ | |||||||
| using Asp.Versioning; | using Asp.Versioning; | ||||||
| using Core.Thalos.BuildingBlocks; | using Core.Thalos.BuildingBlocks; | ||||||
| using Core.Thalos.Provider.Contracts; | using Core.Thalos.Provider.Contracts; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | ||||||
| using TenantRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.TenantRequest; | using TenantRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.TenantRequest; | ||||||
| @@ -21,7 +22,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|     [Produces(MimeTypes.ApplicationJson)] |     [Produces(MimeTypes.ApplicationJson)] | ||||||
|     [Consumes(MimeTypes.ApplicationJson)] |     [Consumes(MimeTypes.ApplicationJson)] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     // [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |     //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|     public class TenantController(ITenantProvider service) : ControllerBase |     public class TenantController(ITenantProvider service) : ControllerBase | ||||||
|     { |     { | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -35,7 +36,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(IEnumerable<TenantAdapter>), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(IEnumerable<TenantAdapter>), StatusCodes.Status200OK)] | ||||||
|         // [Permission("TenantManagement.Read, RoleManagement.Read")] |         //[Permission("TenantManagement.Read, RoleManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllTenantsAsync(CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllTenantsAsync(CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetAllTenants(cancellationToken).ConfigureAwait(false); |             var result = await service.GetAllTenants(cancellationToken).ConfigureAwait(false); | ||||||
| @@ -56,14 +57,14 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] | ||||||
|         // [Permission("TenantManagement.Read")] |         //[Permission("TenantManagement.Read")] | ||||||
|         public async Task<IActionResult> GetTenantByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> GetTenantByIdAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetTenantById(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.GetTenantById(_id, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|             if (result == null) |             if (result == null) | ||||||
|             { |             { | ||||||
|                 return NotFound("Entity not found"); |                 return NotFound("Tenant not found"); | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
| @@ -80,7 +81,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <response code="500">The service internal error.</response> |         /// <response code="500">The service internal error.</response> | ||||||
|         [HttpPost] |         [HttpPost] | ||||||
|         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status201Created)] |         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status201Created)] | ||||||
|         // [Permission("TenantManagement.Write")] |         //[Permission("TenantManagement.Write")] | ||||||
|         public async Task<IActionResult> CreateTenantAsync([FromBody] TenantRequest newTenant, CancellationToken cancellationToken) |         public async Task<IActionResult> CreateTenantAsync([FromBody] TenantRequest newTenant, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.CreateTenant(newTenant, cancellationToken).ConfigureAwait(false); |             var result = await service.CreateTenant(newTenant, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -103,7 +104,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] | ||||||
|         // [Permission("TenantManagement.Write")] |         //[Permission("TenantManagement.Write")] | ||||||
|         public async Task<IActionResult> UpdateTenantAsync([FromRoute] string _id, [FromBody] TenantAdapter entity, CancellationToken cancellationToken) |         public async Task<IActionResult> UpdateTenantAsync([FromRoute] string _id, [FromBody] TenantAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (_id != entity._Id) |             if (_id != entity._Id) | ||||||
| @@ -112,7 +113,9 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|             } |             } | ||||||
|  |  | ||||||
|             var result = await service.UpdateTenant(entity, cancellationToken).ConfigureAwait(false); |             var result = await service.UpdateTenant(entity, cancellationToken).ConfigureAwait(false); | ||||||
|             return Ok(result); |  | ||||||
|  |             if (result is not null) return Ok(result); | ||||||
|  |             else return NotFound("Tenant not found"); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -129,10 +132,14 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [Consumes(MimeTypes.ApplicationJson)] |         [Consumes(MimeTypes.ApplicationJson)] | ||||||
|         [Produces(MimeTypes.ApplicationJson)] |         [Produces(MimeTypes.ApplicationJson)] | ||||||
|         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] | ||||||
|         // [Permission("TenantManagement.Write")] |         //[Permission("TenantManagement.Write")] | ||||||
|         public async Task<IActionResult> ChangeTenantStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) |         public async Task<IActionResult> ChangeTenantStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.ChangeTenantStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); |             var result = await service.ChangeTenantStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|  |             if (result == null) | ||||||
|  |                 return NotFound("Tenant not found"); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -148,7 +155,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpDelete] |         [HttpDelete] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)] | ||||||
|         // [Permission("TenantManagement.Write")] |         //[Permission("TenantManagement.Write")] | ||||||
|         public async Task<IActionResult> DeleteTenantAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> DeleteTenantAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.DeleteTenant(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.DeleteTenant(_id, cancellationToken).ConfigureAwait(false); | ||||||
|   | |||||||
| @@ -9,7 +9,6 @@ using Core.Thalos.BuildingBlocks; | |||||||
| using Core.Thalos.Provider.Contracts; | using Core.Thalos.Provider.Contracts; | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.Graph; |  | ||||||
| using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | using StatusEnum = Core.Blueprint.Mongo.StatusEnum; | ||||||
| using UserRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.UserRequest; | using UserRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.UserRequest; | ||||||
|  |  | ||||||
| @@ -32,8 +31,8 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <returns>The <see cref="IEnumerable{UserAdapter}"/> found entity.</returns> |         /// <returns>The <see cref="IEnumerable{UserAdapter}"/> found entity.</returns> | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [ProducesResponseType(typeof(IEnumerable<UserAdapter>), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(IEnumerable<UserAdapter>), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("UserManagement.Read")] |         //[Permission("UserManagement.Read")] | ||||||
|         public async Task<IActionResult> GetAllUsers(CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllUsers(CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetAllUsers(cancellationToken).ConfigureAwait(false); |             var result = await service.GetAllUsers(cancellationToken).ConfigureAwait(false); | ||||||
| @@ -49,12 +48,12 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("UserManagement.Read")] |         //[Permission("UserManagement.Read")] | ||||||
|         public async Task<IActionResult> GetUserById([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> GetUserById([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetUserById(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.GetUserById(_id, cancellationToken).ConfigureAwait(false); | ||||||
|             return result == null ? NotFound("Entity not found") : Ok(result); |             return result == null ? NotFound("User not found") : Ok(result); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -66,7 +65,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [Route(Routes.Email)] |         [Route(Routes.Email)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] |         //[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] | ||||||
|         public async Task<IActionResult> GetUserByEmail([FromRoute] string email, CancellationToken cancellationToken) |         public async Task<IActionResult> GetUserByEmail([FromRoute] string email, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.GetUserByEmail(email, cancellationToken).ConfigureAwait(false); |             var result = await service.GetUserByEmail(email, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -97,8 +96,8 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <returns>The <see cref="UserAdapter"/> created entity.</returns> |         /// <returns>The <see cref="UserAdapter"/> created entity.</returns> | ||||||
|         [HttpPost(Routes.Register)] |         [HttpPost(Routes.Register)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status201Created)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status201Created)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("UserManagement.Write")] |         //[Permission("UserManagement.Write")] | ||||||
|         public async Task<IActionResult> CreateUserAsync([FromBody] UserRequest newUser, CancellationToken cancellationToken) |         public async Task<IActionResult> CreateUserAsync([FromBody] UserRequest newUser, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.CreateUser(newUser, cancellationToken).ConfigureAwait(false); |             var result = await service.CreateUser(newUser, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -115,8 +114,8 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpPut] |         [HttpPut] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("UserManagement.Write")] |         //[Permission("UserManagement.Write")] | ||||||
|         public async Task<IActionResult> UpdateUserAsync([FromRoute] string _id, [FromBody] UserAdapter entity, CancellationToken cancellationToken) |         public async Task<IActionResult> UpdateUserAsync([FromRoute] string _id, [FromBody] UserAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (_id != entity._Id) |             if (_id != entity._Id) | ||||||
| @@ -134,7 +133,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <returns>The <see cref="UserAdapter"/> found entity.</returns> |         /// <returns>The <see cref="UserAdapter"/> found entity.</returns> | ||||||
|         [HttpPatch(Routes.LogIn)] |         [HttpPatch(Routes.LogIn)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] |         //[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] | ||||||
|         public async Task<IActionResult> LoginUserAsync([FromRoute] string email, CancellationToken cancellationToken) |         public async Task<IActionResult> LoginUserAsync([FromRoute] string email, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.LogInUser(email, cancellationToken).ConfigureAwait(false); |             var result = await service.LogInUser(email, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -149,7 +148,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         /// <returns>The <see cref="UserAdapter"/> updated entity.</returns> |         /// <returns>The <see cref="UserAdapter"/> updated entity.</returns> | ||||||
|         [HttpPatch(Routes.LogOut)] |         [HttpPatch(Routes.LogOut)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] |         //[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] | ||||||
|         public async Task<IActionResult> LogOutUserSessionAsync([FromRoute] string email, CancellationToken cancellationToken) |         public async Task<IActionResult> LogOutUserSessionAsync([FromRoute] string email, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.LogOutUserSession(email, cancellationToken).ConfigureAwait(false); |             var result = await service.LogOutUserSession(email, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -166,11 +165,15 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpPatch] |         [HttpPatch] | ||||||
|         [Route(Routes.ChangeStatus)] |         [Route(Routes.ChangeStatus)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("UserManagement.Write")] |         //[Permission("UserManagement.Write")] | ||||||
|         public async Task<IActionResult> ChangeUserStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) |         public async Task<IActionResult> ChangeUserStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.ChangeUserStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); |             var result = await service.ChangeUserStatus(_id, newStatus, cancellationToken).ConfigureAwait(false); | ||||||
|  |  | ||||||
|  |             if (result == null) | ||||||
|  |                 return NotFound("User not found"); | ||||||
|  |  | ||||||
|             return Ok(result); |             return Ok(result); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @@ -183,7 +186,7 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [Route("{email}/GetTokenAdapter")] |         [Route("{email}/GetTokenAdapter")] | ||||||
|         [ProducesResponseType(typeof(TokenAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(TokenAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] |         //[Authorize(AuthenticationSchemes = $"{Schemes.DefaultScheme}, {Schemes.GoogleScheme}")] | ||||||
|         public async Task<IActionResult> GetTokenAdapter([FromRoute] string email, CancellationToken cancellationToken) |         public async Task<IActionResult> GetTokenAdapter([FromRoute] string email, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var tokenAdapter = await service.GetToken(email, cancellationToken).ConfigureAwait(false); |             var tokenAdapter = await service.GetToken(email, cancellationToken).ConfigureAwait(false); | ||||||
| @@ -201,8 +204,8 @@ namespace LSA.Core.Thalos.API.Controllers | |||||||
|         [HttpDelete] |         [HttpDelete] | ||||||
|         [Route(Routes.Id)] |         [Route(Routes.Id)] | ||||||
|         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] |         [ProducesResponseType(typeof(UserAdapter), StatusCodes.Status200OK)] | ||||||
|         [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] |         //[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)] | ||||||
|         [Permission("UserManagement.Write")] |         //[Permission("UserManagement.Write")] | ||||||
|         public async Task<IActionResult> DeleteUserAsync([FromRoute] string _id, CancellationToken cancellationToken) |         public async Task<IActionResult> DeleteUserAsync([FromRoute] string _id, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var result = await service.DeleteUser(_id, cancellationToken).ConfigureAwait(false); |             var result = await service.DeleteUser(_id, cancellationToken).ConfigureAwait(false); | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ | |||||||
|       "dotnetRunMessages": true, |       "dotnetRunMessages": true, | ||||||
|       "launchBrowser": true, |       "launchBrowser": true, | ||||||
|       "launchUrl": "swagger", |       "launchUrl": "swagger", | ||||||
|       "applicationUrl": "https://localhost:7031;http://localhost:5211", |       "applicationUrl": "https://localhost:44359;http://localhost:5211", | ||||||
|       "environmentVariables": { |       "environmentVariables": { | ||||||
|         "ASPNETCORE_ENVIRONMENT": "Local" |         "ASPNETCORE_ENVIRONMENT": "Local" | ||||||
|       } |       } | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ | |||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*", |   "AllowedHosts": "*", | ||||||
|   "ConnectionStrings": { |   "ConnectionStrings": { | ||||||
|     "MongoDB": "mongodb://admin_agile:Admin%40agileWebs@portainer.white-enciso.pro:27017/?authMechanism=SCRAM-SHA-256", |     "MongoDB": "mongodb://admin_agile:AdminAgileWebs@portainer.dream-views.com:27017/?authMechanism=SCRAM-SHA-256", | ||||||
|     "Redis": "100.123.31.103:6379" |     "Redis": "portainer.dream-views.com:6379" | ||||||
|   }, |   }, | ||||||
|   "MongoDb": { |   "MongoDb": { | ||||||
|     "DatabaseName": "Thalos", |     "DatabaseName": "Thalos", | ||||||
| @@ -25,11 +25,11 @@ | |||||||
|   }, |   }, | ||||||
|   "Vault": { |   "Vault": { | ||||||
|     "Address": "http://100.123.31.103:8200", |     "Address": "http://100.123.31.103:8200", | ||||||
|     "Token": "hvs.e37LQvLuPhTd5ALS5QQ03Cwm", |     "Token": "hvs.kLjCgmm6ABeuwJNFYma9kDdy", | ||||||
|     "SecretMount": "secret" |     "SecretMount": "secret" | ||||||
|   }, |   }, | ||||||
|   "IdentityProviders": { |   "IdentityProviders": { | ||||||
|     "Google": true, |     "Google": true, | ||||||
|     "Azure":  true |     "Azure": false | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ | |||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.3" /> |     <PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.3" /> | ||||||
|     <PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.4" /> |     <PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.8" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  |  | ||||||
| </Project> | </Project> | ||||||
|   | |||||||
| @@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<ModuleAdapter> ChangeModuleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); |         ValueTask<ModuleAdapter?> ChangeModuleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Updates a Module by its identifier. |         /// Updates a Module by its identifier. | ||||||
| @@ -72,7 +72,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<ModuleAdapter> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken); |         ValueTask<ModuleAdapter?> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Deletes a Module by its identifier. |         /// Deletes a Module by its identifier. | ||||||
|   | |||||||
| @@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<PermissionAdapter> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); |         ValueTask<PermissionAdapter?> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Updates a Permission. |         /// Updates a Permission. | ||||||
| @@ -72,7 +72,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<PermissionAdapter> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken); |         ValueTask<PermissionAdapter?> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Deletes a Permission by its identifier. |         /// Deletes a Permission by its identifier. | ||||||
|   | |||||||
| @@ -52,7 +52,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<RoleAdapter> ChangeRoleStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); |         ValueTask<RoleAdapter?> ChangeRoleStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Updates a Role. |         /// Updates a Role. | ||||||
| @@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<RoleAdapter> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken); |         ValueTask<RoleAdapter?> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Adds an application to the Role's list of applications. |         /// Adds an application to the Role's list of applications. | ||||||
|   | |||||||
| @@ -52,7 +52,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<TenantAdapter> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); |         ValueTask<TenantAdapter?> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Updates a Tenant. |         /// Updates a Tenant. | ||||||
| @@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<TenantAdapter> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken); |         ValueTask<TenantAdapter?> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Deletes a Tenant by its identifier. |         /// Deletes a Tenant by its identifier. | ||||||
|   | |||||||
| @@ -72,7 +72,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{UserAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{UserAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<UserAdapter> ChangeUserStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); |         ValueTask<UserAdapter?> ChangeUserStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Updates a User. |         /// Updates a User. | ||||||
| @@ -82,7 +82,7 @@ namespace Core.Thalos.Provider.Contracts | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{UserAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{UserAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         ValueTask<UserAdapter> UpdateUser(UserAdapter entity, CancellationToken cancellationToken); |         ValueTask<UserAdapter?> UpdateUser(UserAdapter entity, CancellationToken cancellationToken); | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Logs in the User. |         /// Logs in the User. | ||||||
|   | |||||||
| @@ -131,12 +131,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<ModuleAdapter> ChangeModuleStatus(string _id, StatusEnum newStatus, CancellationToken cancellationToken) |         public async ValueTask<ModuleAdapter?> ChangeModuleStatus(string _id, StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var entity = await repository.FindByIdAsync(_id); |             var entity = await repository.FindByIdAsync(_id); | ||||||
|             entity.Status = newStatus; |  | ||||||
|             await repository.ReplaceOneAsync(entity); |             if (entity is not null) | ||||||
|             return entity; |             { | ||||||
|  |                 entity.Status = newStatus; | ||||||
|  |  | ||||||
|  |                 return repository.ReplaceOneAsync(entity).Result; | ||||||
|  |             } | ||||||
|  |             else return null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -147,10 +152,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<ModuleAdapter> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken) |         public async ValueTask<ModuleAdapter?> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             await repository.ReplaceOneAsync(entity); |             var updatedEntity = await repository.ReplaceOneAsync(entity); | ||||||
|             return entity; |             return updatedEntity; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|   | |||||||
| @@ -130,12 +130,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<PermissionAdapter> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) |         public async ValueTask<PermissionAdapter?> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var entity = await repository.FindByIdAsync(_id); |             var entity = await repository.FindByIdAsync(_id); | ||||||
|             entity.Status = newStatus; |  | ||||||
|             await repository.ReplaceOneAsync(entity); |             if (entity is not null) | ||||||
|             return entity; |             { | ||||||
|  |                 entity.Status = newStatus; | ||||||
|  |  | ||||||
|  |                 return repository.ReplaceOneAsync(entity).Result; | ||||||
|  |             } | ||||||
|  |             else return null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -146,10 +151,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<PermissionAdapter> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken) |         public async ValueTask<PermissionAdapter?> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             await repository.ReplaceOneAsync(entity); |             var updatedEntity = await repository.ReplaceOneAsync(entity); | ||||||
|             return entity; |             return updatedEntity; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|   | |||||||
| @@ -100,13 +100,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<RoleAdapter> ChangeRoleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) |         public async ValueTask<RoleAdapter?> ChangeRoleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var entity = await repository.FindByIdAsync(_id); |             var entity = await repository.FindByIdAsync(_id); | ||||||
|             entity.Status = newStatus; |  | ||||||
|  |  | ||||||
|             await repository.ReplaceOneAsync(entity); |             if (entity is not null) | ||||||
|             return entity; |             { | ||||||
|  |                 entity.Status = newStatus; | ||||||
|  |  | ||||||
|  |                 return repository.ReplaceOneAsync(entity).Result; | ||||||
|  |             } | ||||||
|  |             else return null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -117,10 +121,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<RoleAdapter> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken) |         public async ValueTask<RoleAdapter?> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             await repository.ReplaceOneAsync(entity); |             var updatedEntity = await repository.ReplaceOneAsync(entity); | ||||||
|             return entity; |             return updatedEntity; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|   | |||||||
| @@ -99,13 +99,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<TenantAdapter> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) |         public async ValueTask<TenantAdapter?> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var entity = await repository.FindByIdAsync(_id); |             var entity = await repository.FindByIdAsync(_id); | ||||||
|             entity.Status = newStatus; |  | ||||||
|  |  | ||||||
|             await repository.ReplaceOneAsync(entity); |             if (entity is not null) | ||||||
|             return entity; |             { | ||||||
|  |                 entity.Status = newStatus; | ||||||
|  |  | ||||||
|  |                 return repository.ReplaceOneAsync(entity).Result; | ||||||
|  |             } | ||||||
|  |             else return null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -116,10 +120,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <returns> |         /// <returns> | ||||||
|         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. |         /// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service. | ||||||
|         /// </returns> |         /// </returns> | ||||||
|         public async ValueTask<TenantAdapter> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken) |         public async ValueTask<TenantAdapter?> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             await repository.ReplaceOneAsync(entity); |             var updatedEntity = await repository.ReplaceOneAsync(entity); | ||||||
|             return entity; |             return updatedEntity; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|   | |||||||
| @@ -82,7 +82,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllUsers"); |             var cacheKey = CacheKeyHelper.GenerateCacheKey(this, "GetAllUsers"); | ||||||
|             var cachedData = await cacheProvider.GetAsync<IEnumerable<UserAdapter>>(cacheKey) ?? []; |             var cachedData = await cacheProvider.GetAsync<IEnumerable<UserAdapter>>(cacheKey) ?? []; | ||||||
|  |  | ||||||
|             //if (cachedData.Any()) return cachedData; |             if (cachedData.Any()) return cachedData; | ||||||
|  |  | ||||||
|             var users = await repository.AsQueryable(); |             var users = await repository.AsQueryable(); | ||||||
|  |  | ||||||
| @@ -146,14 +146,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <param name="newStatus">The new status of the user.</param> |         /// <param name="newStatus">The new status of the user.</param> | ||||||
|         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing |         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         public async ValueTask<UserAdapter> ChangeUserStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) |         public async ValueTask<UserAdapter?> ChangeUserStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             var entity = await repository.FindByIdAsync(_id); |             var entity = await repository.FindByIdAsync(_id); | ||||||
|             entity.Status = newStatus; |  | ||||||
|  |  | ||||||
|             await repository.ReplaceOneAsync(entity); |             if (entity is not null) | ||||||
|  |             { | ||||||
|  |                 entity.Status = newStatus; | ||||||
|  |  | ||||||
|             return entity; |                 return repository.ReplaceOneAsync(entity).Result; | ||||||
|  |             } | ||||||
|  |             else return null; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -163,11 +166,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|         /// <param name="_id">The User mongo identifier.</param> |         /// <param name="_id">The User mongo identifier.</param> | ||||||
|         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing |         /// <returns>A <see cref="{Task{UserAdapter}}"/> representing | ||||||
|         /// the asynchronous execution of the service.</returns> |         /// the asynchronous execution of the service.</returns> | ||||||
|         public async ValueTask<UserAdapter> UpdateUser(UserAdapter entity, CancellationToken cancellationToken) |         public async ValueTask<UserAdapter?> UpdateUser(UserAdapter entity, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             await repository.ReplaceOneAsync(entity); |             var updatedEntity = await repository.ReplaceOneAsync(entity); | ||||||
|  |             return updatedEntity; | ||||||
|             return entity; |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -493,12 +495,12 @@ namespace Core.Thalos.Provider.Providers.Onboarding | |||||||
|                             .ToList() |                             .ToList() | ||||||
|                         : new List<PermissionAdapter>(), |                         : new List<PermissionAdapter>(), | ||||||
|                     Modules = result.Contains("modules") && result["modules"].IsBsonArray |                     Modules = result.Contains("modules") && result["modules"].IsBsonArray | ||||||
|                         ? result["modules"].AsBsonArray |                     ? result["modules"].AsBsonArray | ||||||
|                             .Where(p => p != null && p.IsBsonDocument) |                         .Where(p => p != null && p.IsBsonDocument) | ||||||
|                             .Select(p => BsonSerializer.Deserialize<ModuleAdapter>(p.AsBsonDocument)) |                         .Select(p => BsonSerializer.Deserialize<ModuleAdapter>(p.AsBsonDocument)) | ||||||
|                             .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active) |                         .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active) | ||||||
|                             .ToList() |                         .ToList() | ||||||
|                         : new List<ModuleAdapter>() |                     : new List<ModuleAdapter>() | ||||||
|                 }; |                 }; | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user