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-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;
}