From 73d2e2d19016e6c2a1164735b64d32eff1c91979 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 13 一月 2022 09:16:27 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
pamapi/src/main/java/com/pollex/pam/security/provider/OtpAuthenticationProvider.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/security/provider/OtpAuthenticationProvider.java b/pamapi/src/main/java/com/pollex/pam/security/provider/OtpAuthenticationProvider.java
index 100a2f8..3802087 100644
--- a/pamapi/src/main/java/com/pollex/pam/security/provider/OtpAuthenticationProvider.java
+++ b/pamapi/src/main/java/com/pollex/pam/security/provider/OtpAuthenticationProvider.java
@@ -1,16 +1,14 @@
package com.pollex.pam.security.provider;
+import com.pollex.pam.web.rest.errors.CustomerNotRegisteredException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.stereotype.Component;
import com.pollex.pam.domain.Customer;
-import com.pollex.pam.domain.OtpTmp;
-import com.pollex.pam.enums.OtpTmpStatusEnum;
import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.security.token.OtpAuthenticationToken;
import com.pollex.pam.service.CustomerAuthService;
@@ -25,13 +23,13 @@
@Autowired
CustomerAuthService customerAuthService;
-
+
@Autowired
CustomerRepository customerRepository;
-
+
@Autowired
OtpTmpService otpTmpService;
-
+
@Autowired
OtpUtilService otpUtilService;
@@ -41,26 +39,15 @@
String indexKey = otpAccount.getIndexKey();
String otpCode = otpAuthenticationToken.getCredentials();
- otpUtilService.verifyOtp(indexKey, otpCode);
-
- setVerrifiedOtpTmp(account, indexKey);
-
+ otpUtilService.verifyOtp(account, indexKey, otpCode);
Customer customer = customerRepository.findOneByEmailEqualsOrPhoneEquals(account)
.orElse(null);
-
+
if (customer == null) {
- throw new AuthenticationCredentialsNotFoundException("");
+ throw new CustomerNotRegisteredException();
}
-
+
return customerAuthService.buildCustomerAuthToken(customer, otpCode, indexKey);
}
-
- private void setVerrifiedOtpTmp(String account, String indexKey) {
- OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, indexKey);
- otpTmp.setStatus(OtpTmpStatusEnum.VERRIFIED);
- otpTmpService.save(otpTmp);
- }
-
-
}
--
Gitblit v1.8.0