Bare bruk proxy for FSS

navikt · Apr 24, 2023 · 3041c05 · 3041c05
1 parent d0f7b42
commit 3041c05
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/config/impl/OidcProviderConfig.java b/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/config/impl/OidcProviderConfig.java
@@ -121,13 +121,13 @@ private static OpenIDConfiguration createStsConfiguration(String wellKnownUrl) {
 
     @SuppressWarnings("unused")
     private static OpenIDConfiguration createAzureAppConfiguration(String wellKnownUrl) {
-        var useProxy = ENV.isLocal() ? null : URI.create(ENV.getProperty(AZURE_HTTP_PROXY, getDefaultProxy()));
+        var proxyUrl = ENV.isFss() ? URI.create(ENV.getProperty(AZURE_HTTP_PROXY, getDefaultProxy())) : null;
         return createConfiguration(OpenIDProvider.AZUREAD, Optional.ofNullable(getAzureProperty(AzureProperty.AZURE_OPENID_CONFIG_ISSUER))
-                .orElseGet(() -> getIssuerFra(wellKnownUrl, useProxy).orElse(null)),
+                .orElseGet(() -> getIssuerFra(wellKnownUrl, proxyUrl).orElse(null)),
             Optional.ofNullable(getAzureProperty(AzureProperty.AZURE_OPENID_CONFIG_JWKS_URI))
-                .orElseGet(() -> getJwksFra(wellKnownUrl, useProxy).orElse(null)),
+                .orElseGet(() -> getJwksFra(wellKnownUrl, proxyUrl).orElse(null)),
             Optional.ofNullable(getAzureProperty(AzureProperty.AZURE_OPENID_CONFIG_TOKEN_ENDPOINT))
-                .orElseGet(() -> getTokenEndpointFra(wellKnownUrl, useProxy).orElse(null)), !ENV.isLocal(), useProxy,
+                .orElseGet(() -> getTokenEndpointFra(wellKnownUrl, proxyUrl).orElse(null)), ENV.isFss(), proxyUrl,
             getAzureProperty(AzureProperty.AZURE_APP_CLIENT_ID), getAzureProperty(AzureProperty.AZURE_APP_CLIENT_SECRET), ENV.isLocal());
     }