Adds test profile classes to avoid nonexisting GetAuthenticatedToken …

…bean in test context.
navikt · Feb 17, 2025 · 4d90479 · 4d90479
1 parent 3eb5138
commit 4d90479
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 9 deletions.
diff --git a/...ain/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java b/...ain/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java
@@ -13,7 +13,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Profile;
-import org.springframework.util.Assert;
 
 @AutoConfiguration(after = ClientCredentialAutoConfiguration.class)
 public class TokenServiceAutoConfiguration {
@@ -25,10 +24,9 @@ public class TokenServiceAutoConfiguration {
     @Bean
     @Profile("test")
     AzureTokenService azureAdTokenServiceTest(
-            AzureClientCredential clientCredential,
-            GetAuthenticatedToken getAuthenticatedToken
+            AzureClientCredential clientCredential
     ) {
-        return new AzureTokenService(null, clientCredential, getAuthenticatedToken);
+        return new AzureTokenService.Test(clientCredential);
     }
 
     @Bean
@@ -47,7 +45,7 @@ AzureTokenService azureAdTokenService(
     AzureNavTokenService azureNavTokenServiceTest(
             AzureNavClientCredential azureNavClientCredential
     ) {
-        return new AzureNavTokenService(null, azureNavClientCredential);
+        return new AzureNavTokenService.Test(azureNavClientCredential);
     }
 
     @Bean
@@ -63,11 +61,9 @@ AzureNavTokenService azureNavTokenService(
     @Bean
     @Profile("test")
     AzureTrygdeetatenTokenService trygdeetatenAzureAdTokenServiceTest(
-            AzureTrygdeetatenClientCredential clientCredential,
-            GetAuthenticatedUserId getAuthenticatedUserId,
-            ObjectMapper objectMapper
+            AzureTrygdeetatenClientCredential clientCredential
     ) {
-        return new AzureTrygdeetatenTokenService(null, clientCredential, getAuthenticatedUserId, objectMapper);
+        return new AzureTrygdeetatenTokenService.Test(clientCredential);
     }
 
     @Bean

diff --git a/...main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureNavTokenService.java b/...main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureNavTokenService.java
@@ -64,4 +64,21 @@ public Mono<AccessToken> exchange(ServerProperties serverProperties) {
         ).call();
 
     }
+
+    /**
+     * Replaces {@link AzureNavTokenService} in test profile.
+     */
+    public static class Test extends AzureNavTokenService {
+
+        public Test(AzureNavClientCredential clientCredential) {
+            super(null, clientCredential);
+        }
+
+        @Override
+        public Mono<AccessToken> exchange(ServerProperties serverProperties) {
+            return Mono.empty();
+        }
+
+    }
+
 }
diff --git a/...rc/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTokenService.java b/...rc/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTokenService.java
@@ -97,4 +97,21 @@ private Mono<AccessToken> generateOnBehalfOfAccessToken(Token token, ServerPrope
                 token
         ).call();
     }
+
+    /**
+     * Replaces {@link AzureTokenService} in test profile.
+     */
+    public static class Test extends AzureTokenService {
+
+        public Test(AzureClientCredential clientCredential) {
+            super(null, clientCredential, null);
+        }
+
+        @Override
+        public Mono<AccessToken> exchange(ServerProperties serverProperties) {
+            return Mono.empty();
+        }
+
+    }
+
 }
diff --git a/.../no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTrygdeetatenTokenService.java b/.../no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTrygdeetatenTokenService.java
@@ -114,4 +114,20 @@ private boolean expires(AccessToken accessToken) {
                 .minusSeconds(300)
                 .isBefore(Instant.now());
     }
+
+    /**
+     * Replaces {@link AzureTrygdeetatenTokenService} in test profile.
+     */
+    public static class Test extends AzureTrygdeetatenTokenService {
+
+        public Test(AzureTrygdeetatenClientCredential clientCredential) {
+            super(null, clientCredential, null, null);
+        }
+
+        @Override
+        public Mono<AccessToken> exchange(ServerProperties serverProperties) {
+            return Mono.empty();
+        }
+    }
+
 }