gitee
/
spring-oauth-server
mirror of https://gitee.com/shengzhao/spring-oauth-server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

client, jsp -> html , test flow

pull/4/head
shengzhaoli.shengz 2023-10-16 19:05:44 +08:00
parent df56359dd5
commit 738ea0a09e
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/monkeyk/sos/domain/shared/GuidGenerator.java
View File

@ -20,6 +20,17 @@ public abstract class GuidGenerator {
private 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() { public static String generate() {
return UUID.randomUUID().toString().replaceAll("-", ""); return UUID.randomUUID().toString().replaceAll("-", "");
} }

8
src/main/java/com/monkeyk/sos/service/dto/OauthClientDetailsDto.java
View File

@ -4,6 +4,7 @@ import com.monkeyk.sos.domain.oauth.OauthClientDetails;
import com.monkeyk.sos.domain.shared.GuidGenerator; import com.monkeyk.sos.domain.shared.GuidGenerator;
import com.monkeyk.sos.infrastructure.DateUtils; import com.monkeyk.sos.infrastructure.DateUtils;
import com.monkeyk.sos.infrastructure.PasswordHandler; import com.monkeyk.sos.infrastructure.PasswordHandler;
import com.monkeyk.sos.infrastructure.SettingsUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.io.Serial; import java.io.Serial;
@ -224,13 +225,14 @@ public class OauthClientDetailsDto implements Serializable {
public OauthClientDetails createDomain() { public OauthClientDetails createDomain() {
OauthClientDetails clientDetails = new OauthClientDetails() OauthClientDetails clientDetails = new OauthClientDetails()
.id(GuidGenerator.generate()) .id(GuidGenerator.generateNumber())
.clientId(clientId) .clientId(clientId)
.clientName(clientName) .clientName(clientName)
// encrypted client secret // encrypted client secret
.clientSecret(PasswordHandler.encode(clientSecret)) .clientSecret(PasswordHandler.encode(clientSecret))
.postLogoutRedirectUris(postLogoutRedirectUris) .postLogoutRedirectUris(postLogoutRedirectUris)
.authorizationGrantTypes(authorizationGrantTypes) .authorizationGrantTypes(authorizationGrantTypes)
.clientAuthenticationMethods(clientAuthenticationMethods)
.scopes(scopes); .scopes(scopes);
if (StringUtils.isNotBlank(clientIdIssuedAt)) { if (StringUtils.isNotBlank(clientIdIssuedAt)) {
@ -245,8 +247,8 @@ public class OauthClientDetailsDto implements Serializable {
clientDetails.redirectUris(redirectUris); clientDetails.redirectUris(redirectUris);
} }
clientDetails.clientSettings(this.clientSettings.toSettings().toString()); clientDetails.clientSettings(SettingsUtils.textClientSettings(this.clientSettings.toSettings()));
clientDetails.tokenSettings(this.tokenSettings.toSettings().toString()); clientDetails.tokenSettings(SettingsUtils.textTokenSettings(this.tokenSettings.toSettings()));
return clientDetails; return clientDetails;
} }