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

oauth 2.x ClientSecret fix

Browse Source
This commit is contained in:
MaxKey 2022-07-18 16:54:38 +08:00
parent 45dd4e6270
commit acf492b067
3 changed files with 4 additions and 4 deletions
Show Stats 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/autoconfigure/Oauth20AutoConfiguration.java
View File

@ -223,7 +223,7 @@ public class Oauth20AutoConfiguration implements InitializingBean {
@Bean(name = "oauth20JdbcClientDetailsService") @Bean(name = "oauth20JdbcClientDetailsService")
public JdbcClientDetailsService jdbcClientDetailsService(DataSource dataSource,PasswordEncoder passwordReciprocal) { public JdbcClientDetailsService jdbcClientDetailsService(DataSource dataSource,PasswordEncoder passwordReciprocal) {
JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource); JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
clientDetailsService.setPasswordEncoder(passwordReciprocal); //clientDetailsService.setPasswordEncoder(passwordReciprocal);
_logger.debug("OAuth 2 Jdbc ClientDetails Service init."); _logger.debug("OAuth 2 Jdbc ClientDetails Service init.");
return clientDetailsService; return clientDetailsService;
} }

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java
View File

@ -50,7 +50,7 @@ public class Oauth20ClientAutoConfiguration implements InitializingBean {
public JdbcClientDetailsService oauth20JdbcClientDetailsService( public JdbcClientDetailsService oauth20JdbcClientDetailsService(
DataSource dataSource,PasswordEncoder passwordReciprocal) { DataSource dataSource,PasswordEncoder passwordReciprocal) {
JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource); JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
clientDetailsService.setPasswordEncoder(passwordReciprocal); //clientDetailsService.setPasswordEncoder(passwordReciprocal);
_logger.debug("JdbcClientDetailsService inited."); _logger.debug("JdbcClientDetailsService inited.");
return clientDetailsService; return clientDetailsService;
} }

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

@ -107,13 +107,13 @@ public class OAuth20DetailsController extends BaseAppContorller {
if(oauth20Details.getProtocol().equalsIgnoreCase(ConstsProtocols.OAUTH21)) { if(oauth20Details.getProtocol().equalsIgnoreCase(ConstsProtocols.OAUTH21)) {
oauth20Details.setPkce(OAuth2Constants.PKCE_TYPE.PKCE_TYPE_YES); oauth20Details.setPkce(OAuth2Constants.PKCE_TYPE.PKCE_TYPE_YES);
} }
transform(oauth20Details);
oauth20Details.setClientSecret(oauth20Details.getSecret()); oauth20Details.setClientSecret(oauth20Details.getSecret());
oauth20Details.setInstId(currentUser.getInstId()); oauth20Details.setInstId(currentUser.getInstId());
oauth20JdbcClientDetailsService.updateClientDetails(oauth20Details.clientDetailsRowMapper()); oauth20JdbcClientDetailsService.updateClientDetails(oauth20Details.clientDetailsRowMapper());
oauth20JdbcClientDetailsService.updateClientSecret(oauth20Details.getClientId(), oauth20Details.getClientSecret()); oauth20JdbcClientDetailsService.updateClientSecret(oauth20Details.getClientId(), oauth20Details.getClientSecret());
transform(oauth20Details);
if (appsService.updateApp(oauth20Details)) { if (appsService.updateApp(oauth20Details)) {
return new Message<AppsOAuth20Details>(Message.SUCCESS).buildResponse(); return new Message<AppsOAuth20Details>(Message.SUCCESS).buildResponse();
} else { } else {