admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-08 01:48:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

oauth2 多租户新增bug

Browse Source
This commit is contained in:
MaxKey 2021-12-28 17:03:46 +08:00
parent 8e1bff95d5
commit e093cab6bd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java
View File

@ -70,7 +70,8 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
+ "AUTHORIZED_GRANT_TYPES, WEB_SERVER_REDIRECT_URI, AUTHORITIES, ACCESS_TOKEN_VALIDITY, " + "AUTHORIZED_GRANT_TYPES, WEB_SERVER_REDIRECT_URI, AUTHORITIES, ACCESS_TOKEN_VALIDITY, "
+ "REFRESH_TOKEN_VALIDITY, ADDITIONAL_INFORMATION, AUTOAPPROVE, APPROVALPROMPT , " + "REFRESH_TOKEN_VALIDITY, ADDITIONAL_INFORMATION, AUTOAPPROVE, APPROVALPROMPT , "
+ "IDTOKENSIGNINGALGORITHM, IDTOKENENCRYPTEDALGORITHM, IDTOKENENCRYPTIONMETHOD, " + "IDTOKENSIGNINGALGORITHM, IDTOKENENCRYPTEDALGORITHM, IDTOKENENCRYPTIONMETHOD, "
+ "USERINFOSIGNINGALGORITHM, USERINFOCRYPTEDALGORITHM, USERINFOENCRYPTIONMETHOD, JWKSURI, PKCE, PROTOCOL"; + "USERINFOSIGNINGALGORITHM, USERINFOCRYPTEDALGORITHM, USERINFOENCRYPTIONMETHOD,"
+" JWKSURI, PKCE, PROTOCOL , INSTID ";
private static final String CLIENT_FIELDS = "client_secret, " + CLIENT_FIELDS_FOR_UPDATE; private static final String CLIENT_FIELDS = "client_secret, " + CLIENT_FIELDS_FOR_UPDATE;
@ -82,7 +83,7 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
private static final String DEFAULT_SELECT_STATEMENT = BASE_FIND_STATEMENT + " where client_id = ?"; private static final String DEFAULT_SELECT_STATEMENT = BASE_FIND_STATEMENT + " where client_id = ?";
private static final String DEFAULT_INSERT_STATEMENT = "insert into mxk_apps_oauth_client_details (" + CLIENT_FIELDS private static final String DEFAULT_INSERT_STATEMENT = "insert into mxk_apps_oauth_client_details (" + CLIENT_FIELDS
+ ", client_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + ", client_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
private static final String DEFAULT_UPDATE_STATEMENT = "update mxk_apps_oauth_client_details " + "set " private static final String DEFAULT_UPDATE_STATEMENT = "update mxk_apps_oauth_client_details " + "set "
+ CLIENT_FIELDS_FOR_UPDATE.replaceAll(", ", "=?, ") + "=? where client_id = ?"; + CLIENT_FIELDS_FOR_UPDATE.replaceAll(", ", "=?, ") + "=? where client_id = ?";
@ -211,7 +212,8 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
clientDetails.getIdTokenEncryptedAlgorithm(), clientDetails.getIdTokenEncryptionMethod(), clientDetails.getIdTokenEncryptedAlgorithm(), clientDetails.getIdTokenEncryptionMethod(),
clientDetails.getUserInfoSigningAlgorithm(), clientDetails.getUserInfoEncryptedAlgorithm(), clientDetails.getUserInfoSigningAlgorithm(), clientDetails.getUserInfoEncryptedAlgorithm(),
clientDetails.getUserInfoEncryptionMethod(), clientDetails.getJwksUri(), clientDetails.getUserInfoEncryptionMethod(), clientDetails.getJwksUri(),
clientDetails.getPkce(), clientDetails.getProtocol(), clientDetails.getPkce(), clientDetails.getProtocol(),clientDetails.getInstId(),
clientDetails.getClientId() clientDetails.getClientId()
}; };
@ -299,6 +301,7 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
details.setApprovalPrompt(rs.getString("APPROVALPROMPT")); details.setApprovalPrompt(rs.getString("APPROVALPROMPT"));
details.setPkce(rs.getString("PKCE")); details.setPkce(rs.getString("PKCE"));
details.setProtocol(rs.getString("PROTOCOL")); details.setProtocol(rs.getString("PROTOCOL"));
details.setInstId(rs.getString("INSTID"));
String json = rs.getString(10); String json = rs.getString(10);
if (json != null) { if (json != null) {
try { try {

1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java
View File

@ -73,6 +73,7 @@ public class OAuth20DetailsController extends BaseAppContorller {
oauth20Details.setClientSecret(oauth20Details.getSecret()); oauth20Details.setClientSecret(oauth20Details.getSecret());
oauth20Details.setInstId(WebContext.getUserInfo().getInstId()); oauth20Details.setInstId(WebContext.getUserInfo().getInstId());
oauth20JdbcClientDetailsService.addClientDetails(oauth20Details.clientDetailsRowMapper()); oauth20JdbcClientDetailsService.addClientDetails(oauth20Details.clientDetailsRowMapper());
if (appsService.insertApp(oauth20Details)) { if (appsService.insertApp(oauth20Details)) {
new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.success); new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.success);