From cc752b0680d6f4975b14a3cdc2b8922e8d3bf0ee Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 29 十一月 2021 19:56:39 +0800
Subject: [PATCH] [update] Otp認證錯誤代碼規格調整

---
 pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 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 be48bd2..a0d7494 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
@@ -2,6 +2,7 @@
 
 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;
@@ -37,25 +38,21 @@
 
     @Transactional
     public void verifyOtp(String account, String indexKey, String otpCode) {
-    	try {
-            if(applicationProperty.isMockLogin()){
-                loginRecordService.saveOTPLoginSuccessRecord(account);
-                log.debug("Do MockLogin");
-            } else {  // otp logon
-                OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode);
-                if (otpResponseDTO.isSuccess()) {
-                    loginRecordService.saveOTPLoginSuccessRecord(account);
-                }
-                else {
-                    loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason());
-                    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!");
             }
-            setVerrifiedOtpTmp(account, indexKey);
-    	} catch (Exception e) {
-            log.error("Exception: ", e);
-            throw new AuthenticationCredentialsNotFoundException("");
+            else {
+                log.info("otp login fail... , account = {}, failReason = {}", account, otpResponseDTO.getFailReason());
+                loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason());
+                throw new OtpLoginFailException(otpResponseDTO.getFailReason());
+            }
         }
+        loginRecordService.saveOTPLoginSuccessRecord(account);
+        setVerrifiedOtpTmp(account, indexKey);
     }
 
     private void setVerrifiedOtpTmp(String account, String indexKey) {

--
Gitblit v1.8.0