Skip to content

Commit eb2adf7

Browse files
therepanicdsyer
authored andcommitted
Fix resource server autoconfig to not require OAuth2 client
In this commit, we remove the InMemoryClientRegistrationRepository class from the OAuth2ResourceServerAutoConfiguration clause, after which we become independent of the OAuth2 client side. Closes: gh-329 Signed-off-by: Andrey Litvitski <[email protected]>
1 parent 3017d77 commit eb2adf7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-grpc-server-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/server/autoconfigure/security/OAuth2ResourceServerAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.springframework.grpc.server.security.GrpcSecurity;
5353
import org.springframework.security.config.Customizer;
5454
import org.springframework.security.config.ObjectPostProcessor;
55-
import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
5655
import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
5756
import org.springframework.security.oauth2.core.OAuth2TokenValidator;
5857
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
@@ -77,6 +76,7 @@
7776
* {@link EnableAutoConfiguration Auto-configuration} for gRPC OAuth2 resource server.
7877
*
7978
* @author Dave Syer
79+
* @author Andrey Litvitski
8080
* @since 1.0.0
8181
*/
8282
// All copied from Spring Boot
@@ -88,8 +88,7 @@
8888
after = { GrpcSecurityAutoConfiguration.class, GrpcServerFactoryAutoConfiguration.class })
8989
@EnableConfigurationProperties(OAuth2ResourceServerProperties.class)
9090
@ConditionalOnSpringGrpc
91-
@ConditionalOnClass({ InMemoryClientRegistrationRepository.class, BearerTokenAuthenticationToken.class,
92-
ObjectPostProcessor.class })
91+
@ConditionalOnClass({ BearerTokenAuthenticationToken.class, ObjectPostProcessor.class })
9392
@ConditionalOnMissingBean(GrpcServletConfiguration.class)
9493
@ConditionalOnBean({ BindableService.class, GrpcSecurityAutoConfiguration.class })
9594
@Import({ Oauth2ResourceServerConfiguration.JwtConfiguration.class,

0 commit comments

Comments
 (0)