Remove id-porten-loginservice (#87)

navikt · Aug 31, 2023 · 92f4164 · 92f4164
1 parent 164c98d
commit 92f4164
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/nais-dev.yaml b/nais-dev.yaml
@@ -38,7 +38,6 @@ spec:
       memory: 768Mi
   envFrom:
     - configmap: pto-config
-    - configmap: loginservice-idporten
   kafka:
     pool: nav-dev
   vault:

diff --git a/nais.yaml b/nais.yaml
@@ -38,7 +38,6 @@ spec:
       memory: 1024Mi
   envFrom:
     - configmap: pto-config
-    - configmap: loginservice-idporten
   kafka:
     pool: nav-prod
   vault:

diff --git a/src/main/java/no/nav/veilarblest/config/FilterConfig.java b/src/main/java/no/nav/veilarblest/config/FilterConfig.java
@@ -15,7 +15,6 @@
 
 import java.util.Arrays;
 
-import static no.nav.common.auth.Constants.AZURE_AD_B2C_ID_TOKEN_COOKIE_NAME;
 import static no.nav.common.auth.oidc.filter.OidcAuthenticator.fromConfig;
 import static no.nav.common.utils.EnvironmentUtils.isDevelopment;
 
@@ -25,14 +24,6 @@ public class FilterConfig {
     @Value("${spring.application.name}")
     private String applicationName;
 
-    private OidcAuthenticatorConfig loginserviceIdportenConfig(EnvironmentProperties environmentProperties) {
-        return new OidcAuthenticatorConfig()
-                .withDiscoveryUrl(environmentProperties.getLoginserviceIdportenDiscoveryUrl())
-                .withClientId(environmentProperties.getLoginserviceIdportenAudience())
-                .withIdTokenCookieName(AZURE_AD_B2C_ID_TOKEN_COOKIE_NAME)
-                .withUserRole(UserRole.EKSTERN);
-    }
-
     private OidcAuthenticatorConfig naisAzureAdConfig(EnvironmentProperties environmentProperties) {
         return new OidcAuthenticatorConfig()
                 .withDiscoveryUrl(environmentProperties.getAzureAdDiscoveryUrl())
@@ -66,13 +57,11 @@ public FilterRegistrationBean pingFilter() {
             matchIfMissing = true
     )
     public FilterRegistrationBean authenticationFilterRegistrationBean(EnvironmentProperties properties) {
-        OidcAuthenticatorConfig azureAdB2cConfig = loginserviceIdportenConfig(properties);
         OidcAuthenticatorConfig naisAzureAdConfig = naisAzureAdConfig(properties);
 
         FilterRegistrationBean<OidcAuthenticationFilter> registration = new FilterRegistrationBean<>();
         OidcAuthenticationFilter authenticationFilter = new OidcAuthenticationFilter(
                 Arrays.asList(
-                        fromConfig(azureAdB2cConfig),
                         fromConfig(naisAzureAdConfig),
                         fromConfig(tokenxConfig())
                 )