Skip to content

Commit 9839b78

Browse files
committed
Adjust security AC to use non-servlet modularized security ACs
Signed-off-by: onobc <chris.bono@gmail.com>
1 parent 197adc7 commit 9839b78

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* @since 4.0.0
5858
*/
5959
@AutoConfiguration(before = GrpcExceptionHandlerAutoConfiguration.class,
60-
afterName = "org.springframework.boot.security.autoconfigure.web.servlet.ServletWebSecurityAutoConfiguration")
60+
afterName = "org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration")
6161
@ConditionalOnSpringGrpc
6262
@ConditionalOnClass(ObjectPostProcessor.class)
6363
@ConditionalOnGrpcServerEnabled

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
@@ -82,9 +82,8 @@
8282
// All copied from Spring Boot
8383
// (https://github.com/spring-projects/spring-boot/issues/43978), except the
8484
// 2 @Beans of type AuthenticationProcessInterceptor
85-
@AutoConfiguration(
86-
beforeName = "org.springframework.boot.security.autoconfigure.servlet.UserDetailsServiceAutoConfiguration",
87-
afterName = { "org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration",
85+
@AutoConfiguration(beforeName = "org.springframework.boot.security.autoconfigure.UserDetailsServiceAutoConfiguration",
86+
afterName = { "org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration",
8887
"org.springframework.boot.security.oauth2.server.resource.autoconfigure.servlet.OAuth2ResourceServerAutoConfiguration" },
8988
after = { GrpcSecurityAutoConfiguration.class, GrpcServerFactoryAutoConfiguration.class })
9089
@EnableConfigurationProperties(OAuth2ResourceServerProperties.class)

0 commit comments

Comments
 (0)