Bruker tokenx token endpoint fra miljøvariabler.

navikt · Sep 6, 2023 · d4bfa9a · d4bfa9a
1 parent 3332796
commit d4bfa9a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/nais/dev-gcp.json b/nais/dev-gcp.json
@@ -35,7 +35,6 @@
     "NO_NAV_GATEWAYS_SAF_SELVBETJENING_BASE_URL": "https://safselvbetjening-q1.dev-fss-pub.nais.io",
     "NO_NAV_GATEWAYS_STS_URL": "https://api-gw-q1.oera.no/security-token-service",
     "NO_NAV_GATEWAYS_K9_SAK_INNSYN_API_BASE_URL": "http://k9-sak-innsyn-api",
-    "TOKENDINGS_BASE_URL": "https://tokendings.dev-gcp.nais.io",
     "SAFSELVBETJENING_TOKEN_X_AUDIENCE": "dev-fss:teamdokumenthandtering:safselvbetjening-q1",
     "SAF_AZURE_SCOPE": "api://dev-fss.teamdokumenthandtering.saf-q1/.default",
     "K9_SAK_INNSYN_API_TOKEN_X_AUDIENCE": "dev-gcp:dusseldorf:k9-sak-innsyn-api",

diff --git a/nais/prod-gcp.json b/nais/prod-gcp.json
@@ -35,7 +35,6 @@
     "NO_NAV_GATEWAYS_SAF_SELVBETJENING_BASE_URL": "https://safselvbetjening.prod-fss-pub.nais.io",
     "NO_NAV_GATEWAYS_STS_URL": "https://api-gw.oera.no/security-token-service",
     "NO_NAV_GATEWAYS_K9_SAK_INNSYN_API_BASE_URL": "http://k9-sak-innsyn-api",
-    "TOKENDINGS_BASE_URL": "https://tokendings.prod-gcp.nais.io",
     "SAF_AZURE_SCOPE": "api://prod-fss.teamdokumenthandtering.saf/.default",
     "SAFSELVBETJENING_TOKEN_X_AUDIENCE": "prod-fss:teamdokumenthandtering:safselvbetjening",
     "K9_SAK_INNSYN_API_TOKEN_X_AUDIENCE": "prod-gcp:dusseldorf:k9-sak-innsyn-api",

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -40,7 +40,7 @@ no.nav:
       client:
         registration:
           tokenx-safselvbetjening:
-            token-endpoint-url: ${TOKENDINGS_BASE_URL}/token
+            token-endpoint-url: ${TOKEN_X_TOKEN_ENDPOINT}
             grant-type: urn:ietf:params:oauth:grant-type:token-exchange
             authentication:
               client-auth-method: private_key_jwt
@@ -50,7 +50,7 @@ no.nav:
               audience: ${SAFSELVBETJENING_TOKEN_X_AUDIENCE}
 
           tokenx-k9-sak-innsyn-api:
-            token-endpoint-url: ${TOKENDINGS_BASE_URL}/token
+            token-endpoint-url: ${TOKEN_X_TOKEN_ENDPOINT}
             grant-type: urn:ietf:params:oauth:grant-type:token-exchange
             authentication:
               client-auth-method: private_key_jwt
@@ -60,7 +60,7 @@ no.nav:
               audience: ${K9_SAK_INNSYN_API_TOKEN_X_AUDIENCE}
 
           tokenx-k9-selvbetjening-oppslag:
-            token-endpoint-url: ${TOKENDINGS_BASE_URL}/token
+            token-endpoint-url: ${TOKEN_X_TOKEN_ENDPOINT}
             grant-type: urn:ietf:params:oauth:grant-type:token-exchange
             authentication:
               client-auth-method: private_key_jwt