added login with otp and verify otp
This commit is contained in:
@@ -270,7 +270,7 @@ public class AgentServiceImpl implements AgentService {
|
||||
String apiName = BBPSConstant.API_INITIATE_BILL_VALIDATE;
|
||||
String reqId = fetchBillValidateRequest.getReqId();
|
||||
String mid = fetchBillValidateRequest.getMid();
|
||||
LOGGER.info("[{}] START | reqId={} | mid={} | billerId={}", apiName, fetchBillValidateRequest, mid,
|
||||
LOGGER.info("[{}] START | reqId={} | mid={} | billerId={}", apiName, fetchBillValidateRequest.getReqId(), mid,
|
||||
fetchBillValidateRequest.getBillerId());
|
||||
String txnId = helper.generateTxnId(15);
|
||||
String fullUrl = agentDtaUrl + BBPSConstant.BILLER_VALIDATE_URL;
|
||||
@@ -395,8 +395,6 @@ public class AgentServiceImpl implements AgentService {
|
||||
helper.updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
|
||||
System.out.println("responseWrapper:" + responseWrapper);
|
||||
mapperHelper.saveBillValidation(responseWrapper, billRequest);
|
||||
LOGGER.info("Bill data saved successfully for billId: {}", billId);
|
||||
|
||||
return new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
|
||||
Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
|
||||
} catch (JsonProcessingException e) {
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
package com.billpaymentservice.bbps.serviceImpl;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.billpaymentservice.bbps.dto.auth.AuthResponse;
|
||||
import com.billpaymentservice.bbps.dto.auth.LoginRequest;
|
||||
import com.billpaymentservice.bbps.dto.auth.OtpSendResponse;
|
||||
import com.billpaymentservice.bbps.dto.auth.RegisterRequest;
|
||||
import com.billpaymentservice.bbps.dto.auth.UserDto;
|
||||
import com.billpaymentservice.bbps.dto.auth.VerifyOtpRequest;
|
||||
import com.billpaymentservice.bbps.entites.UserEntity;
|
||||
import com.billpaymentservice.bbps.repository.UserRepository;
|
||||
import com.billpaymentservice.bbps.service.AuthService;
|
||||
import com.billpaymentservice.bbps.util.Helper;
|
||||
import com.billpaymentservice.bbps.util.OtpClient;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
@Service
|
||||
public class AuthServiceImpl implements AuthService {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(AuthServiceImpl.class);
|
||||
|
||||
private final UserRepository userRepository;
|
||||
private final OtpClient otpClient;
|
||||
private final Helper helper ;
|
||||
|
||||
@Autowired
|
||||
public AuthServiceImpl(UserRepository userRepository, OtpClient otpClient,Helper helper) {
|
||||
this.userRepository = userRepository;
|
||||
this.otpClient = otpClient;
|
||||
this.helper = helper;
|
||||
}
|
||||
|
||||
@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;
|
||||
}
|
||||
// delegate to external OTP provider
|
||||
return otpClient.sendOtp(request.getMobile());
|
||||
}
|
||||
|
||||
@Override
|
||||
public AuthResponse verifyOtp(VerifyOtpRequest request) {
|
||||
boolean ok = otpClient.verifyOtp(request.getMobile(), request.getOtp());
|
||||
if (!ok) {
|
||||
return new AuthResponse(false, "Invalid OTP", false, null);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserEntity findByMobile(String mobile) {
|
||||
return userRepository.findByMobile(mobile).orElse(null);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user