updated code
This commit is contained in:
Mohd-Arham
@@ -3,11 +3,12 @@ package com.billpaymentservice.bbps.serviceImpl;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.billpaymentservice.bbps.config.JwtUtil;
|
||||
import com.billpaymentservice.bbps.dto.UserDetailsDTO;
|
||||
import com.billpaymentservice.bbps.dto.ResponseModel;
|
||||
import com.billpaymentservice.bbps.dto.auth.AuthResponse;
|
||||
import com.billpaymentservice.bbps.dto.auth.LoginRequest;
|
||||
import com.billpaymentservice.bbps.dto.auth.OtpSendResponse;
|
||||
@@ -16,12 +17,12 @@ import com.billpaymentservice.bbps.dto.auth.UserDto;
|
||||
import com.billpaymentservice.bbps.dto.auth.VerifyOtpRequest;
|
||||
import com.billpaymentservice.bbps.dto.response.AuthResponses;
|
||||
import com.billpaymentservice.bbps.entites.UserEntity;
|
||||
import com.billpaymentservice.bbps.entites.UsersDetails;
|
||||
import com.billpaymentservice.bbps.repository.UserRepository;
|
||||
import com.billpaymentservice.bbps.repository.UsersDetailsRepository;
|
||||
import com.billpaymentservice.bbps.service.AuthService;
|
||||
import com.billpaymentservice.bbps.util.Helper;
|
||||
import com.billpaymentservice.bbps.util.OtpClient;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@Service
|
||||
@@ -33,9 +34,9 @@ public class AuthServiceImpl implements AuthService {
|
||||
private final OtpClient otpClient;
|
||||
private final Helper helper;
|
||||
private final UsersDetailsRepository userRepo;
|
||||
|
||||
private final JwtUtil jwtUtil;
|
||||
|
||||
@Autowired
|
||||
public AuthServiceImpl(UserRepository userRepository, OtpClient otpClient, Helper helper,
|
||||
UsersDetailsRepository userRepo, JwtUtil jwtUtil) {
|
||||
this.userRepository = userRepository;
|
||||
@@ -46,32 +47,37 @@ public class AuthServiceImpl implements AuthService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public OtpSendResponse sendOtp(LoginRequest request) {
|
||||
Optional<UserEntity> existing = userRepository.findByMobile(request.getMobile());
|
||||
|
||||
if (existing.isPresent()) {
|
||||
UserEntity u = existing.get();
|
||||
UserDto dto = new UserDto(u.getId(), u.getMobile(), u.getName(), u.getEmail(), u.getAge());
|
||||
return null;
|
||||
public ResponseModel<?> sendOtp(LoginRequest request) {
|
||||
try {
|
||||
OtpSendResponse resp = otpClient.sendOtp(request.getMobile());
|
||||
if (resp == null) {
|
||||
return ResponseModel.builder().message("OTP send service returned null").status("Failure")
|
||||
.statusCode(500).data(null).build();
|
||||
}
|
||||
String status = resp.isSuccess() ? "Success" : "Failure";
|
||||
int code = resp.isSuccess() ? 200 : 400;
|
||||
return ResponseModel.builder().message(resp.getMessage()).status(status).statusCode(code).data(resp)
|
||||
.build();
|
||||
} catch (Exception ex) {
|
||||
LOGGER.error("Error in sendOtp: {}", ex.getMessage(), ex);
|
||||
return ResponseModel.builder().message("An unexpected error occurred while sending OTP").status("Failure")
|
||||
.statusCode(500).data(null).build();
|
||||
}
|
||||
// delegate to external OTP provider
|
||||
return otpClient.sendOtp(request.getMobile());
|
||||
}
|
||||
|
||||
@Override
|
||||
public AuthResponses verifyOtp(VerifyOtpRequest request) {
|
||||
public ResponseModel<?> verifyOtp(VerifyOtpRequest request) {
|
||||
boolean ok = otpClient.verifyOtp(request.getMobile(), request.getOtp());
|
||||
LOGGER.info("OTP STATUS" + ok);
|
||||
if (ok) {
|
||||
return new AuthResponses("", "Invalid OTP", "Failed", 401, null);
|
||||
LOGGER.info("OTP STATUS {}", ok);
|
||||
if (!ok) {
|
||||
return ResponseModel.builder().message("Invalid OTP").status("Failure").statusCode(401).data(null).build();
|
||||
}
|
||||
String mobileNo = request.getMobile();
|
||||
try {
|
||||
Optional<UserEntity> byMobileNumber = userRepository.findByMobile(mobileNo);
|
||||
|
||||
Optional<UserEntity> byAdminEmail = userRepo.findByMobile(mobileNo);
|
||||
|
||||
if (byAdminEmail.isPresent()) {
|
||||
UserEntity user = byAdminEmail.get();
|
||||
if (byMobileNumber.isPresent()) {
|
||||
UserEntity user = byMobileNumber.get();
|
||||
String token = jwtUtil.generateToken(user.getMobile());
|
||||
|
||||
LOGGER.info("Generated JWT token for mobileNo: " + mobileNo);
|
||||
@@ -82,82 +88,92 @@ public class AuthServiceImpl implements AuthService {
|
||||
userDetailsDTO = UserDetailsDTO.builder().id(user.getId()).userEmailId(user.getEmail())
|
||||
.userMobNo(user.getMobile()).userName(user.getName()).userAge(user.getAge()).build();
|
||||
}
|
||||
return new AuthResponses(token, "Success", "Login Done", 200, userDetailsDTO);
|
||||
|
||||
AuthResponses authResp = new AuthResponses(token, "Success", "Login Success", 200, userDetailsDTO);
|
||||
return ResponseModel.builder().message("Login Success").status("Success").statusCode(200).data(authResp)
|
||||
.build();
|
||||
} else {
|
||||
return new AuthResponses("", "User Not Found", "Authentication failed", 401, null);
|
||||
AuthResponses authResp = new AuthResponses("", "User Not Found", "Authentication failed", 401, null);
|
||||
return ResponseModel.builder().message("User Not Found").status("Failure").statusCode(401)
|
||||
.data(authResp).build();
|
||||
}
|
||||
|
||||
} catch (Exception ex) {
|
||||
System.out.println(
|
||||
"Error occurred during login for mobile no: " + mobileNo + " Exception: " + ex.getMessage());
|
||||
|
||||
return AuthResponses.builder().status("Unauthorized").message("Authentication failed: " + ex.getMessage())
|
||||
.statusCode(401).build();
|
||||
LOGGER.error("Error occurred during login for mobile no: {} Exception: {}", mobileNo, ex.getMessage(), ex);
|
||||
return ResponseModel.builder().message("Authentication failed: " + ex.getMessage()).status("Failure")
|
||||
.statusCode(500).data(null).build();
|
||||
}
|
||||
|
||||
// Optional<UserEntity> userOpt = userRepository.findByMobile(request.getMobile());
|
||||
// if (userOpt.isPresent()) {
|
||||
// UserEntity user = userOpt.get();
|
||||
// UserDto dto = new UserDto(user.getId(), user.getMobile(), user.getName(), user.getEmail(), user.getAge());
|
||||
// return new AuthResponse(true, "Login successful", true, dto);
|
||||
// } else {
|
||||
// return new AuthResponse(true, "OTP verified; user not found - proceed to registration", false, null);
|
||||
// }
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public AuthResponse registerUser(RegisterRequest request) {
|
||||
Optional<UserEntity> existing = userRepository.findByMobile(request.getMobile());
|
||||
if (existing.isPresent()) {
|
||||
UserEntity u = existing.get();
|
||||
UserDto dto = new UserDto(u.getId(), u.getMobile(), u.getName(), u.getEmail(), u.getAge());
|
||||
return new AuthResponse(false, "User already exists", true, dto);
|
||||
}
|
||||
public ResponseModel<?> registerUser(RegisterRequest request) {
|
||||
try {
|
||||
Optional<UserEntity> existing = userRepository.findByMobile(request.getMobile());
|
||||
if (existing.isPresent()) {
|
||||
UserEntity u = existing.get();
|
||||
UserDto dto = new UserDto(u.getId(), u.getMobile(), u.getName(), u.getEmail(), u.getAge());
|
||||
AuthResponse ar = new AuthResponse(false, "User already exists", true, dto);
|
||||
return ResponseModel.builder().message(ar.getMessage()).status("Failure").statusCode(409).data(ar)
|
||||
.build();
|
||||
}
|
||||
|
||||
UserEntity user = helper.createNewUser(request);
|
||||
user = userRepository.save(user);
|
||||
UserDto dto = new UserDto(user.getId(), user.getMobile(), user.getName(), user.getEmail(), user.getAge());
|
||||
return new AuthResponse(true, "Registration successful", true, dto);
|
||||
UserEntity newUser = new UserEntity(request.getMobile(), request.getName(), request.getEmail(),
|
||||
request.getAge());
|
||||
userRepository.save(newUser);
|
||||
String token = jwtUtil.generateToken(newUser.getMobile());
|
||||
UserDto dto = new UserDto(newUser.getId(), newUser.getMobile(), newUser.getName(), newUser.getEmail(),
|
||||
newUser.getAge());
|
||||
AuthResponse ar = new AuthResponse(true, "user registed sucessfully", token);
|
||||
return ResponseModel.builder().message(ar.getMessage()).status("Success").statusCode(201).data(ar).build();
|
||||
} catch (Exception ex) {
|
||||
LOGGER.error("Error in registerUser: {}", ex.getMessage(), ex);
|
||||
return ResponseModel.builder().message("An unexpected error occurred while registering user")
|
||||
.status("Failure").statusCode(500).data(null).build();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseModel<?> authenticateUser(LoginRequest loginRequest) {
|
||||
LOGGER.info("Processing login for Request: {}", loginRequest);
|
||||
|
||||
try {
|
||||
String mobileNo = loginRequest.getMobile();
|
||||
|
||||
Optional<UsersDetails> byMobileNo = userRepo.findByUserMobNo(mobileNo);
|
||||
|
||||
if (byMobileNo.isPresent()) {
|
||||
UsersDetails user = (UsersDetails) byMobileNo.get();
|
||||
String token = jwtUtil.generateToken(user.getUserMobNo());
|
||||
|
||||
LOGGER.info("Generated JWT token for mobileNo: " + mobileNo);
|
||||
|
||||
Object userDetailsDTO = null;
|
||||
|
||||
if (user != null) {
|
||||
userDetailsDTO = UserDetailsDTO.builder().id(user.getId()).userEmailId(user.getUserEmailId())
|
||||
.userMobNo(user.getUserMobNo()).userName(user.getUserName()).userAge(user.getUserAge())
|
||||
.build();
|
||||
}
|
||||
AuthResponses authResp = new AuthResponses(token, "Success", "Login Done", 200, userDetailsDTO);
|
||||
return ResponseModel.builder().message("Login Done").status("Success").statusCode(200).data(authResp)
|
||||
.build();
|
||||
} else {
|
||||
AuthResponses authResp = new AuthResponses("", "User Not Found", "Authentication failed", 401, null);
|
||||
return ResponseModel.builder().message("User Not Found").status("Failure").statusCode(401)
|
||||
.data(authResp).build();
|
||||
}
|
||||
|
||||
} catch (Exception ex) {
|
||||
LOGGER.error("Error occurred during login for mobile no: {} Exception: {}", loginRequest.getMobile(),
|
||||
ex.getMessage(), ex);
|
||||
return ResponseModel.builder().message("Authentication failed: " + ex.getMessage()).status("Failure")
|
||||
.statusCode(500).data(null).build();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserEntity findByMobile(String mobile) {
|
||||
return userRepository.findByMobile(mobile).orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AuthResponses authenticateUser(LoginRequest loginRequest) {
|
||||
LOGGER.info("Processing login for Request: " + loginRequest);
|
||||
|
||||
try {
|
||||
String mobileNo = loginRequest.getMobile();
|
||||
|
||||
Optional<UserEntity> byAdminEmail = userRepo.findByMobile(mobileNo);
|
||||
|
||||
if (byAdminEmail.isPresent()) {
|
||||
UserEntity user = byAdminEmail.get();
|
||||
String token = jwtUtil.generateToken(user.getMobile());
|
||||
|
||||
LOGGER.info("Generated JWT token for mobileNo: " + mobileNo);
|
||||
|
||||
Object userDetailsDTO = null;
|
||||
|
||||
if (user != null) {
|
||||
userDetailsDTO = UserDetailsDTO.builder().id(user.getId()).userEmailId(user.getEmail())
|
||||
.userMobNo(user.getMobile()).userName(user.getName()).userAge(user.getAge()).build();
|
||||
}
|
||||
return new AuthResponses(token, "Success", "Login Done", 200, userDetailsDTO);
|
||||
} else {
|
||||
return new AuthResponses("", "User Not Found", "Authentication failed", 401, null);
|
||||
}
|
||||
|
||||
} catch (Exception ex) {
|
||||
System.out.println("Error occurred during login for mobile no: " + loginRequest.getMobile() + " Exception: "
|
||||
+ ex.getMessage());
|
||||
|
||||
return AuthResponses.builder().status("Unauthorized").message("Authentication failed: " + ex.getMessage())
|
||||
.statusCode(401).build();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user