Logger zum AuthController hinzugefügt.

This commit is contained in:
Developer 02 2024-07-01 15:42:17 +02:00
parent 3bcd723fba
commit d76623155a

View File

@ -20,30 +20,45 @@ namespace DigitalData.UserManager.API.Controllers
private readonly IGroupOfUserService _gouService; private readonly IGroupOfUserService _gouService;
private readonly IDirectorySearchService _dirSearchService; private readonly IDirectorySearchService _dirSearchService;
private readonly IStringLocalizer<Resource> _localizer; private readonly IStringLocalizer<Resource> _localizer;
private readonly ILogger<AuthController> _logger;
public AuthController(IUserService userService, IGroupOfUserService gouService, IDirectorySearchService directorySearchService, IStringLocalizer<Resource> localizer) public AuthController(IUserService userService, IGroupOfUserService gouService, IDirectorySearchService directorySearchService, IStringLocalizer<Resource> localizer, ILogger<AuthController> logger)
{ {
_userService = userService; _userService = userService;
_gouService = gouService; _gouService = gouService;
_dirSearchService = directorySearchService; _dirSearchService = directorySearchService;
_localizer = localizer; _localizer = localizer;
_logger = logger;
} }
[AllowAnonymous] [AllowAnonymous]
[HttpGet("check")] [HttpGet("check")]
public IActionResult CheckAuthentication() => Ok(new AuthCheckDto(IsAuthenticated: User.Identity?.IsAuthenticated ?? false)); public IActionResult CheckAuthentication()
{
try
{
return Ok(new AuthCheckDto(IsAuthenticated: User.Identity?.IsAuthenticated ?? false));
}
catch(Exception ex)
{
_logger.LogError(ex, "{Message}", ex.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
}
[AllowAnonymous] [AllowAnonymous]
[HttpPost("login")] [HttpPost("login")]
public async Task<IActionResult> Login([FromBody] LogInDto login) public async Task<IActionResult> Login([FromBody] LogInDto login)
{
try
{ {
bool isValid = _dirSearchService.ValidateCredentials(login.Username, login.Password); bool isValid = _dirSearchService.ValidateCredentials(login.Username, login.Password);
if (!isValid) if (!isValid)
return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFound])); return Unauthorized(Result.Fail().Message(_localizer[Key.UserNotFound]));
var gouMsg = await _gouService.HasGroup(login.Username, "PM_USER", caseSensitive:false); var gouMsg = await _gouService.HasGroup(login.Username, "PM_USER", caseSensitive: false);
if(!gouMsg.IsSuccess) if (!gouMsg.IsSuccess)
return Unauthorized(Result.Fail().Message(_localizer[Key.UnauthorizedUser])); return Unauthorized(Result.Fail().Message(_localizer[Key.UnauthorizedUser]));
//find the user //find the user
@ -87,10 +102,18 @@ namespace DigitalData.UserManager.API.Controllers
return Ok(); return Ok();
} }
catch(Exception ex)
{
_logger.LogError(ex, "{Message}", ex.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
}
[Authorize] [Authorize]
[HttpGet("user")] [HttpGet("user")]
public async Task<IActionResult> GetUserWithClaims() public async Task<IActionResult> GetUserWithClaims()
{
try
{ {
// Extract the username from the Name claim. // Extract the username from the Name claim.
string? username = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value; string? username = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value;
@ -98,22 +121,34 @@ namespace DigitalData.UserManager.API.Controllers
if (string.IsNullOrEmpty(username)) if (string.IsNullOrEmpty(username))
return Unauthorized(); return Unauthorized();
var userDto = await _userService.ReadByUsernameAsync(username); return await _userService.ReadByUsernameAsync(username)
.ThenAsync(Ok, IActionResult (m, n) =>
if (!userDto.IsSuccess || userDto.Data is null)
{ {
_logger.LogNotice(n);
return NotFound(Result.Fail().Message(_localizer[Key.UserNotFound])); return NotFound(Result.Fail().Message(_localizer[Key.UserNotFound]));
});
}
catch (Exception ex)
{
_logger.LogError(ex, "{Message}", ex.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
} }
return Ok(userDto.Data); [Authorize]
}
[AllowAnonymous]
[HttpPost("logout")] [HttpPost("logout")]
public async Task<IActionResult> Logout() public async Task<IActionResult> Logout()
{
try
{ {
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
return Ok(); return Ok();
} }
catch(Exception ex)
{
_logger.LogError(ex, "{Message}", ex.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
}
} }
} }