Don't call bean methods from configs

Author: ST-DDT

examples/security-grpc-bearerAuth-server/src/main/java/net/devh/boot/grpc/examples/security/server/SecurityConfiguration.java

@@ -51,9 +51,11 @@
 public class SecurityConfiguration {
 
     @Bean
-    JwtAuthenticationConverter jwtAuthenticationConverter() {
+    JwtAuthenticationConverter jwtAuthenticationConverter(
+            final KeyCloakGrantedAuthoritiesConverter keyCloakGrantedAuthoritiesConverter) {
+
         final JwtAuthenticationConverter converter = new JwtAuthenticationConverter();
-        converter.setJwtGrantedAuthoritiesConverter(keyCloakGrantedAuthoritiesConverter());
+        converter.setJwtGrantedAuthoritiesConverter(keyCloakGrantedAuthoritiesConverter);
         return converter;
     }
 
@@ -63,26 +65,26 @@ KeyCloakGrantedAuthoritiesConverter keyCloakGrantedAuthoritiesConverter() {
     }
 
     @Bean
-    JwtAuthenticationProvider jwtAuthenticationProvider() {
+    JwtAuthenticationProvider jwtAuthenticationProvider(final JwtAuthenticationConverter jwtAuthenticationConverter) {
         final JwtAuthenticationProvider provider = new JwtAuthenticationProvider(jwtDecoder());
-        provider.setJwtAuthenticationConverter(jwtAuthenticationConverter());
+        provider.setJwtAuthenticationConverter(jwtAuthenticationConverter);
         return provider;
     }
 
     @Bean
     /*
      * Add the authentication providers to the manager.
      */
-    AuthenticationManager authenticationManager() {
+    AuthenticationManager authenticationManager(final JwtAuthenticationProvider jwtAuthenticationProvider) {
         final List<AuthenticationProvider> providers = new ArrayList<>();
-        providers.add(jwtAuthenticationProvider());
+        providers.add(jwtAuthenticationProvider);
         return new ProviderManager(providers);
     }
 
     @Bean
     // Configure which authentication types you support.
     GrpcAuthenticationReader authenticationReader() {
-        return new BearerAuthenticationReader(accessToken -> new BearerTokenAuthenticationToken(accessToken));
+        return new BearerAuthenticationReader(BearerTokenAuthenticationToken::new);
     }
 
     @Bean

examples/security-grpc-server/src/main/java/net/devh/boot/grpc/examples/security/server/SecurityConfiguration.java

@@ -65,17 +65,17 @@ PasswordEncoder passwordEncoder() {
 
     @Bean
     // This could be your database lookup. There are some complete implementations in spring-security-web.
-    UserDetailsService userDetailsService() {
+    UserDetailsService userDetailsService(final PasswordEncoder passwordEncoder) {
         return username -> {
             log.debug("Searching user: {}", username);
             switch (username) {
                 case "guest": {
-                    return new User(username, passwordEncoder().encode(username + "Password"), Collections.emptyList());
+                    return new User(username, passwordEncoder.encode(username + "Password"), Collections.emptyList());
                 }
                 case "user": {
                     final List<SimpleGrantedAuthority> authorities =
                             Arrays.asList(new SimpleGrantedAuthority("ROLE_GREET"));
-                    return new User(username, passwordEncoder().encode(username + "Password"), authorities);
+                    return new User(username, passwordEncoder.encode(username + "Password"), authorities);
                 }
                 default: {
                     throw new UsernameNotFoundException("Could not find user!");
@@ -87,18 +87,21 @@ UserDetailsService userDetailsService() {
     @Bean
     // One of your authentication providers.
     // They ensure that the credentials are valid and populate the user's authorities.
-    DaoAuthenticationProvider daoAuthenticationProvider() {
+    DaoAuthenticationProvider daoAuthenticationProvider(
+            final UserDetailsService userDetailsService,
+            final PasswordEncoder passwordEncoder) {
+
         final DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(userDetailsService());
-        provider.setPasswordEncoder(passwordEncoder());
+        provider.setUserDetailsService(userDetailsService);
+        provider.setPasswordEncoder(passwordEncoder);
         return provider;
     }
 
     @Bean
     // Add the authentication providers to the manager.
-    AuthenticationManager authenticationManager() {
+    AuthenticationManager authenticationManager(final DaoAuthenticationProvider daoAuthenticationProvider) {
         final List<AuthenticationProvider> providers = new ArrayList<>();
-        providers.add(daoAuthenticationProvider());
+        providers.add(daoAuthenticationProvider);
         return new ProviderManager(providers);
     }