From 6bbe69341760ded4df55aeaeaf01c6a27fbc2e4a Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Tue, 1 Sep 2020 23:02:02 +0800
Subject: [PATCH] Update TokenBasedDefaultAdapter.java

---
 .../adapter/TokenBasedDefaultAdapter.java     | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java
index b11e4c615..87c2233b9 100644
--- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java
+++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java
@@ -38,34 +38,36 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter {
 		HashMap<String,String> beanMap=new HashMap<String,String>();
 		
 		beanMap.put("randomId",(new StringGenerator()).uuidGenerate());
-		
-		if(details.getUserPropertys().indexOf("uid")>-1){
-            beanMap.put("uid",userInfo.getId());
-        }
-		
-		if(details.getUserPropertys().indexOf("username")>-1){
-            beanMap.put("username",userInfo.getUsername());
-        }
-		
-		if(details.getUserPropertys().indexOf("email")>-1){
-            beanMap.put("email",userInfo.getEmail());
-        }
-		
-		if(details.getUserPropertys().indexOf("windowsAccount")>-1){
-            beanMap.put("windowsAccount",userInfo.getWindowsAccount());
-        }
-		
-		if(details.getUserPropertys().indexOf("employeeNumber")>-1){
-            beanMap.put("employeeNumber",userInfo.getEmployeeNumber());
-        }
-		
-		if(details.getUserPropertys().indexOf("department")>-1){
-            beanMap.put("department",userInfo.getDepartment());
-        }
-		
-		if(details.getUserPropertys().indexOf("departmentId")>-1){
-            beanMap.put("departmentId",userInfo.getDepartmentId());
-        }
+		if(details.getUserPropertys()!=null && !details.getUserPropertys().equals("")) {
+		    
+    		if(details.getUserPropertys().indexOf("uid")>-1){
+                beanMap.put("uid",userInfo.getId());
+            }
+    		
+    		if(details.getUserPropertys().indexOf("username")>-1){
+                beanMap.put("username",userInfo.getUsername());
+            }
+    		
+    		if(details.getUserPropertys().indexOf("email")>-1){
+                beanMap.put("email",userInfo.getEmail());
+            }
+    		
+    		if(details.getUserPropertys().indexOf("windowsAccount")>-1){
+                beanMap.put("windowsAccount",userInfo.getWindowsAccount());
+            }
+    		
+    		if(details.getUserPropertys().indexOf("employeeNumber")>-1){
+                beanMap.put("employeeNumber",userInfo.getEmployeeNumber());
+            }
+    		
+    		if(details.getUserPropertys().indexOf("department")>-1){
+                beanMap.put("department",userInfo.getDepartment());
+            }
+    		
+    		if(details.getUserPropertys().indexOf("departmentId")>-1){
+                beanMap.put("departmentId",userInfo.getDepartmentId());
+            }
+		}
 		
 		beanMap.put("displayName", userInfo.getDisplayName());