From aa109c6e83f23a3c81ccc4645ce233492364307d Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期一, 18 七月 2022 23:06:16 +0800
Subject: [PATCH] [UPDATE] 驗證碼驗證失敗改為回傳401 [BUG] 調整spring security設定

---
 pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java |   23 +++++++++--------------
 1 files changed, 9 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 a0d7494..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.errors.OtpLoginFailException;
-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.service.dto.OtpResponseDTO;
+import com.pollex.pam.business.service.dto.OtpResponseDTO;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
@@ -28,9 +28,6 @@
     @Autowired
     OtpTmpService otpTmpService;
 
-    @Autowired
-    LoginRecordService loginRecordService;
-
     @Transactional
     public void verifyOtp(VerifyOtpVM verifyOtpParam) {
         verifyOtp(verifyOtpParam.getAccount(), verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode());
@@ -43,15 +40,13 @@
         } else {  // otp logon
             OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode);
             if (otpResponseDTO.isSuccess()) {
-                log.info("otp login success!");
+                log.info("otp login success!, account = {}", account);
             }
             else {
-                log.info("otp login fail... , account = {}, failReason = {}", account, otpResponseDTO.getFailReason());
-                loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason());
-                throw new OtpLoginFailException(otpResponseDTO.getFailReason());
+                log.info("otp login fail... , account = {}, error code = {}, failReason = {}", account, otpResponseDTO.getFailCode(), otpResponseDTO.getFailReason());
+                throw new OtpLoginFailException(otpResponseDTO.getFailCode());
             }
         }
-        loginRecordService.saveOTPLoginSuccessRecord(account);
         setVerrifiedOtpTmp(account, indexKey);
     }
 

--
Gitblit v1.8.0