interceptor back in, create client directly

Author: janolaveide

token-client-spring/src/main/kotlin/no/nav/security/token/support/client/spring/oauth2/DefaultOAuth2HttpClient.kt

@@ -9,8 +9,9 @@ import org.springframework.util.LinkedMultiValueMap
 import org.springframework.web.client.RestClient
 import org.springframework.web.client.body
 
-open class DefaultOAuth2HttpClient(val restClient: RestClient) : OAuth2HttpClient {
+open class DefaultOAuth2HttpClient : OAuth2HttpClient {
 
+    val restClient = RestClient.create()
 
     override fun post(req: OAuth2HttpRequest) =
         restClient.post()

token-client-spring/src/main/kotlin/no/nav/security/token/support/client/spring/oauth2/OAuth2ClientConfiguration.kt

@@ -31,6 +31,10 @@ class OAuth2ClientConfiguration : ImportAware {
         attrs = requireNotNull(fromMap(meta.getAnnotationAttributes(EnableOAuth2Client::class.java.name, false))) { "@EnableOAuth2Client is not present on importing class ${meta.className}" }
     }
 
+    @Bean
+    fun oAuth2ClientRequestInterceptor(properties: ClientConfigurationProperties, service: OAuth2AccessTokenService) = OAuth2ClientRequestInterceptor(properties, service)
+
+
     @Bean
     fun oAuth2AccessTokenService(bearerTokenResolver: JwtBearerTokenResolver, client: OAuth2HttpClient) =
         if (attrs?.getBoolean("cacheEnabled") == true) {