Skip to content

Commit 16e30d1

Browse files
Remove Nimbus(Reactive)OpaqueTokenIntrospector
Signed-off-by: Tran Ngoc Nhan <[email protected]>
1 parent 08cbdb4 commit 16e30d1

File tree

8 files changed

+12
-1236
lines changed

8 files changed

+12
-1236
lines changed

config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@
121121
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
122122
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
123123
import org.springframework.security.oauth2.server.resource.authentication.JwtIssuerAuthenticationManagerResolver;
124-
import org.springframework.security.oauth2.server.resource.introspection.NimbusOpaqueTokenIntrospector;
125124
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenAuthenticationConverter;
126125
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector;
126+
import org.springframework.security.oauth2.server.resource.introspection.SpringOpaqueTokenIntrospector;
127127
import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationEntryPoint;
128128
import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
129129
import org.springframework.security.oauth2.server.resource.web.DefaultBearerTokenResolver;
@@ -2729,8 +2729,8 @@ NimbusJwtDecoder jwtDecoder() {
27292729
}
27302730

27312731
@Bean
2732-
NimbusOpaqueTokenIntrospector tokenIntrospectionClient() {
2733-
return new NimbusOpaqueTokenIntrospector("https://example.org/introspect", this.rest);
2732+
OpaqueTokenIntrospector tokenIntrospectionClient() {
2733+
return new SpringOpaqueTokenIntrospector("https://example.org/introspect", this.rest);
27342734
}
27352735

27362736
}

config/src/test/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParserTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
import org.springframework.security.oauth2.jwt.TestJwts;
8585
import org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken;
8686
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
87-
import org.springframework.security.oauth2.server.resource.introspection.NimbusOpaqueTokenIntrospector;
87+
import org.springframework.security.oauth2.server.resource.introspection.SpringOpaqueTokenIntrospector;
8888
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenAuthenticationConverter;
8989
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector;
9090
import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
@@ -1047,7 +1047,7 @@ static class OpaqueTokenIntrospectorFactoryBean implements FactoryBean<OpaqueTok
10471047

10481048
@Override
10491049
public OpaqueTokenIntrospector getObject() throws Exception {
1050-
return new NimbusOpaqueTokenIntrospector("https://idp.example.org", this.rest);
1050+
return new SpringOpaqueTokenIntrospector("https://idp.example.org", this.rest);
10511051
}
10521052

10531053
@Override

config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ import org.springframework.security.oauth2.core.DefaultOAuth2AuthenticatedPrinci
4141
import org.springframework.security.oauth2.core.TestOAuth2AccessTokens
4242
import org.springframework.security.oauth2.jwt.JwtClaimNames
4343
import org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthentication
44-
import org.springframework.security.oauth2.server.resource.introspection.NimbusOpaqueTokenIntrospector
4544
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector
4645
import org.springframework.security.oauth2.server.resource.introspection.SpringOpaqueTokenIntrospector
4746
import org.springframework.security.web.SecurityFilterChain
@@ -127,8 +126,8 @@ class OpaqueTokenDslTests {
127126
open fun rest(): RestOperations = REST
128127

129128
@Bean
130-
open fun tokenIntrospectionClient(): NimbusOpaqueTokenIntrospector {
131-
return NimbusOpaqueTokenIntrospector("https://example.org/introspect", REST)
129+
open fun tokenIntrospectionClient(): OpaqueTokenIntrospector {
130+
return SpringOpaqueTokenIntrospector("https://example.org/introspect", REST)
132131
}
133132
}
134133

config/src/test/kotlin/org/springframework/security/config/web/server/ServerOpaqueTokenDslTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ import org.springframework.http.HttpHeaders
2828
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
2929
import org.springframework.security.config.test.SpringTestContext
3030
import org.springframework.security.config.test.SpringTestContextExtension
31-
import org.springframework.security.oauth2.server.resource.introspection.NimbusReactiveOpaqueTokenIntrospector
3231
import org.springframework.security.oauth2.server.resource.introspection.ReactiveOpaqueTokenIntrospector
32+
import org.springframework.security.oauth2.server.resource.introspection.SpringReactiveOpaqueTokenIntrospector
3333
import org.springframework.security.web.server.SecurityWebFilterChain
3434
import org.springframework.test.web.reactive.server.WebTestClient
3535
import org.springframework.web.reactive.config.EnableWebFlux
@@ -103,7 +103,7 @@ class ServerOpaqueTokenDslTests {
103103

104104
@Bean
105105
open fun tokenIntrospectionClient(): ReactiveOpaqueTokenIntrospector {
106-
return NimbusReactiveOpaqueTokenIntrospector(mockWebServer().url("/introspect").toString(), "client", "secret")
106+
return SpringReactiveOpaqueTokenIntrospector(mockWebServer().url("/introspect").toString(), "client", "secret")
107107
}
108108
}
109109

@@ -138,7 +138,7 @@ class ServerOpaqueTokenDslTests {
138138
}
139139
oauth2ResourceServer {
140140
opaqueToken {
141-
introspector = NimbusReactiveOpaqueTokenIntrospector(mockWebServer().url("/introspector").toString(), "client", "secret")
141+
introspector = SpringReactiveOpaqueTokenIntrospector(mockWebServer().url("/introspector").toString(), "client", "secret")
142142
}
143143
}
144144
}

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/NimbusOpaqueTokenIntrospector.java

Lines changed: 0 additions & 269 deletions
This file was deleted.

0 commit comments

Comments
 (0)