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

v2.9.0GA & SQL data

Browse Source
This commit is contained in:
MaxKey
2021-08-20 09:11:13 +08:00
parent 5d6eabe7f1
commit 68dcbce728
44 changed files with 182 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java
View File

@@ -89,7 +89,7 @@ public class AuthorizeBaseEndpoint {
}else if(application.getCredential()==Apps.CREDENTIALS.SYSTEM){
if(application.getSystemUserAttr().equalsIgnoreCase("uid")){
if(application.getSystemUserAttr().equalsIgnoreCase("userId")){
account.setUsername(userInfo.getId());
}else if(application.getSystemUserAttr().equalsIgnoreCase("username")){
account.setUsername(userInfo.getUsername());

6
maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java
View File

@@ -47,7 +47,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{
modelAndView.addObject("username", "");
modelAndView.addObject("password", "");
modelAndView.addObject("setpassword", true);
modelAndView.addObject("uid", WebContext.getUserInfo().getId());
modelAndView.addObject("userId", WebContext.getUserInfo().getId());
modelAndView.addObject("appId", appId);
modelAndView.addObject("appName",getApp(appId).getName());
modelAndView.addObject("redirect_uri", redirect_uri);
@@ -57,7 +57,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{
@RequestMapping("/authz/credential")
public ModelAndView authorizeCredential(
HttpServletRequest request,
@RequestParam("uid") String uid,
@RequestParam("userId") String userId,
@RequestParam("appId") String appId,
@RequestParam("identity_username") String identity_username,
@RequestParam("identity_password") String identity_password,
@@ -68,7 +68,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{
UserInfo userInfo=WebContext.getUserInfo();
appUser.setId(appUser.generateId());
appUser.setUid(userInfo.getId());
appUser.setUserId(userInfo.getId());
appUser.setUsername(userInfo.getUsername());
appUser.setDisplayName(userInfo.getDisplayName());

2
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java
View File

@@ -200,7 +200,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{
ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder();
serviceResponseBuilder.setFormat(HttpResponseConstants.FORMAT_TYPE.JSON);
//for user
serviceResponseBuilder.setAttribute("uid", userInfo.getId());
serviceResponseBuilder.setAttribute("userId", userInfo.getId());
serviceResponseBuilder.setAttribute("displayName",userInfo.getDisplayName());
serviceResponseBuilder.setAttribute("firstName", userInfo.getGivenName());
serviceResponseBuilder.setAttribute("lastname", userInfo.getFamilyName());

2
maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java
View File

@@ -63,7 +63,7 @@ public class ExtendApiAuthorizeEndpoint extends AuthorizeBaseEndpoint{
String username ="";
String password ="";
if(apps.getCredential()==1) {
if(apps.getSystemUserAttr().equalsIgnoreCase("uid")) {
if(apps.getSystemUserAttr().equalsIgnoreCase("userId")) {
username = userInfo.getId();
}else if(apps.getSystemUserAttr().equalsIgnoreCase("username")) {
username = userInfo.getUsername();

2
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java
View File

@@ -33,7 +33,7 @@ public class OAuthDefaultUserInfoAdapter extends AbstractAuthorizeAdapter {
public String generateInfo(SigninPrincipal authentication,UserInfo userInfo,Object app) {
HashMap<String, Object> beanMap = new HashMap<String, Object>();
beanMap.put("randomId",(new StringGenerator()).uuidGenerate());
beanMap.put("uid", userInfo.getId());
beanMap.put("userId", userInfo.getId());
//for spring security oauth2
beanMap.put("user", userInfo.getUsername());
beanMap.put("username", userInfo.getUsername());

6
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OpenIdConnectUserInfoEndpoint.java
View File

@@ -271,9 +271,9 @@ public class OpenIdConnectUserInfoEndpoint {
return atfe;
}
public UserInfo queryUserInfo(String uid){
_logger.debug("uid : "+uid);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(uid);
public UserInfo queryUserInfo(String userId){
_logger.debug("userId : "+userId);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(userId);
return userInfo;
}

6
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java
View File

@@ -157,9 +157,9 @@ public class UserInfoEndpoint {
return atfe;
}
public UserInfo queryUserInfo(String uid){
_logger.debug("uid : "+uid);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(uid);
public UserInfo queryUserInfo(String userId){
_logger.debug("userId : "+userId);
UserInfo userInfo = (UserInfo) userInfoService.loadByUsername(userId);
return userInfo;
}

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

@@ -42,8 +42,8 @@ public class TokenBasedDefaultAdapter extends AbstractAuthorizeAdapter {
beanMap.put("randomId",(new StringGenerator()).uuidGenerate());
if(details.getUserPropertys()!=null && !details.getUserPropertys().equals("")) {
if(details.getUserPropertys().indexOf("uid")>-1){
beanMap.put("uid",userInfo.getId());
if(details.getUserPropertys().indexOf("userId")>-1){
beanMap.put("userId",userInfo.getId());
}
if(details.getUserPropertys().indexOf("username")>-1){

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

@@ -37,7 +37,7 @@ public class TokenBasedSimpleAdapter extends AbstractAuthorizeAdapter {
String tokenUsername = userInfo.getUsername();
if(details.getUserPropertys()!=null && !details.getUserPropertys().equals("")) {
if(details.getUserPropertys().indexOf("uid")>-1){
if(details.getUserPropertys().indexOf("userId")>-1){
tokenUsername=userInfo.getId();
}else if(details.getUserPropertys().indexOf("username")>-1){
tokenUsername= userInfo.getUsername();