Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: move user repo logic to service and handle errors #25

Merged
merged 13 commits into from
Mar 20, 2024
Merged

refactor: move user repo logic to service and handle errors #25

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6b61abf
Refactor: move user repo logic to service
Harish-osmosys Feb 29, 2024
fec8ed4
fix: add error handling
Harish-osmosys Feb 29, 2024
6dc598c
fix: update code
Harish-osmosys Mar 1, 2024
e2bd507
fix: remove unwanted code
Harish-osmosys Mar 1, 2024
32d80bd
docs: updated content
Harish-osmosys Mar 1, 2024
a06e37a
fix: made error more generic
Harish-osmosys Mar 4, 2024
2bb6042
fix: resolve comments
Harish-osmosys Mar 11, 2024
b6efa10
fix: add modelState error
Harish-osmosys Mar 12, 2024
90d5ede
fix: update error message
Harish-osmosys Mar 12, 2024
1c6a828
fix: update registerRequest dto
Harish-osmosys Mar 12, 2024
67faf5d
Merge branch 'main' of https://github.com/OsmosysSoftware/dotnet-foun…
Harish-osmosys Mar 13, 2024
71b712d
feat: use api layer to handle error
Harish-osmosys Mar 13, 2024
8970f02
fix: update validator logic
Harish-osmosys Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 99 additions & 23 deletions DotnetFoundation/DotnetFoundation.Api/Controllers/AuthenticationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
using System.Net;
using DotnetFoundation.Api.Helpers;
using DotnetFoundation.Application.Exceptions;
using DotnetFoundation.Application.Interfaces.Services;
using DotnetFoundation.Application.Models.Common;
using DotnetFoundation.Application.Models.DTOs.AuthenticationDTO;
Expand All @@ -11,9 +14,11 @@ namespace DotnetFoundation.Api.Controllers;
public class AuthenticationController : ControllerBase
{
private readonly IAuthenticationService _authenticationService;
public AuthenticationController(IAuthenticationService authenticationService)
private readonly ErrorResponse _errorResponse;
public AuthenticationController(IAuthenticationService authenticationService, ErrorResponse errorResponse)
{
_authenticationService = authenticationService;
_errorResponse = errorResponse;
}

/// <summary>
Expand All @@ -27,11 +32,27 @@ public AuthenticationController(IAuthenticationService authenticationService)
public async Task<ActionResult<BaseResponse<AuthenticationResponse>>> RegisterAsync(RegisterRequest request)
{
BaseResponse<AuthenticationResponse> response = new(ResponseStatus.Fail);
try
{
response.Data = await _authenticationService.RegisterAsync(request).ConfigureAwait(false);
response.Status = ResponseStatus.Success;

response.Data = await _authenticationService.RegisterAsync(request).ConfigureAwait(false);
response.Status = ResponseStatus.Success;

return Ok(response);
return Ok(response);
}
catch (IdentityUserException ex)
{
response.Message = ex.Message;
Harish-osmosys marked this conversation as resolved.
Show resolved Hide resolved
response.Status = ResponseStatus.Error;
response.Errors = _errorResponse.GetErrorResponse();
return BadRequest(response);
}
catch (Exception ex)
{
response.Message = ex.Message;
response.Errors = _errorResponse.GetErrorResponse();
response.Status = ResponseStatus.Error;
return StatusCode(StatusCodes.Status500InternalServerError, response);
}
}

/// <summary>
Expand All @@ -45,46 +66,101 @@ public async Task<ActionResult<BaseResponse<AuthenticationResponse>>> RegisterAs
public async Task<ActionResult<BaseResponse<AuthenticationResponse>>> LoginAsync(LoginRequest request)
{
BaseResponse<AuthenticationResponse> response = new(ResponseStatus.Fail);
try
{
response.Data = await _authenticationService.LoginAsync(request).ConfigureAwait(false);
response.Status = ResponseStatus.Success;

response.Data = await _authenticationService.LoginAsync(request).ConfigureAwait(false);
response.Status = ResponseStatus.Success;

return Ok(response);
return Ok(response);
}
catch (InvalidCredentialsException ex)
{
response.Message = ex.Message;
response.Status = ResponseStatus.Error;
response.Errors = _errorResponse.GetErrorResponse();
return BadRequest(response);
}
catch (Exception ex)
{
response.Message = ex.Message;
response.Errors = _errorResponse.GetErrorResponse();
response.Status = ResponseStatus.Error;
return StatusCode(StatusCodes.Status500InternalServerError, response);
}
}

/// <summary>
/// User password reset using reset token.
/// </summary>
/// <param name="request">New password details request</param>
[HttpPost("reset-password")]
[HttpPost("resetpassword")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<BaseResponse<AuthenticationResponse>>> ResetPasswordAsync(PasswordResetRequest request)
public async Task<ActionResult<BaseResponse<int>>> ResetPasswordAsync(PasswordResetRequest request)
{
BaseResponse<AuthenticationResponse> response = new(ResponseStatus.Fail);
BaseResponse<int> response = new(ResponseStatus.Fail);
try
{
await _authenticationService.ResetPasswordAsync(request).ConfigureAwait(false);
response.Status = ResponseStatus.Success;

response.Data = await _authenticationService.ResetPasswordAsync(request).ConfigureAwait(false);
response.Status = ResponseStatus.Success;

return Ok(response);
return Ok(response);
}
catch (UserNotFoundException ex)
{
response.Message = ex.Message;
response.Status = ResponseStatus.Error;
response.Errors = _errorResponse.GetErrorResponse();
return BadRequest(response);
}
catch (InvalidTokenException ex)
{
response.Message = ex.Message;
response.Status = ResponseStatus.Error;
response.Errors = _errorResponse.GetErrorResponse();
return BadRequest(response);
}
catch (Exception ex)
{
response.Message = ex.Message;
response.Errors = _errorResponse.GetErrorResponse();
response.Status = ResponseStatus.Error;
return StatusCode(StatusCodes.Status500InternalServerError, response);
}
}

/// <summary>
/// Forgot user password.
/// </summary>
/// <param name="email">Email of user to reset password</param>
[HttpPost("forgot-password")]
[HttpPost("forgotpassword")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<BaseResponse<string>>> ForgotPasswordAsync(string email)
public async Task<ActionResult<BaseResponse<int>>> ForgotPasswordAsync(string email)
{
BaseResponse<string> response = new(ResponseStatus.Fail);

response.Data = await _authenticationService.ForgotPasswordAsync(email).ConfigureAwait(false);
response.Status = ResponseStatus.Success;
BaseResponse<int> response = new(ResponseStatus.Fail);
try
{
await _authenticationService.ForgotPasswordAsync(email).ConfigureAwait(false);
response.Status = ResponseStatus.Success;

return Ok(response);
return Ok(response);
}
catch (UserNotFoundException ex)
{
response.Message = ex.Message;
response.Status = ResponseStatus.Error;
response.Errors = _errorResponse.GetErrorResponse();
return BadRequest(response);
}
catch (Exception ex)
{
response.Message = ex.Message;
response.Status = ResponseStatus.Error;
response.Errors = _errorResponse.GetErrorResponse();
return StatusCode(StatusCodes.Status500InternalServerError, response);
}
}
}
Loading
Loading