From 13ae6947a48f4c061b1a6479df889fa2aaf07099 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期一, 29 十一月 2021 16:01:58 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java b/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java
index aa9b5b4..8929adf 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java
@@ -25,16 +25,16 @@
@Service
@Transactional
public class CustomerAuthService {
-
+
@Autowired
AuthenticationManagerBuilder authenticationManagerBuilder;
-
+
@Autowired
CustomerRepository customerRepository;
@Autowired
TokenProvider tokenProvider;
-
+
public String authorize(Customer account, String indexKey, String otpCode) {
OtpAccount otpAccount = OtpAccount.createOtpAccount(account, indexKey);
OtpAuthenticationToken authenticationToken = new OtpAuthenticationToken(
@@ -43,26 +43,25 @@
);
SecurityContextHolder.getContext().setAuthentication(authenticationToken);
-
+
Authentication authentication = buildCustomerAuthToken(account, otpCode, indexKey);
String jwt = tokenProvider.createToken(authentication, false);
return jwt;
}
-
+
public UsernamePasswordAuthenticationToken buildCustomerAuthToken(Customer customer
, String otpCode, String indexKey) {
-
+
List<GrantedAuthority> grantedAuths = Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"));
-
+
final String account = customer.toAccountString();
- UsernamePasswordAuthenticationToken authenticationToken =
+ UsernamePasswordAuthenticationToken authenticationToken =
new UsernamePasswordAuthenticationToken(account, otpCode, grantedAuths);
Map<String, String> details = new HashMap<>();
- details.put(CustomerDetailEnum.ID.getValue(), customer.getId().toString());
+ details.put(CustomerDetailEnum.DB_ID.getValue(), customer.getId().toString());
details.put(CustomerDetailEnum.NAME.getValue(), customer.getName());
- details.put(CustomerDetailEnum.ACCOUNT.getValue(), account);
-// details.put(CustomerDetailEnum.CONTACT_TYPE.getValue(), customer.getContactType());
+
authenticationToken.setDetails(details);
return authenticationToken;
--
Gitblit v1.8.0