remove duplicate

Author: muha

client-credentials/src/main/java/com/example/config/HelseIDClientCredentialConfiguration.java

@@ -5,7 +5,6 @@
 import com.example.service.AuthorizationDetailsJwtClientParametersConverter;
 import com.example.service.HelseIDClientCredentialTokenService;
 import com.example.service.HelseIDDPoPClientCredentialTokenService;
-import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.security.oauth2.client.ConditionalOnOAuth2ClientRegistrationProperties;
@@ -85,15 +84,14 @@ public HelseIDClientCredentialTokenService helseIDClientCredentialTokenService(
       OAuth2AuthorizedClientService oAuth2AuthorizedClientService,
       @Qualifier("authorizationCredentialsGrantResponseClient")
           OAuth2AccessTokenResponseClient<OAuth2ClientCredentialsGrantRequest>
-          authorizationCredentialsGrantResponseClient) {
+              tokenResponseClient) {
 
     ClientRegistration clientRegistration =
         clientRegistrationRepository.findByRegistrationId(HELSEID_CREDENTIALS);
 
     ClientCredentialsOAuth2AuthorizedClientProvider clientCredentialsAuthorizedClientProvider =
         new ClientCredentialsOAuth2AuthorizedClientProvider();
-    clientCredentialsAuthorizedClientProvider.setAccessTokenResponseClient(
-        authorizationCredentialsGrantResponseClient);
+    clientCredentialsAuthorizedClientProvider.setAccessTokenResponseClient(tokenResponseClient);
 
     return new HelseIDClientCredentialTokenService(
         clientRegistration,
@@ -108,20 +106,18 @@ public HelseIDDPoPClientCredentialTokenService helseIdApiDPOPClientCredentialTok
       DPoPProofBuilder dPoPProofBuilder,
       @Qualifier("authorizationCredentialsGrantResponseDpopClient")
           OAuth2AccessTokenResponseClient<OAuth2ClientCredentialsGrantRequest>
-          authorizationCredentialsGrantResponseDpopClient) {
+              dPoPTokenResponseClient) {
     ClientRegistration clientRegistration =
         clientRegistrationRepository.findByRegistrationId(HELSEID_CREDENTIALS);
 
     ClientCredentialsOAuth2AuthorizedClientProvider clientCredentialsAuthorizedClientProvider =
         new ClientCredentialsOAuth2AuthorizedClientProvider();
-    clientCredentialsAuthorizedClientProvider.setAccessTokenResponseClient(
-        authorizationCredentialsGrantResponseDpopClient);
+    clientCredentialsAuthorizedClientProvider.setAccessTokenResponseClient(dPoPTokenResponseClient);
 
     return new HelseIDDPoPClientCredentialTokenService(
         clientRegistration,
         dPoPProofBuilder,
         oAuth2AuthorizedClientService,
-        clientCredentialsAuthorizedClientProvider,
-        Duration.ofMinutes(2));
+        clientCredentialsAuthorizedClientProvider);
   }
 }

client-credentials/src/main/java/com/example/service/HelseIDDPoPClientCredentialTokenService.java

@@ -25,7 +25,7 @@
 public class HelseIDDPoPClientCredentialTokenService {
 
   private final Clock clock = Clock.systemUTC();
-  private final Duration clockSkew;
+  private final Duration clockSkew = Duration.ofSeconds(60);
   private final ClientRegistration clientRegistration;
   private final DPoPProofBuilder dPoPProofBuilder;
   private final OAuth2AuthorizedClientService oAuth2AuthorizedClientService;
@@ -37,16 +37,11 @@ public HelseIDDPoPClientCredentialTokenService(
       ClientRegistration clientRegistration,
       DPoPProofBuilder dPoPProofBuilder,
       OAuth2AuthorizedClientService oAuth2AuthorizedClientService,
-      ClientCredentialsOAuth2AuthorizedClientProvider authorizedClientProvider,
-      Duration refreshTokenBeforeSeconds) {
+      ClientCredentialsOAuth2AuthorizedClientProvider authorizedClientProvider) {
     this.clientRegistration = clientRegistration;
+    this.dPoPProofBuilder = dPoPProofBuilder;
     this.oAuth2AuthorizedClientService = oAuth2AuthorizedClientService;
-
     clientCredentialsAuthorizedClientProvider = authorizedClientProvider;
-
-    this.clockSkew =
-        refreshTokenBeforeSeconds != null ? refreshTokenBeforeSeconds : Duration.ofSeconds(60);
-    this.dPoPProofBuilder = dPoPProofBuilder;
   }
 
   public DPoPToken getAccessToken(String requestUrl, String requestMethod) {