From 20b5bf20867645017faed872e2645776944f2177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Sun, 16 Dec 2018 00:05:23 +0800
Subject: [PATCH] =?UTF-8?q?:alien:=20=E7=94=B1=E4=BA=8E=E5=A4=96=E9=83=A8A?=
 =?UTF-8?q?PI=E7=9A=84=E6=94=B9=E5=8F=98=E8=80=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81,=E6=96=B0=E5=A2=9Etoken=20=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/AuthorizationServerConfig.java     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
index a068928c0..de5393d90 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java
@@ -22,6 +22,7 @@ package com.pig4cloud.pigx.auth.config;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.security.component.PigxWebResponseExceptionTranslator;
 import com.pig4cloud.pigx.common.security.service.PigxClientDetailsService;
+import com.pig4cloud.pigx.common.security.service.PigxUser;
 import com.pig4cloud.pigx.common.security.service.PigxUserDetailsService;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
@@ -68,20 +69,20 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
 	@Override
 	public void configure(AuthorizationServerSecurityConfigurer oauthServer) {
 		oauthServer
-			.allowFormAuthenticationForClients()
-			.checkTokenAccess("isAuthenticated()");
+				.allowFormAuthenticationForClients()
+				.checkTokenAccess("isAuthenticated()");
 	}
 
 	@Override
 	public void configure(AuthorizationServerEndpointsConfigurer endpoints) {
 		endpoints
-			.allowedTokenEndpointRequestMethods(HttpMethod.GET, HttpMethod.POST)
-			.tokenStore(tokenStore())
-			.tokenEnhancer(tokenEnhancer())
-			.userDetailsService(pigxUserDetailsService)
-			.authenticationManager(authenticationManager)
-			.reuseRefreshTokens(false)
-			.exceptionTranslator(new PigxWebResponseExceptionTranslator());
+				.allowedTokenEndpointRequestMethods(HttpMethod.GET, HttpMethod.POST)
+				.tokenStore(tokenStore())
+				.tokenEnhancer(tokenEnhancer())
+				.userDetailsService(pigxUserDetailsService)
+				.authenticationManager(authenticationManager)
+				.reuseRefreshTokens(false)
+				.exceptionTranslator(new PigxWebResponseExceptionTranslator());
 	}
 
 
@@ -95,7 +96,11 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
 	@Bean
 	public TokenEnhancer tokenEnhancer() {
 		return (accessToken, authentication) -> {
-			final Map<String, Object> additionalInfo = new HashMap<>(1);
+			final Map<String, Object> additionalInfo = new HashMap<>(4);
+			PigxUser pigxUser = (PigxUser) authentication.getUserAuthentication().getPrincipal();
+			additionalInfo.put("user_id", pigxUser.getId());
+			additionalInfo.put("dept_id", pigxUser.getDeptId());
+			additionalInfo.put("tenant_id", pigxUser.getTenantId());
 			additionalInfo.put("license", SecurityConstants.PIGX_LICENSE);
 			((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
 			return accessToken;