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());