Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public ResponseEntity<List<? extends ResponseContract>> login(@RequestBody Login
return ResponseEntity.ok(List.of(users));
} else {
ErrorResponse error = (ErrorResponse) list;
logger.warn("Error response : {}, error stack : {}", error, error.getException().getStackTrace());
return ResponseEntity.badRequest().body(List.of(error));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,11 @@ private List<UsersResponse> login(RequestContract request) {
}

try {
authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(castedRequest.getUsersEmailAddress(), castedRequest.getUsersPassword()));
if (redisStatus) {
logger.info("user with email {} successfully logged in using cache data : {}", redisUserResponse.getUsersEmailAddress(), redisUserResponse);

return List.of(redisUserResponse);
} else {
authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(castedRequest.getUsersEmailAddress(), castedRequest.getUsersPassword()));

logger.info("user with email {} successfully logged in using jpa data : {}", castedRequest.getUsersEmailAddress(), jpaUserResponse);

Expand All @@ -438,23 +437,17 @@ private List<UsersResponse> login(RequestContract request) {
return List.of(jpaUserResponse);
}
} catch (AuthenticationException e) {
if (redisStatus) {

logger.info("delete cached data for login : {}", redisService.delete(encrypt));
var errorMessage = "cached data shows change of password ";
var resolveIssue = "please log in again";
throw throwExceptionAndReport(new CachedUsersPasswordChangedException(errorMessage), errorMessage, resolveIssue);
} else {

if (passwordStatus) {
var errorMessage = UsersControllerAdvice.setMessage("password inserted is incorrect");
var resolveIssue = "please provide correct password or update password";
var resolveIssue = "please provide correct password";
throw throwExceptionAndReport(new UsersPasswordIncorrectException(errorMessage), errorMessage, resolveIssue);
} else {
var errorMessage = UsersControllerAdvice.setMessage("email address " + castedRequest.getUsersEmailAddress() + " not found, verify your email or register");
var resolveIssue = "Enter correct email address or register using the email entered";
var resolveIssue = "Enter correct email address";
throw throwExceptionAndReport(new UserNotFoundException(errorMessage), errorMessage, resolveIssue);
}
}


}
} catch (NullPointerException e) {
Expand Down
Loading
Loading