LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.2.0RC1

Browse Source 
v2.2.0RC1
This commit is contained in:
Crystal.Sea
2020-08-30 18:54:32 +08:00
parent 88128bec08
commit edec66c209
53 changed files with 14235 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedDefaultAdapter.java
View File

@@ -21,7 +21,6 @@ import java.util.Date;
import java.util.HashMap;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.maxkey.constants.Boolean;
import org.maxkey.domain.UserInfo;
import org.maxkey.domain.apps.AppsTokenBasedDetails;
import org.maxkey.util.DateUtils;
@@ -40,27 +39,33 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter {
beanMap.put("randomId",(new StringGenerator()).uuidGenerate());
if(Boolean.isTrue(details.getUid())){
beanMap.put("uid",userInfo.getId());
}
if(Boolean.isTrue(details.getUsername())){
beanMap.put("username", userInfo.getUsername());
}
if(Boolean.isTrue(details.getEmail())){
beanMap.put("email", userInfo.getEmail());
}
if(Boolean.isTrue(details.getWindowsAccount())){
beanMap.put("windowsAccount", userInfo.getWindowsAccount());
}
if(Boolean.isTrue(details.getEmployeeNumber())){
beanMap.put("employeeNumber", userInfo.getEmployeeNumber());
}
if(Boolean.isTrue(details.getDepartmentId())){
beanMap.put("departmentId", userInfo.getDepartmentId());
}
if(Boolean.isTrue(details.getDepartment())){
beanMap.put("department", userInfo.getDepartment());
}
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());

18
maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/adapter/TokenBasedSimpleAdapter.java
View File

@@ -20,7 +20,6 @@ package org.maxkey.authz.token.endpoint.adapter;
import java.util.Date;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.maxkey.constants.Boolean;
import org.maxkey.domain.UserInfo;
import org.maxkey.domain.apps.AppsTokenBasedDetails;
import org.maxkey.util.DateUtils;
@@ -36,19 +35,22 @@ public class TokenBasedSimpleAdapter extends AbstractAuthorizeAdapter {
String tokenUsername="";
if(Boolean.isTrue(details.getUid())){
if(details.getUserPropertys().indexOf("uid")>-1){
tokenUsername=userInfo.getId();
}else if(Boolean.isTrue(details.getUsername())){
}else if(details.getUserPropertys().indexOf("username")>-1){
tokenUsername= userInfo.getUsername();
}else if(Boolean.isTrue(details.getEmail())){
}else if(details.getUserPropertys().indexOf("email")>-1){
tokenUsername=userInfo.getEmail();
}else if(Boolean.isTrue(details.getWindowsAccount())){
}else if(details.getUserPropertys().indexOf("windowsAccount")>-1){
tokenUsername= userInfo.getWindowsAccount();
}else if(Boolean.isTrue(details.getEmployeeNumber())){
}else if(details.getUserPropertys().indexOf("employeeNumber")>-1){
tokenUsername=userInfo.getEmployeeNumber();
}else if(Boolean.isTrue(details.getDepartmentId())){
}else if(details.getUserPropertys().indexOf("department")>-1){
tokenUsername= userInfo.getDepartmentId();
}
}else if(details.getUserPropertys().indexOf("departmentId")>-1){
tokenUsername= userInfo.getDepartment();
}
/*
* use UTC date time format