Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-29 07:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates OAuth2ResourceServer configuration tests

Browse Source 
Refactores collapsed imports
This commit is contained in:
Vishal Raj 2019-05-25 23:04:00 +05:30 committed by Josh Cummings
parent 7cfb17a8a3
commit b6e8997e95
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.Base64; import java.util.Base64;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -1500,12 +1499,11 @@ public class OAuth2ResourceServerConfigurerTests {
} }
Converter<Jwt, AbstractAuthenticationToken> getJwtAuthenticationConverter() { Converter<Jwt, AbstractAuthenticationToken> getJwtAuthenticationConverter() {
return new JwtAuthenticationConverter() { JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
@Override converter.setJwtGrantedAuthoritiesConverter(jwt ->
protected Collection<GrantedAuthority> extractAuthorities(Jwt jwt) { Collections.singletonList(new SimpleGrantedAuthority("message:read"))
return Collections.singletonList(new SimpleGrantedAuthority("message:read")); );
} return converter;
};
} }
} }

11
config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java
View File

@ -25,7 +25,6 @@ import java.security.spec.InvalidKeySpecException;
import java.security.spec.RSAPublicKeySpec; import java.security.spec.RSAPublicKeySpec;
import java.time.Instant; import java.time.Instant;
import java.util.Base64; import java.util.Base64;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -56,7 +55,6 @@ import org.springframework.security.authentication.ReactiveAuthenticationManager
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
import org.springframework.security.config.test.SpringTestRule; import org.springframework.security.config.test.SpringTestRule;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
import org.springframework.security.oauth2.core.OAuth2Error; import org.springframework.security.oauth2.core.OAuth2Error;
@ -556,13 +554,12 @@ public class OAuth2ResourceServerSpecTests {
@Bean @Bean
Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() { Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
JwtAuthenticationConverter converter = new JwtAuthenticationConverter() {
@Override JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
protected Collection<GrantedAuthority> extractAuthorities(Jwt jwt) { converter.setJwtGrantedAuthoritiesConverter(jwt -> {
String[] claims = ((String) jwt.getClaims().get("scope")).split(" "); String[] claims = ((String) jwt.getClaims().get("scope")).split(" ");
return Stream.of(claims).map(SimpleGrantedAuthority::new).collect(Collectors.toList()); return Stream.of(claims).map(SimpleGrantedAuthority::new).collect(Collectors.toList());
} });
};
return new ReactiveJwtAuthenticationConverterAdapter(converter); return new ReactiveJwtAuthenticationConverterAdapter(converter);
} }