Globots/bbps-backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated code mohd arham

Browse Source
This commit is contained in:
Mohd-Arham
2025-11-27 14:41:07 +05:30
parent 72332d6f99
commit b33d658834
10 changed files with 108 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/billpaymentservice/bbps/serviceImpl/AuthServiceImpl.java
+18 -23
View File
@@ -16,7 +16,6 @@ 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;
@@ -37,14 +36,13 @@ public class AuthServiceImpl implements AuthService {
private final JwtUtil jwtUtil;
@Autowired
public AuthServiceImpl(UserRepository userRepository, OtpClient otpClient, Helper helper,
UsersDetailsRepository userRepo, JwtUtil jwtUtil) {
this.userRepository = userRepository;
this.otpClient = otpClient;
this.helper = helper;
this.userRepo=userRepo;
this.jwtUtil=jwtUtil;
this.userRepo = userRepo;
this.jwtUtil = jwtUtil;
}
@Override
@@ -63,28 +61,26 @@ public class AuthServiceImpl implements AuthService {
@Override
public AuthResponses verifyOtp(VerifyOtpRequest request) {
boolean ok = otpClient.verifyOtp(request.getMobile(), request.getOtp());
LOGGER.info("OTP STATUS"+ ok);
LOGGER.info("OTP STATUS" + ok);
if (ok) {
return new AuthResponses("","Invalid OTP","Failed", 401, null);
return new AuthResponses("", "Invalid OTP", "Failed", 401, null);
}
String mobileNo = request.getMobile();
try {
Optional<UsersDetails> byAdminEmail = userRepo.findByUserMobNo(mobileNo);
Optional<UserEntity> byAdminEmail = userRepo.findByMobile(mobileNo);
if (byAdminEmail.isPresent()) {
UsersDetails user = byAdminEmail.get();
String token = jwtUtil.generateToken(user.getUserMobNo());
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.getUserEmailId())
.userMobNo(user.getUserMobNo()).userName(user.getUserName()).userAge(user.getUserAge())
.build();
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 {
@@ -92,8 +88,8 @@ public class AuthServiceImpl implements AuthService {
}
} catch (Exception ex) {
System.out.println("Error occurred during login for mobile no: " + mobileNo
+ " Exception: " + ex.getMessage());
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();
@@ -137,20 +133,19 @@ public class AuthServiceImpl implements AuthService {
try {
String mobileNo = loginRequest.getMobile();
Optional<UsersDetails> byAdminEmail = userRepo.findByUserMobNo(mobileNo);
Optional<UserEntity> byAdminEmail = userRepo.findByMobile(mobileNo);
if (byAdminEmail.isPresent()) {
UsersDetails user = byAdminEmail.get();
String token = jwtUtil.generateToken(user.getUserMobNo());
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.getUserEmailId())
.userMobNo(user.getUserMobNo()).userName(user.getUserName()).userAge(user.getUserAge())
.build();
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 {
@@ -158,8 +153,8 @@ public class AuthServiceImpl implements AuthService {
}
} catch (Exception ex) {
System.out.println("Error occurred during login for mobile no: " + loginRequest.getMobile()
+ " Exception: " + ex.getMessage());
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();