|
50 | 50 | import org.springframework.security.oauth2.jwt.JwtIssuerValidator;
|
51 | 51 | import org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken;
|
52 | 52 | import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationProvider;
|
53 |
| -import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; |
54 | 53 | import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector;
|
55 | 54 | import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter;
|
56 | 55 | import org.springframework.security.web.FilterChainProxy;
|
@@ -262,21 +261,25 @@ void jwtDecoderByOidcIssuerUriIsConditionalOnMissingBean() {
|
262 | 261 | }
|
263 | 262 |
|
264 | 263 | @Test
|
265 |
| - void autoConfigurationShouldBeConditionalOnJwtAuthenticationTokenClass() { |
| 264 | + void autoConfigurationShouldBeConditionalOnResourceServerClass() { |
266 | 265 | this.contextRunner
|
267 | 266 | .withPropertyValues("spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://jwk-set-uri.com")
|
268 | 267 | .withUserConfiguration(JwtDecoderConfig.class)
|
269 |
| - .withClassLoader(new FilteredClassLoader(JwtAuthenticationToken.class)) |
270 |
| - .run((context) -> assertThat(getBearerTokenFilter(context)).isNull()); |
| 268 | + .withClassLoader(new FilteredClassLoader(BearerTokenAuthenticationToken.class)).run((context) -> { |
| 269 | + assertThat(context).doesNotHaveBean(OAuth2ResourceServerAutoConfiguration.class); |
| 270 | + assertThat(getBearerTokenFilter(context)).isNull(); |
| 271 | + }); |
271 | 272 | }
|
272 | 273 |
|
273 | 274 | @Test
|
274 |
| - void autoConfigurationShouldBeConditionalOnJwtDecoderClass() { |
| 275 | + void autoConfigurationForJwtShouldBeConditionalOnJwtDecoderClass() { |
275 | 276 | this.contextRunner
|
276 | 277 | .withPropertyValues("spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://jwk-set-uri.com")
|
277 | 278 | .withUserConfiguration(JwtDecoderConfig.class)
|
278 |
| - .withClassLoader(new FilteredClassLoader(JwtDecoder.class)) |
279 |
| - .run((context) -> assertThat(getBearerTokenFilter(context)).isNull()); |
| 279 | + .withClassLoader(new FilteredClassLoader(JwtDecoder.class)).run((context) -> { |
| 280 | + assertThat(context).hasSingleBean(OAuth2ResourceServerAutoConfiguration.class); |
| 281 | + assertThat(getBearerTokenFilter(context)).isNull(); |
| 282 | + }); |
280 | 283 | }
|
281 | 284 |
|
282 | 285 | @Test
|
|
0 commit comments