From ec0342f01d418e96822fde75ceb201f78d55e8bb Mon Sep 17 00:00:00 2001 From: Jack <jack.su@pollex.com.tw> Date: 星期五, 14 一月 2022 17:33:40 +0800 Subject: [PATCH] [ADD] 成交API新增remark欄位 [UPDATE] 進入顧問流程需一併更新appointment 的狀態 [ADD] 新增檢核不能重複新增appointment closed info --- pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 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..427e102 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,23 @@ ); 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.NAME.getValue(), customer.getName()); - details.put(CustomerDetailEnum.ACCOUNT.getValue(), account); -// details.put(CustomerDetailEnum.CONTACT_TYPE.getValue(), customer.getContactType()); + details.put(CustomerDetailEnum.DB_ID.getValue(), customer.getId().toString()); authenticationToken.setDetails(details); return authenticationToken; -- Gitblit v1.8.0