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/web/rest/OtpResource.java |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java
index 98625a2..c1ce7be 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java
@@ -73,8 +73,23 @@
     @Autowired
     CustomerRepository customerRepository;
 
-    @PostMapping("/sendOtp")
-    public ResponseEntity<Object> sendOtp(@RequestBody OtpLoginVM login) {
+    @PostMapping("/sendOtp/{imgCode}")
+    public ResponseEntity<Object> sendOtp(@RequestBody OtpLoginVM login
+    		, @RequestBody VerifyOtpVM verifyOtpParam
+    		, @PathVariable String imgCode, HttpServletRequest request) {
+    	
+    	HttpSession session = request.getSession();
+    	String sessionImpCode = (String) session.getAttribute("img_code");
+    	
+    	if (!StringUtils.hasText(sessionImpCode)
+				|| !StringUtils.hasText(imgCode)) {
+    		throw new OtpLoginFailException("撽�Ⅳ頛詨�隤�");
+		}
+    	
+    	if(!imgCode.equals(sessionImpCode)) {
+    		throw new OtpLoginFailException("撽�Ⅳ頛詨�隤�");
+    	}
+    	
     	OtpResponseDTO otpResponse;
         if(applicationProperty.isMockLogin()) {
             otpResponse = getMockSendOtpResponse();
@@ -91,20 +106,10 @@
     }
 
     @AuditLoggingInject(type = CUSTOMER_LOGIN)
-    @PostMapping("/verify/{imgCode}")
+    @PostMapping("/verify")
     public ResponseEntity<UserJWTController.JWTToken> verifyOtp(@RequestBody VerifyOtpVM verifyOtpParam
-    		, @PathVariable String imgCode, HttpServletRequest request) {
-    	HttpSession session = request.getSession();
-    	String sessionImpCode = (String) session.getAttribute("img_code");
+    		) {
     	
-    	if (!StringUtils.hasText(sessionImpCode)
-				|| !StringUtils.hasText(imgCode)) {
-    		throw new OtpLoginFailException("撽�Ⅳ頛詨�隤�");
-		}
-    	
-    	if(!imgCode.equals(sessionImpCode)) {
-    		throw new OtpLoginFailException("撽�Ⅳ頛詨�隤�");
-    	}
     	
     	otpUtilService.verifyOtp(verifyOtpParam);
 

--
Gitblit v1.8.0