Make oauth2 client configuration optional

Author: oliemansm

gradle.properties

@@ -23,6 +23,3 @@ LIB_GRAPHQL_SPRING_VER = 7.0.0
 LIB_SPRING_BOOT_VER = 2.2.5.RELEASE
 LIB_BINTRAY_PLUGIN_VER = 1.8.4
 LIB_RELEASE_PLUGIN_VER = 2.8.1
-
-BINTRAY_USER=oliemansm
-BINTRAY_PASS=870d6fae9685bc710d62745087c467c2113dc933

graphql-webclient-spring-boot-autoconfigure/build.gradle

@@ -1,6 +1,8 @@
 dependencies {
     api(project(':graphql-webclient'))
 
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter-webflux"
     implementation "org.springframework.security:spring-security-oauth2-client"

graphql-webclient-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/webclient/boot/OAuth2ClientRegistrationProperties.java

@@ -2,6 +2,7 @@
 
 import static java.util.Optional.ofNullable;
 
+import java.util.Optional;
 import java.util.Set;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -33,31 +34,34 @@ class OAuth2ClientRegistrationProperties {
   private String jwkSetUri;
   private String issuerUri;
 
-  ClientRegistration getClientRegistration() {
-    ClientRegistration.Builder builder = ClientRegistration.withRegistrationId("graphql")
-        .clientId(getClientId())
-        .clientSecret(getClientSecret())
-        .redirectUriTemplate(getRedirectUri())
-        .scope(getScope())
-        .clientName(getClientName())
-        .authorizationUri(getAuthorizationUri())
-        .tokenUri(getTokenUri())
-        .userInfoUri(getUserInfoUri())
-        .jwkSetUri(getJwkSetUri());
-
-    ofNullable(getClientAuthenticationMethod())
-        .map(ClientAuthenticationMethod::new)
-        .ifPresent(builder::clientAuthenticationMethod);
-
-    ofNullable(getAuthorizationGrantType())
-        .map(AuthorizationGrantType::new)
-        .ifPresent(builder::authorizationGrantType);
-
-    ofNullable(getUserInfoAuthenticationMethod())
-        .map(AuthenticationMethod::new)
-        .ifPresent(builder::userInfoAuthenticationMethod);
-
-    return builder.build();
+  Optional<ClientRegistration> getClientRegistration() {
+    if (clientId != null) {
+      ClientRegistration.Builder builder = ClientRegistration.withRegistrationId("graphql")
+          .clientId(getClientId())
+          .clientSecret(getClientSecret())
+          .redirectUriTemplate(getRedirectUri())
+          .scope(getScope())
+          .clientName(getClientName())
+          .authorizationUri(getAuthorizationUri())
+          .tokenUri(getTokenUri())
+          .userInfoUri(getUserInfoUri())
+          .jwkSetUri(getJwkSetUri());
+
+      ofNullable(getClientAuthenticationMethod())
+          .map(ClientAuthenticationMethod::new)
+          .ifPresent(builder::clientAuthenticationMethod);
+
+      ofNullable(getAuthorizationGrantType())
+          .map(AuthorizationGrantType::new)
+          .ifPresent(builder::authorizationGrantType);
+
+      ofNullable(getUserInfoAuthenticationMethod())
+          .map(AuthenticationMethod::new)
+          .ifPresent(builder::userInfoAuthenticationMethod);
+
+      return Optional.of(builder.build());
+    }
+    return Optional.empty();
   }
 
 }

graphql-webclient-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/webclient/boot/OAuth2ClientRegistrationRepositoryConfiguration.java

@@ -1,24 +1,25 @@
 package graphql.kickstart.spring.webclient.boot;
 
-import static java.util.Collections.singletonList;
-
+import java.util.Collections;
 import java.util.List;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
 
 @Configuration
 @EnableConfigurationProperties(OAuth2ClientRegistrationProperties.class)
 class OAuth2ClientRegistrationRepositoryConfiguration {
 
   @Bean
-  @ConditionalOnMissingBean({ClientRegistrationRepository.class})
+  @ConditionalOnMissingBean({ReactiveClientRegistrationRepository.class})
   InMemoryReactiveClientRegistrationRepository clientRegistrationRepository(OAuth2ClientRegistrationProperties properties) {
-    List<ClientRegistration> registrations = singletonList(properties.getClientRegistration());
+    List<ClientRegistration> registrations = properties.getClientRegistration()
+        .map(List::of)
+        .orElseGet(Collections::emptyList);
     return new InMemoryReactiveClientRegistrationRepository(registrations);
   }
 

graphql-webclient-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 graphql.kickstart.spring.webclient.boot.GraphQLWebClientAutoConfiguration,\
-graphql.kickstart.spring.webclient.boot.OAuth2ClientRegistrationProperties
+graphql.kickstart.spring.webclient.boot.OAuth2ClientRegistrationRepositoryConfiguration