From b832880e1fcf3307387d53106078498f68a95853 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 05 三月 2024 16:59:02 +0800
Subject: [PATCH] 移除TestLoginResource
---
pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 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..c8dc2af 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
@@ -1,41 +1,71 @@
package com.pollex.pam.service;
+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
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;
+
+ @Transactional
+ public void verifyOtp(VerifyOtpVM verifyOtpParam) {
+ verifyOtp(verifyOtpParam.getAccount(), verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode());
}
+
+ @Transactional
+ public void verifyOtp(String account, String indexKey, String otpCode) {
+
+ OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, indexKey);
+ if(otpTmp==null) {
+ log.info("otp login fail... , account = {}, indexKey = {}, failReason = {}", account, indexKey, "Index key and account field mismatch");
+ throw new OtpLoginFailException("otp error");
+ }
+
+ 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());
+ throw new OtpLoginFailException(otpResponseDTO.getFailCode());
+ }
+ }
+ setVerrifiedOtpTmp(account, indexKey);
+ }
+
+ private void setVerrifiedOtpTmp(String account, String indexKey) {
+ OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, indexKey);
+ if(otpTmp!=null) {
+ otpTmp.setStatus(OtpTmpStatusEnum.VERRIFIED);
+ otpTmpService.save(otpTmp);
+ }
+
+ }
+
+
}
--
Gitblit v1.8.0