|
|
@ -5,6 +5,7 @@ import kr.co.palnet.kac.api.v1.user.account.model.PtyCstmrDtlDTO; |
|
|
|
import kr.co.palnet.kac.api.v1.user.account.model.detail.SearchUserRS; |
|
|
|
import kr.co.palnet.kac.api.v1.user.account.model.detail.SearchUserRS; |
|
|
|
import kr.co.palnet.kac.api.v1.user.account.model.register.FormRegisterRQ; |
|
|
|
import kr.co.palnet.kac.api.v1.user.account.model.register.FormRegisterRQ; |
|
|
|
import kr.co.palnet.kac.api.v1.user.account.model.register.AgreeTermsModel; |
|
|
|
import kr.co.palnet.kac.api.v1.user.account.model.register.AgreeTermsModel; |
|
|
|
|
|
|
|
import kr.co.palnet.kac.api.v1.user.account.model.update.UpdatePasswordRQ; |
|
|
|
import kr.co.palnet.kac.config.security.util.SessionHelper; |
|
|
|
import kr.co.palnet.kac.config.security.util.SessionHelper; |
|
|
|
import kr.co.palnet.kac.core.exception.BaseErrorCode; |
|
|
|
import kr.co.palnet.kac.core.exception.BaseErrorCode; |
|
|
|
import kr.co.palnet.kac.core.exception.BaseException; |
|
|
|
import kr.co.palnet.kac.core.exception.BaseException; |
|
|
@ -44,11 +45,8 @@ public class UserAccountService { |
|
|
|
PtyCstmrBas registeredUser = ptyCstmrDomainService.getCstmrInfoByUserId(rq.getUserId()); |
|
|
|
PtyCstmrBas registeredUser = ptyCstmrDomainService.getCstmrInfoByUserId(rq.getUserId()); |
|
|
|
if(registeredUser != null) throw new BaseException(BaseErrorCode.DATA_ALREADY_EXISTS); |
|
|
|
if(registeredUser != null) throw new BaseException(BaseErrorCode.DATA_ALREADY_EXISTS); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
rq.setHpno(rq.getHpno().replaceAll("-", "")); |
|
|
|
rq.setHpno(rq.getHpno().replaceAll("-", "")); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//처리 1. 민감정보 암호화 처리(비밀번호 , 이름 , 휴대폰번호 , 이메일)
|
|
|
|
//처리 1. 민감정보 암호화 처리(비밀번호 , 이름 , 휴대폰번호 , 이메일)
|
|
|
|
rq.setUserPswd(passwordEncoder.encode(rq.getUserPswd())); |
|
|
|
rq.setUserPswd(passwordEncoder.encode(rq.getUserPswd())); |
|
|
|
rq.setHpno(EncryptUtil.encrypt(rq.getHpno())); |
|
|
|
rq.setHpno(EncryptUtil.encrypt(rq.getHpno())); |
|
|
@ -164,7 +162,7 @@ public class UserAccountService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public SearchUserRS profile() { |
|
|
|
public SearchUserRS getUserInfo() { |
|
|
|
|
|
|
|
|
|
|
|
Long cstmrSno = SessionHelper.getCstmrSno(); |
|
|
|
Long cstmrSno = SessionHelper.getCstmrSno(); |
|
|
|
|
|
|
|
|
|
|
@ -180,8 +178,8 @@ public class UserAccountService { |
|
|
|
result.setUserId(userEntity.getUserId()); |
|
|
|
result.setUserId(userEntity.getUserId()); |
|
|
|
result.setBrthdyDate(userDetailEntity.getBrthdyDate()); |
|
|
|
result.setBrthdyDate(userDetailEntity.getBrthdyDate()); |
|
|
|
result.setCntryCd(userDetailEntity.getCntryCd()); |
|
|
|
result.setCntryCd(userDetailEntity.getCntryCd()); |
|
|
|
result.setEmail(userDetailEntity.getEmail()); |
|
|
|
result.setEmail(EncryptUtil.decrypt(userDetailEntity.getEmail())); |
|
|
|
result.setHpno(userDetailEntity.getHpno()); |
|
|
|
result.setHpno(EncryptUtil.decrypt(userDetailEntity.getHpno())); |
|
|
|
result.setUpdateDt(userDetailEntity.getUpdateDt()); |
|
|
|
result.setUpdateDt(userDetailEntity.getUpdateDt()); |
|
|
|
result.setUpdateuserId(userDetailEntity.getUpdateUserId()); |
|
|
|
result.setUpdateuserId(userDetailEntity.getUpdateUserId()); |
|
|
|
result.setCptAuthCode(userEntity.getCptAuthCode()); |
|
|
|
result.setCptAuthCode(userEntity.getCptAuthCode()); |
|
|
@ -191,4 +189,36 @@ public class UserAccountService { |
|
|
|
throw new BaseException(BaseErrorCode.DATA_EMPTY); |
|
|
|
throw new BaseException(BaseErrorCode.DATA_EMPTY); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional |
|
|
|
|
|
|
|
public void updatePassword(UpdatePasswordRQ rq) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 1. 토큰 유저 정보 불러오기
|
|
|
|
|
|
|
|
Long cstmrSno = SessionHelper.getCstmrSno(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 2. DB의 유저정보 조회
|
|
|
|
|
|
|
|
Optional<PtyCstmrBas> userEntityData = ptyCstmrDomainService.findPtyCstmrBasById(cstmrSno); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(userEntityData.isEmpty()) throw new BaseException(BaseErrorCode.DATA_EMPTY); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 5. 새로운 비밀번호 검증
|
|
|
|
|
|
|
|
if(!rq.getNewPswd().equals(rq.getNewPswdConfirm())) { |
|
|
|
|
|
|
|
// 5.e 새로운 비밀번호 일치하지 않으면 예외처리
|
|
|
|
|
|
|
|
throw new BaseException(BaseErrorCode.FAILED); //임시...수정필요
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 6. 새로운 패스워드 암호화
|
|
|
|
|
|
|
|
String encryptNewPwd = passwordEncoder.encode(rq.getNewPswd()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PtyCstmrBas userEntity = userEntityData.get(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 7. 유저 정보 저장
|
|
|
|
|
|
|
|
userEntity.setUserPswd(encryptNewPwd); |
|
|
|
|
|
|
|
userEntity.setPswdUpdtDt(LocalDateTime.now()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ptyCstmrDomainService.savePtyCstmrBas(userEntity); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|