Endret SecurityConfig jwt til å bruke withDefaults

#deploy-proxy
navikt · Oct 20, 2023 · 9327189 · 9327189
1 parent 60f0315
commit 9327189
Show file tree

Hide file tree

Showing 40 changed files with 80 additions and 79 deletions.
diff --git a/...resse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java b/...resse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -30,8 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...ain/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java b/...ain/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/.../src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java b/.../src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java b/...src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/SecurityConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/SecurityConfig.java
@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -27,8 +28,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java b/...src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java b/...no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -29,8 +30,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...ice/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java b/...ice/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...a/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/SecurityConfig.java b/...a/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...main/java/no/nav/registre/testnorge/generersyntameldingservice/config/SecurityConfig.java b/...main/java/no/nav/registre/testnorge/generersyntameldingservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...c/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/SecurityConfig.java b/...c/main/java/no/nav/registre/testnav/geografiskekodeverkservice/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -30,8 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/.../src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/SecurityConfig.java b/.../src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java b/apps/hodejegeren/src/main/java/no/nav/testnav/apps/hodejegeren/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
@@ -32,8 +33,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/.../src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java b/.../src/main/java/no/nav/registre/inntektsmeldinggeneratorservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/.../main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/SecurityConfig.java b/.../main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...ment-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/SecurityConfig.java b/...ment-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -27,8 +28,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/SecurityConfig.java b/...service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -28,8 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...in/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java b/...in/java/no/nav/registre/testnorge/mn/syntarbeidsforholdservice/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java b/...src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java
@@ -3,6 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -29,8 +30,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }

diff --git a/...rc/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/SecurityConfig.java b/...rc/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/SecurityConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -31,8 +32,7 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/error",
                         "/swagger-ui.html"
                 ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
-                }));
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(Customizer.withDefaults()));
 
         return httpSecurity.build();
     }