[UPDATE] 調整註冊和OTP登入的流程

Jack

2021-11-26 bdcaac32492b5e6223fef4304f4d86403e877022

 pamapi/src/main/java/com/pollex/pam/service/CustomerService.java

@@ -5,6 +5,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.pollex.pam.domain.Customer;
import com.pollex.pam.domain.OtpTmp;
@@ -15,6 +16,7 @@
import com.pollex.pam.service.mapper.CustomerDTOMapper;

@Service
@Transactional
public class CustomerService {
   
   @Autowired
@@ -33,7 +35,7 @@
      return customerRepository.save(customer);
   }
   
   public String registerCustomer(CustomerRegisterDTO registDTO) {
   public Customer registerCustomer(CustomerRegisterDTO registDTO) {
      boolean isCustomerExist = checkCustomerExist(registDTO);
      if(isCustomerExist) {
         throw new UsernameAlreadyUsedException();
@@ -45,10 +47,11 @@
          if(otpTmp.getStatus() == OtpTmpStatusEnum.VERRIFIED) {
             Customer customer = customerDTOMapper.toCustomer(registDTO);
              save(customer);
              String jwt = customerAuthService.authorize(account, registDTO.getIndexKey(), registDTO.getOtpCode());
              return jwt;
              return customer;
          }else {
             throw new UsernameNotFoundException("Otp record not found");
             throw new IllegalArgumentException("Invalid indexKey state error. IndexKey: "
                   + registDTO.getIndexKey()
                   + " => status: " + otpTmp.getStatus());
          }
      }