Merge pull request #3318 from navikt/feature/krr-forbedring-frontend

Feature/krr forbedring frontend
navikt · Oct 27, 2023 · 8e71bd9 · 8e71bd9
2 parents df4e84b + 53ccd53
commit 8e71bd9
Show file tree

Hide file tree

Showing 100 changed files with 1,303 additions and 789 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
@@ -7,6 +7,7 @@
 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;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 
@@ -20,7 +21,7 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
         httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-                .csrf(csrfSpec -> csrfSpec.disable())
+                .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",

diff --git a/...-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java b/...-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java
@@ -22,7 +22,7 @@ public class SecurityConfig {
     @Bean
     public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
         return httpSecurity
-                .csrf(csrfSpec -> csrfSpec.disable())
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
                 .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
                         "/internal/**",
                         "/webjars/**",

diff --git a/...ice/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/SecurityConfig.java b/...ice/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/SecurityConfig.java
@@ -23,7 +23,7 @@ public class SecurityConfig {
     @Bean
     public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
         return httpSecurity
-                .csrf(csrfSpec -> csrfSpec.disable())
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
                 .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
                         "/internal/**",
                         "/webjars/**",

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
@@ -6,6 +6,7 @@
 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;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 
@@ -18,7 +19,7 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
         httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-                .csrf(csrfSpec -> csrfSpec.disable())
+                .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",

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
@@ -7,6 +7,7 @@
 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;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 
@@ -21,7 +22,7 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
         httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-                .csrf(csrfSpec -> csrfSpec.disable())
+                .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",

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
@@ -6,6 +6,7 @@
 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;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 
@@ -18,7 +19,7 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
         httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-                .csrf(csrfSpec -> csrfSpec.disable())
+                .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",

diff --git a/...bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/SecurityConfig.java b/...bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/SecurityConfig.java
@@ -23,7 +23,7 @@ public class SecurityConfig {
     @Bean
     public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
         return httpSecurity
-                .csrf(csrfSpec -> csrfSpec.disable())
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
                 .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
                         "/internal/**",
                         "/webjars/**",

diff --git a/...d/src/main/java/no/nav/dolly/bestilling/krrstub/mapper/DigitalKontaktMappingStrategy.java b/...d/src/main/java/no/nav/dolly/bestilling/krrstub/mapper/DigitalKontaktMappingStrategy.java
@@ -20,27 +20,6 @@
 @Component
 public class DigitalKontaktMappingStrategy implements MappingStrategy {
 
-    private static void kobleMaalformTilSpraak(RsDollyUtvidetBestilling bestilling, DigitalKontaktdata digitalKontaktdata) {
-
-        String maalform = null;
-
-        if (nonNull(bestilling.getTpsMessaging()) && isKrrMaalform(bestilling.getTpsMessaging().getSpraakKode())) {
-            maalform = bestilling.getTpsMessaging().getSpraakKode();
-        }
-
-        if (isNotBlank(maalform) && isBlank(digitalKontaktdata.getSpraak())) {
-
-            digitalKontaktdata.setSpraak(isNotBlank(maalform) ? maalform.toLowerCase() : maalform); //NOSONAR
-            digitalKontaktdata.setSpraakOppdatert(ZonedDateTime.now());
-            digitalKontaktdata.setRegistrert(true);
-        }
-    }
-
-    private static boolean isKrrMaalform(String spraak) {
-
-        return isNotBlank(spraak) && Stream.of("NB", "NN", "EN", "SE").anyMatch(spraak::equalsIgnoreCase);
-    }
-
     @Override
     public void register(MapperFactory factory) {
         factory.classMap(RsDigitalKontaktdata.class, DigitalKontaktdata.class)
@@ -52,21 +31,30 @@ public void mapAtoB(RsDigitalKontaktdata digitalKontaktdata, DigitalKontaktdata
 
                         kontaktdataRequest.setGyldigFra(getDato(digitalKontaktdata));
 
-                        if (nonNull(digitalKontaktdata.getMobil())) {
+                        if (isNotBlank(digitalKontaktdata.getMobil())) {
                             kontaktdataRequest.setMobilOppdatert(getDato(digitalKontaktdata));
                             kontaktdataRequest.setMobilVerifisert(getDato(digitalKontaktdata));
+                            kontaktdataRequest.setMobil(digdirFormatertTlfNummer(digitalKontaktdata.getMobil()));
                         }
-                        if (nonNull(digitalKontaktdata.getEpost())) {
+                        if (isNotBlank(digitalKontaktdata.getEpost())) {
                             kontaktdataRequest.setEpostOppdatert(getDato(digitalKontaktdata));
                             kontaktdataRequest.setEpostVerifisert(getDato(digitalKontaktdata));
                         }
-                        if (nonNull(digitalKontaktdata.getSpraak())) {
+                        if (isNotBlank(digitalKontaktdata.getSpraak())) {
                             kontaktdataRequest.setSpraakOppdatert(getDato(digitalKontaktdata));
                         }
 
                         kobleMaalformTilSpraak((RsDollyUtvidetBestilling) context.getProperty("bestilling"), kontaktdataRequest);
                     }
 
+                    private String digdirFormatertTlfNummer(String mobil) {
+                        if (isBlank(mobil)) {
+                            return null;
+                        }
+                        var nummerUtenSpace = mobil.replace(" ", "");
+                        return nummerUtenSpace.contains("+47") ? nummerUtenSpace : "+47%s".formatted(nummerUtenSpace);
+                    }
+
                     private ZonedDateTime getDato(RsDigitalKontaktdata digitalKontaktdata) {
                         return nonNull(digitalKontaktdata.getGyldigFra()) ?
                                 ZonedDateTime.of(digitalKontaktdata.getGyldigFra(), ZoneId.systemDefault()) :
@@ -77,4 +65,25 @@ private ZonedDateTime getDato(RsDigitalKontaktdata digitalKontaktdata) {
                 .byDefault()
                 .register();
     }
+
+    private static void kobleMaalformTilSpraak(RsDollyUtvidetBestilling bestilling, DigitalKontaktdata digitalKontaktdata) {
+
+        String maalform = null;
+
+        if (nonNull(bestilling.getTpsMessaging()) && isKrrMaalform(bestilling.getTpsMessaging().getSpraakKode())) {
+            maalform = bestilling.getTpsMessaging().getSpraakKode();
+        }
+
+        if (isNotBlank(maalform) && isBlank(digitalKontaktdata.getSpraak())) {
+
+            digitalKontaktdata.setSpraak(isNotBlank(maalform) ? maalform.toLowerCase() : maalform); //NOSONAR
+            digitalKontaktdata.setSpraakOppdatert(ZonedDateTime.now());
+            digitalKontaktdata.setRegistrert(true);
+        }
+    }
+
+    private static boolean isKrrMaalform(String spraak) {
+
+        return isNotBlank(spraak) && Stream.of("NB", "NN", "EN", "SE").anyMatch(spraak::equalsIgnoreCase);
+    }
 }
diff --git a/...backend/src/test/java/no/nav/dolly/mapper/strategy/DigitalKontaktMappingStrategyTest.java b/...backend/src/test/java/no/nav/dolly/mapper/strategy/DigitalKontaktMappingStrategyTest.java
@@ -22,7 +22,9 @@
 class DigitalKontaktMappingStrategyTest {
 
     private static final String EPOST = "[email protected]";
-    private static final String MOBIL = "99990000";
+    private static final String MOBIL_INCORRECT = "99990000";
+    private static final String MOBIL_INCORRECT_SPACE = "+47 99990000";
+    private static final String MOBIL_CORRECT = "+4799990000";
     private static final String SPRAAK = "NO";
     private static final boolean RESERVERT = true;
     private static final LocalDateTime GYLDIG_FRA = LocalDateTime.of(2018, 1, 1, 0, 0);
@@ -59,14 +61,27 @@ void mapReservert_OK() {
     }
 
     @Test
-    void mapMobil_OK() {
+    void mapMobil_Incorrect_OK() {
 
         var result = mapperFacade.map(RsDigitalKontaktdata.builder()
                 .gyldigFra(GYLDIG_FRA)
-                .mobil(MOBIL)
+                .mobil(MOBIL_INCORRECT)
                 .build(), DigitalKontaktdata.class, context);
 
-        assertThat(result.getMobil(), is(equalTo(MOBIL)));
+        assertThat(result.getMobil(), is(equalTo(MOBIL_CORRECT)));
+        assertThat(result.getMobilOppdatert(), is(equalTo(Z_GYLDIG_FRA)));
+        assertThat(result.getMobilVerifisert(), is(equalTo(Z_GYLDIG_FRA)));
+    }
+
+    @Test
+    void mapMobil_WithSpace_OK() {
+
+        var result = mapperFacade.map(RsDigitalKontaktdata.builder()
+                .gyldigFra(GYLDIG_FRA)
+                .mobil(MOBIL_INCORRECT_SPACE)
+                .build(), DigitalKontaktdata.class, context);
+
+        assertThat(result.getMobil(), is(equalTo(MOBIL_CORRECT)));
         assertThat(result.getMobilOppdatert(), is(equalTo(Z_GYLDIG_FRA)));
         assertThat(result.getMobilVerifisert(), is(equalTo(Z_GYLDIG_FRA)));
     }

diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
@@ -40,7 +40,7 @@ dependencyManagement {
     applyMavenExclusions = false
     imports {
         mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
-        mavenBom 'org.springframework.session:spring-session-bom:2021.2.0'
+        mavenBom 'org.springframework.session:spring-session-bom:2021.2.3'
 
     }
 }

diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
@@ -49,6 +49,7 @@ spec:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
@@ -54,6 +54,7 @@ spec:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
@@ -54,6 +54,7 @@ spec:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
@@ -59,6 +59,7 @@ spec:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -48,6 +48,7 @@ public class DollyFrontendApplicationStarter {
     private final TestnavBrregstubProxyProperties testnavBrregstubProxyProperties;
     private final TestnavInstProxyProperties testnavInstProxyProperties;
     private final TestnavAaregProxyProperties testnavAaregProxyProperties;
+    private final TestnavUdistubProxyProperties testnavUdistubProxyProperties;
     private final TestnavArenaForvalterenProxyProperties testnavArenaForvalterenProxyProperties;
     private final TestnavKrrstubProxyProperties testnavKrrstubProxyProperties;
     private final TestnavMedlProxyProperties testnavMedlProxyProperties;
@@ -97,6 +98,7 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(testnavInntektstubProxyProperties))
                 .route(createRoute(testnavBrregstubProxyProperties))
                 .route(createRoute(testnavAaregProxyProperties))
+                .route(createRoute(testnavUdistubProxyProperties, "testnav-udistub-proxy"))
                 .route(createRoute(testnavArenaForvalterenProxyProperties))
                 .route(createRoute(testnavKrrstubProxyProperties, "testnav-krrstub-proxy"))
                 .route(createRoute(testnavMedlProxyProperties, "testnav-medl-proxy"))

diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/IdportenSecurityConfig.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/IdportenSecurityConfig.java
@@ -48,34 +48,32 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http) {
         var logoutSuccessHandler = new LogoutSuccessHandler();
         logoutSuccessHandler.applyOn("idporten", new IdportenOcidLogoutUrlResolver(wellKnownUrl, postLogoutRedirectUri));
 
-        return http.cors()
-                .and().csrf().disable()
-                .authorizeExchange()
-                .pathMatchers(
-                        "/internal/isReady",
-                        "/internal/isAlive",
-                        "/assets/*",
-                        "/internal/metrics",
-                        "/oauth2/callback",
-                        "/favicon.ico",
-                        LOGIN,
-                        LOGOUT,
-                        "/oauth2/logout",
-                        "/*.css",
-                        "/*.js",
-                        "/*.mjs",
-                        "/*.png"
-                ).permitAll()
-                .anyExchange().authenticated()
-                .and().oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
+        return http.cors(ServerHttpSecurity.CorsSpec::disable)
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
+                .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.pathMatchers(
+                                "/internal/isReady",
+                                "/internal/isAlive",
+                                "/assets/*",
+                                "/internal/metrics",
+                                "/oauth2/callback",
+                                "/favicon.ico",
+                                LOGIN,
+                                LOGOUT,
+                                "/oauth2/logout",
+                                "/*.css",
+                                "/*.js",
+                                "/*.mjs",
+                                "/*.png"
+                        ).permitAll()
+                        .anyExchange().authenticated())
+                .oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
                         .authenticationManager(authenticationManger)
                         .authenticationSuccessHandler(authenticationSuccessHandler))
-                .formLogin().loginPage(LOGIN)
-                .and().logout(logoutSpec -> logoutSpec
+                .formLogin(formLoginSpec -> formLoginSpec.loginPage(LOGIN))
+                .logout(logoutSpec -> logoutSpec
                         .logoutUrl(LOGOUT)
                         .requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, LOGOUT))
                         .logoutSuccessHandler(logoutSuccessHandler))
                 .build();
     }
-
 }
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalSecurityConfig.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalSecurityConfig.java
@@ -29,29 +29,28 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http) {
         var authenticationSuccessHandler = new DollyAuthenticationSuccessHandler();
         var logoutSuccessHandler = new LogoutSuccessHandler();
 
-        return http.cors()
-                .and().csrf().disable()
-                .authorizeExchange()
-                .pathMatchers(
-                        "/internal/isReady",
-                        "/internal/isAlive",
-                        "/assets/*",
-                        "/internal/metrics",
-                        "/oauth2/callback",
-                        "/favicon.ico",
-                        LOGIN,
-                        LOGOUT,
-                        "/oauth2/logout",
-                        "/*.css",
-                        "/*.js",
-                        "/*.mjs",
-                        "/*.png"
-                ).permitAll()
-                .anyExchange().authenticated()
-                .and().oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
+        return http.cors(ServerHttpSecurity.CorsSpec::disable)
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
+                .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.pathMatchers(
+                                "/internal/isReady",
+                                "/internal/isAlive",
+                                "/assets/*",
+                                "/internal/metrics",
+                                "/oauth2/callback",
+                                "/favicon.ico",
+                                LOGIN,
+                                LOGOUT,
+                                "/oauth2/logout",
+                                "/*.css",
+                                "/*.js",
+                                "/*.mjs",
+                                "/*.png"
+                        ).permitAll()
+                        .anyExchange().authenticated())
+                .oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
                         .authenticationSuccessHandler(authenticationSuccessHandler))
-                .formLogin().loginPage(LOGIN)
-                .and().logout(logoutSpec -> logoutSpec
+                .formLogin(formLoginSpec -> formLoginSpec.loginPage(LOGIN))
+                .logout(logoutSpec -> logoutSpec
                         .logoutUrl(LOGOUT)
                         .requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, LOGOUT))
                         .logoutSuccessHandler(logoutSuccessHandler))