From 63a3c3c6b95630cce868fd193eaff1487de4ead7 Mon Sep 17 00:00:00 2001 From: jack <jack.su@pollex.com.tw> Date: 星期三, 20 七月 2022 13:53:17 +0800 Subject: [PATCH] [UPDATE] 客戶登入發送手機/email驗證碼的時候須加上img code驗證碼避免重複發送簡訊的問題 --- pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 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 c9a949f..ff21125 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java @@ -1,17 +1,17 @@ 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 com.pollex.pam.business.domain.OtpTmp; +import com.pollex.pam.business.enums.OtpTmpStatusEnum; +import com.pollex.pam.business.service.OtpTmpService; +import com.pollex.pam.business.web.errors.OtpLoginFailException; +import com.pollex.pam.business.web.vm.VerifyOtpVM; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; 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 com.pollex.pam.business.service.dto.OtpResponseDTO; import org.springframework.transaction.annotation.Transactional; @Service @@ -35,20 +35,19 @@ @Transactional public void verifyOtp(String account, String indexKey, String otpCode) { - try { - if(applicationProperty.isMockLogin()){ - log.debug("Do MockLogin"); - } else { // otp logon - 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()) { + log.info("otp login success!, account = {}", account); } - setVerrifiedOtpTmp(account, indexKey); - } catch (Exception e) { - log.error("Exception: ", e); - throw new AuthenticationCredentialsNotFoundException(""); + else { + log.info("otp login fail... , account = {}, error code = {}, failReason = {}", account, otpResponseDTO.getFailCode(), otpResponseDTO.getFailReason()); + throw new OtpLoginFailException(otpResponseDTO.getFailCode()); + } } + setVerrifiedOtpTmp(account, indexKey); } private void setVerrifiedOtpTmp(String account, String indexKey) { -- Gitblit v1.8.0