From e93c2fa0d3f054f6dd5adef5ecce0c4e58a5ffa9 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期五, 26 十一月 2021 19:30:55 +0800 Subject: [PATCH] [update] 調整OtpVerify需寫入至Otp_tmp table中 --- pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 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..c9a949f 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,8 @@ package com.pollex.pam.service; +import com.pollex.pam.domain.OtpTmp; +import com.pollex.pam.enums.OtpTmpStatusEnum; +import com.pollex.pam.web.rest.vm.VerifyOtpVM; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -9,33 +12,50 @@ 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; - } - + + @Autowired + OtpTmpService otpTmpService; + + @Transactional + public void verifyOtp(VerifyOtpVM verifyOtpParam) { + verifyOtp(verifyOtpParam.getAccount(), verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode()); + } + + @Transactional + public void verifyOtp(String account, String indexKey, String otpCode) { try { - OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode); - if (!otpResponseDTO.isSuccess()) { - throw new AuthenticationCredentialsNotFoundException(""); - } + if(applicationProperty.isMockLogin()){ + log.debug("Do MockLogin"); + } else { // otp logon + OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode); + if (!otpResponseDTO.isSuccess()) { + throw new AuthenticationCredentialsNotFoundException(""); + } + } + setVerrifiedOtpTmp(account, indexKey); } catch (Exception e) { log.error("Exception: ", e); throw new AuthenticationCredentialsNotFoundException(""); } - - } + + private void setVerrifiedOtpTmp(String account, String indexKey) { + OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, indexKey); + otpTmp.setStatus(OtpTmpStatusEnum.VERRIFIED); + otpTmpService.save(otpTmp); + } + + } -- Gitblit v1.8.0