From acf492b06778137a36c2804bb2297a731ec36279 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Mon, 18 Jul 2022 16:54:38 +0800
Subject: [PATCH] oauth 2.x ClientSecret fix

---
 .../org/maxkey/autoconfigure/Oauth20AutoConfiguration.java    | 2 +-
 .../main/java/org/maxkey/Oauth20ClientAutoConfiguration.java  | 2 +-
 .../maxkey/web/apps/contorller/OAuth20DetailsController.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java
index 328a06ac1..bed903eed 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java
@@ -223,7 +223,7 @@ public class Oauth20AutoConfiguration implements InitializingBean {
     @Bean(name = "oauth20JdbcClientDetailsService")
     public JdbcClientDetailsService jdbcClientDetailsService(DataSource dataSource,PasswordEncoder passwordReciprocal) {
         JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
-        clientDetailsService.setPasswordEncoder(passwordReciprocal);
+        //clientDetailsService.setPasswordEncoder(passwordReciprocal);
         _logger.debug("OAuth 2 Jdbc ClientDetails Service init.");
         return clientDetailsService;
     }    
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java
index 1a78e8d1e..49c2d0145 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java
@@ -50,7 +50,7 @@ public class Oauth20ClientAutoConfiguration  implements InitializingBean {
     public JdbcClientDetailsService oauth20JdbcClientDetailsService(
                 DataSource dataSource,PasswordEncoder passwordReciprocal) {
 	    JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
-	    clientDetailsService.setPasswordEncoder(passwordReciprocal);
+	    //clientDetailsService.setPasswordEncoder(passwordReciprocal);
 	    _logger.debug("JdbcClientDetailsService inited.");
         return clientDetailsService;
     }
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java
index 28dcdf4cb..68dfc0a99 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/OAuth20DetailsController.java
@@ -107,13 +107,13 @@ public class OAuth20DetailsController  extends BaseAppContorller {
 		if(oauth20Details.getProtocol().equalsIgnoreCase(ConstsProtocols.OAUTH21)) {
             oauth20Details.setPkce(OAuth2Constants.PKCE_TYPE.PKCE_TYPE_YES);
         }
+		
+		transform(oauth20Details);
 		oauth20Details.setClientSecret(oauth20Details.getSecret());
 		oauth20Details.setInstId(currentUser.getInstId());
         oauth20JdbcClientDetailsService.updateClientDetails(oauth20Details.clientDetailsRowMapper());
         oauth20JdbcClientDetailsService.updateClientSecret(oauth20Details.getClientId(), oauth20Details.getClientSecret());
         
-		transform(oauth20Details);
-		
 		if (appsService.updateApp(oauth20Details)) {
 		    return new Message<AppsOAuth20Details>(Message.SUCCESS).buildResponse();
 		} else {