From 738ea0a09e2135474422f5edb9e08cc7372a83d6 Mon Sep 17 00:00:00 2001
From: "shengzhaoli.shengz" <monkeyk1987@gmail.com>
Date: Mon, 16 Oct 2023 19:05:44 +0800
Subject: [PATCH] client, jsp -> html , test flow

---
 .../com/monkeyk/sos/domain/shared/GuidGenerator.java  | 11 +++++++++++
 .../sos/service/dto/OauthClientDetailsDto.java        |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java b/src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java
index bec0eae..54911a9 100644
--- a/src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java
+++ b/src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java
@@ -20,6 +20,17 @@ public abstract class GuidGenerator {
     private GuidGenerator() {
     }
 
+    /**
+     * generate random number, length 32
+     *
+     * @return number
+     * @since 3.0.0
+     */
+    public static String generateNumber() {
+        return RandomStringUtils.random(32, false, true);
+    }
+
+
     public static String generate() {
         return UUID.randomUUID().toString().replaceAll("-", "");
     }
diff --git a/src/main/java/com/monkeyk/sos/service/dto/OauthClientDetailsDto.java b/src/main/java/com/monkeyk/sos/service/dto/OauthClientDetailsDto.java
index 6a3fa35..bc70b81 100644
--- a/src/main/java/com/monkeyk/sos/service/dto/OauthClientDetailsDto.java
+++ b/src/main/java/com/monkeyk/sos/service/dto/OauthClientDetailsDto.java
@@ -4,6 +4,7 @@ import com.monkeyk.sos.domain.oauth.OauthClientDetails;
 import com.monkeyk.sos.domain.shared.GuidGenerator;
 import com.monkeyk.sos.infrastructure.DateUtils;
 import com.monkeyk.sos.infrastructure.PasswordHandler;
+import com.monkeyk.sos.infrastructure.SettingsUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serial;
@@ -224,13 +225,14 @@ public class OauthClientDetailsDto implements Serializable {
 
     public OauthClientDetails createDomain() {
         OauthClientDetails clientDetails = new OauthClientDetails()
-                .id(GuidGenerator.generate())
+                .id(GuidGenerator.generateNumber())
                 .clientId(clientId)
                 .clientName(clientName)
                 // encrypted client secret
                 .clientSecret(PasswordHandler.encode(clientSecret))
                 .postLogoutRedirectUris(postLogoutRedirectUris)
                 .authorizationGrantTypes(authorizationGrantTypes)
+                .clientAuthenticationMethods(clientAuthenticationMethods)
                 .scopes(scopes);
 
         if (StringUtils.isNotBlank(clientIdIssuedAt)) {
@@ -245,8 +247,8 @@ public class OauthClientDetailsDto implements Serializable {
             clientDetails.redirectUris(redirectUris);
         }
 
-        clientDetails.clientSettings(this.clientSettings.toSettings().toString());
-        clientDetails.tokenSettings(this.tokenSettings.toSettings().toString());
+        clientDetails.clientSettings(SettingsUtils.textClientSettings(this.clientSettings.toSettings()));
+        clientDetails.tokenSettings(SettingsUtils.textTokenSettings(this.tokenSettings.toSettings()));
 
         return clientDetails;
     }