From 41bc5df9cda6a43ef47313622dd1ffde1480d06f Mon Sep 17 00:00:00 2001 From: KillerADO <wayne8692wayne8692@gmail.com> Date: 星期四, 23 十二月 2021 10:49:04 +0800 Subject: [PATCH] [update] 調整簡訊的service url與新增簡訊的標題欄位 --- pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java | 64 ++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 20 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java index 521510f..868901a 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java @@ -1,5 +1,9 @@ package com.pollex.pam.service; +import com.pollex.pam.domain.OtpTmp; +import com.pollex.pam.enums.OtpTmpStatusEnum; +import com.pollex.pam.web.rest.errors.OtpLoginFailException; +import com.pollex.pam.web.rest.vm.VerifyOtpVM; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -7,35 +11,55 @@ import org.springframework.stereotype.Service; import com.pollex.pam.config.ApplicationProperties; -import com.pollex.pam.security.provider.OtpAuthenticationProvider; import com.pollex.pam.service.dto.OtpResponseDTO; +import org.springframework.transaction.annotation.Transactional; @Service public class OtpUtilService { - + private static final Logger log = LoggerFactory.getLogger(OtpUtilService.class); @Autowired ApplicationProperties applicationProperty; - + @Autowired OtpWebService otpWebService; - - public void verifyOtp(String indexKey, String otpCode) { - if(applicationProperty.isMockLogin()){ - return; - } - - try { - OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode); - if (!otpResponseDTO.isSuccess()) { - throw new AuthenticationCredentialsNotFoundException(""); - } - } catch (Exception e) { - log.error("Exception: ", e); - throw new AuthenticationCredentialsNotFoundException(""); - } - - + + @Autowired + OtpTmpService otpTmpService; + + @Autowired + LoginRecordService loginRecordService; + + @Transactional + public void verifyOtp(VerifyOtpVM verifyOtpParam) { + verifyOtp(verifyOtpParam.getAccount(), verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode()); } + + @Transactional + public void verifyOtp(String account, String indexKey, String otpCode) { + if (applicationProperty.isMockLogin()) { + log.debug("Do MockLogin"); + } else { // otp logon + OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode); + if (otpResponseDTO.isSuccess()) { + log.info("otp login success!, account = {}", account); + } + else { + log.info("otp login fail... , account = {}, error code = {}, failReason = {}", account, otpResponseDTO.getFailCode(), otpResponseDTO.getFailReason()); + loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason()); + throw new OtpLoginFailException(otpResponseDTO.getFailCode()); + } + } + loginRecordService.saveOTPLoginSuccessRecord(account); + setVerrifiedOtpTmp(account, indexKey); + } + + private void setVerrifiedOtpTmp(String account, String indexKey) { + OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, indexKey); + otpTmp.setStatus(OtpTmpStatusEnum.VERRIFIED); + otpTmpService.save(otpTmp); + } + + } -- Gitblit v1.8.0