From 87ee7d283fef938b6e99beab7d67a611509db30d Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期二, 28 十二月 2021 15:24:37 +0800
Subject: [PATCH] [BUG] 修正顧問資料修改地址失敗的問題
---
pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 ec15bcb..883c80a 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
@@ -3,6 +3,7 @@
import java.util.Arrays;
import java.util.UUID;
+import com.pollex.pam.web.rest.errors.CustomerNotRegisteredException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,10 +58,10 @@
@Autowired
CustomerService customerService;
-
+
@Autowired
OtpUtilService otpUtilService;
-
+
@Autowired
CustomerRepository customerRepository;
@@ -83,16 +84,16 @@
@PostMapping("/verify")
public ResponseEntity<UserJWTController.JWTToken> verifyOtp(@RequestBody VerifyOtpVM verifyOtpParam) {
- otpUtilService.verifyOtp(verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode());
-
+ otpUtilService.verifyOtp(verifyOtpParam);
+
Customer customer = customerRepository
.findOneByEmailEqualsOrPhoneEquals(verifyOtpParam.getAccount())
.orElse(null);
-
+
if (customer == null) {
- return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+ return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
}
-
+
String jwt = customerAuthService.authorize(customer, verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode());
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add(JWTFilter.AUTHORIZATION_HEADER, "Bearer" + jwt);
@@ -112,6 +113,6 @@
httpHeaders.add(JWTFilter.AUTHORIZATION_HEADER, "Bearer" + jwt);
return new ResponseEntity<>(new UserJWTController.JWTToken(jwt), httpHeaders, HttpStatus.OK);
}
-
-
+
+
}
--
Gitblit v1.8.0