bare returnere true for har nivaaa 4 kallet

navikt · Aug 21, 2023 · 36ff21d · 36ff21d
1 parent e48b85b
commit 36ff21d
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 26 deletions.
diff --git a/nais-dev.yaml b/nais-dev.yaml
@@ -46,8 +46,6 @@ spec:
         mountPath: /var/run/secrets/nais.io/service_user_sbs
       - kvPath: /kv/preprod/fss/veilarbperson/q1
         mountPath: /var/run/secrets/nais.io/vault
-      - kvPath: /apikey/apigw/dev/eksternapp.difi.idporten.authlevel/veilarbperson_q1
-        mountPath: /var/run/secrets/nais.io/authlevel
   azure:
     application:
       enabled: true
@@ -76,10 +74,6 @@ spec:
           cluster: dev-gcp
 
   env:
-    - name: DIFI_IDPORTEN_AUTHLEVEL_URL
-      value: https://api-gw-q1.adeo.no/ekstern/difi/authlevel/rest/v1/sikkerhetsnivaa/
-    - name: DIFI_IDPORTEN_TOKEN_URL
-      value: https://api-gw-q1.adeo.no/ekstern/difi/idporten-oidc-provider/token
     - name: KODEVERK_URL
       value: http://kodeverk.default.svc.nais.local
     - name: KONTAKT_OG_RESERVASJONSREGISTERET_API_URL

diff --git a/nais-prod.yaml b/nais-prod.yaml
@@ -43,8 +43,6 @@ spec:
         mountPath: /var/run/secrets/nais.io/service_user_sbs
       - kvPath: /kv/prod/fss/veilarbperson/default
         mountPath: /var/run/secrets/nais.io/vault
-      - kvPath: /apikey/apigw/prod/eksternapp.difi.idporten.authlevel/veilarbperson
-        mountPath: /var/run/secrets/nais.io/authlevel
   azure:
     application:
       enabled: true
@@ -73,10 +71,6 @@ spec:
           cluster: prod-gcp
 
   env:
-    - name: DIFI_IDPORTEN_AUTHLEVEL_URL
-      value: https://api-gw.adeo.no/ekstern/difi/authlevel/rest/v1/sikkerhetsnivaa/
-    - name: DIFI_IDPORTEN_TOKEN_URL
-      value: https://api-gw.adeo.no/ekstern/difi/idporten-oidc-provider/token
     - name: KODEVERK_URL
       value: http://kodeverk.default.svc.nais.local
     - name: KONTAKT_OG_RESERVASJONSREGISTERET_API_URL

diff --git a/src/main/java/no/nav/veilarbperson/config/CacheConfig.java b/src/main/java/no/nav/veilarbperson/config/CacheConfig.java
@@ -17,7 +17,6 @@ public class CacheConfig {
     public static final String NOM_SKJERMEDE_PERSONER_CACHE_NAME = "nom_skjermede_personer_cache";
     public static final String SIKKERHETSTILTAK_CACHE_NAME = "sikkerhetstiltak_cache";
     public static final String DIGDIR_KONTAKTINFO_CACHE_NAME = "digdir_kontaktinfo_cache";
-    public static final String DIFI_HAR_NIVA_4_CACHE_NAME = "difi_har_niva_4_cache";
     public static final String KODEVERK_BETYDNING_CACHE_NAME = "kodeverk_betydning_cache";
 
     public static final String KONTOREGISTER_CACHE_NAME = "kontoregister_person_cache";
@@ -46,10 +45,6 @@ public Cache digdirKontaktinfoCache() {
         return litenCache(DIGDIR_KONTAKTINFO_CACHE_NAME);
     }
 
-    @Bean
-    public Cache difiHarNiva4Cache() {
-        return litenCache(DIFI_HAR_NIVA_4_CACHE_NAME);
-    }
 
     @Bean
     public Cache kodeverkBetydningCache() {

diff --git a/src/main/java/no/nav/veilarbperson/config/EnvironmentProperties.java b/src/main/java/no/nav/veilarbperson/config/EnvironmentProperties.java
@@ -9,8 +9,6 @@
 @ConfigurationProperties(prefix = "app.env")
 public class EnvironmentProperties {
     private String abacUrl;
-    private String difiAuthlevelUrl;
-    private String difiTokenUrl;
     private String kodeverkUrl;
     private String krrScope;
     private String krrUrl;

diff --git a/src/main/java/no/nav/veilarbperson/service/UnleashService.java b/src/main/java/no/nav/veilarbperson/service/UnleashService.java
@@ -7,16 +7,11 @@
 @Service
 @RequiredArgsConstructor
 public class UnleashService {
-	private static final String UNLEASH_NIVAA4_DISABLED = "veilarbperson.nivaa4.disabled";
 	private static final String UNLEASH_POAO_TILGANG_ENABLED = "veilarbperson.poao-tilgang-enabled";
 	private final UnleashClient unleashClient;
 
 	public boolean skalBrukePoaoTilgang() {
 		return unleashClient.isEnabled(UNLEASH_POAO_TILGANG_ENABLED);
 	}
 
-	public boolean sjekkNivaa4() {
-		return unleashClient.isEnabled(UNLEASH_NIVAA4_DISABLED);
-	}
-
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -18,8 +18,6 @@ app.env.poaoTilgangUrl=${POAO_TILGANG_URL:#{null}}
 app.env.poaoTilgangScope=${POAO_TILGANG_SCOPE:#{null}}
 
 # From nais-{dev|prod}.yaml
-app.env.difiAuthlevelUrl=${DIFI_IDPORTEN_AUTHLEVEL_URL}
-app.env.difiTokenUrl=${DIFI_IDPORTEN_TOKEN_URL}
 app.env.kodeverkUrl=${KODEVERK_URL}
 app.env.krrScope=${KONTAKT_OG_RESERVASJONSREGISTERET_SCOPE}
 app.env.krrUrl=${KONTAKT_OG_RESERVASJONSREGISTERET_API_URL}