diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringOpaqueTokenIntrospector.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringOpaqueTokenIntrospector.java index 29386b1cc4..eb29a1b71c 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringOpaqueTokenIntrospector.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringOpaqueTokenIntrospector.java @@ -273,6 +273,17 @@ private Collection authorities(List scopes) { return authorities; } + /** + * Creates a {@code SpringOpaqueTokenIntrospector.Builder} with the given introspection endpoint uri + * @param introspectionUri The introspection endpoint uri + * @return the {@link SpringOpaqueTokenIntrospector.Builder} + * @since 6.5 + */ + public static Builder withIntrospectionUri(String introspectionUri) { + Assert.notNull(introspectionUri, "introspectionUri cannot be null"); + return new Builder(introspectionUri); + } + // gh-7563 private static final class ArrayListFromString extends ArrayList { @@ -299,17 +310,6 @@ default List getScopes() { } - /** - * Creates a {@code SpringOpaqueTokenIntrospector.Builder} with the given introspection endpoint uri - * @param introspectionUri The introspection endpoint uri - * @return the {@link SpringOpaqueTokenIntrospector.Builder} - * @since 6.5 - */ - public static Builder withIntrospectionUri(String introspectionUri) { - Assert.notNull(introspectionUri, "introspectionUri cannot be null"); - return new Builder(introspectionUri); - } - /** * Used to build {@link SpringOpaqueTokenIntrospector}. * @@ -364,7 +364,7 @@ public Builder clientId(String clientId) { public Builder clientSecret(String clientSecret, Charset charset) { Assert.notNull(clientSecret, "clientSecret cannot be null"); Assert.notNull(charset, "charset cannot be null"); - this.clientId = URLEncoder.encode(clientSecret, charset); + this.clientSecret = URLEncoder.encode(clientSecret, charset); return this; } diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringReactiveOpaqueTokenIntrospector.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringReactiveOpaqueTokenIntrospector.java index 2a5ea132e1..b11c494788 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringReactiveOpaqueTokenIntrospector.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/SpringReactiveOpaqueTokenIntrospector.java @@ -227,6 +227,17 @@ private Collection authorities(List scopes) { return authorities; } + /** + * Creates a {@code SpringReactiveOpaqueTokenIntrospector.Builder} with the given introspection endpoint uri + * @param introspectionUri The introspection endpoint uri + * @return the {@link SpringReactiveOpaqueTokenIntrospector.Builder} + * @since 6.5 + */ + public static Builder withIntrospectionUri(String introspectionUri) { + + return new Builder(introspectionUri); + } + // gh-7563 private static final class ArrayListFromString extends ArrayList { @@ -253,17 +264,6 @@ default List getScopes() { } - /** - * Creates a {@code SpringReactiveOpaqueTokenIntrospector.Builder} with the given introspection endpoint uri - * @param introspectionUri The introspection endpoint uri - * @return the {@link SpringReactiveOpaqueTokenIntrospector.Builder} - * @since 6.5 - */ - public static Builder withIntrospectionUri(String introspectionUri) { - - return new Builder(introspectionUri); - } - /** * Used to build {@link SpringReactiveOpaqueTokenIntrospector}. * @@ -318,7 +318,7 @@ public Builder clientId(String clientId) { public Builder clientSecret(String clientSecret, Charset charset) { Assert.notNull(clientSecret, "clientSecret cannot be null"); Assert.notNull(charset, "charset cannot be null"); - this.clientId = URLEncoder.encode(clientSecret, charset); + this.clientSecret = URLEncoder.encode(clientSecret, charset); return this; }