@@ -33,16 +33,16 @@ public class LogoutRequestHandler implements RequestHandler {
|
||||
LogoutRequest logoutRequest = objectMapper.convertValue(request.getMessageBody(), LogoutRequest.class);
|
||||
|
||||
Optional<AuthToken> opToken = authTokenRepository.findByToken(logoutRequest.getToken());
|
||||
Optional<User> user = userRepository.findByEmail(logoutRequest.getEmail());
|
||||
User user = userRepository.findByEmail(logoutRequest.getEmail());
|
||||
|
||||
if (opToken.isEmpty() || user.isEmpty()) {
|
||||
if (opToken.isEmpty() || user == null) {
|
||||
throw new NotValidFieldException("User with email or token not found",
|
||||
new BaseResponse(request.getMsgId(), MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getCode(),
|
||||
MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getDescription(),
|
||||
new LogoutRequest(logoutRequest.getEmail(), logoutRequest.getToken())));
|
||||
}
|
||||
|
||||
if (!Objects.equals(opToken.get().getUser().getId(), user.get().getId())) {
|
||||
if (!Objects.equals(opToken.get().getUser().getId(), user.getId())) {
|
||||
throw new NotValidFieldException("User token mismatch with user",
|
||||
new BaseResponse(request.getMsgId(), MessageCode.AUTH_TOKEN_MISMATCH.getCode(),
|
||||
MessageCode.AUTH_TOKEN_MISMATCH.getDescription(),
|
||||
|
||||
Reference in New Issue
Block a user