Fikser tilgang til bidrag-person (#60)

* Fikser tilgang til bidrag-person
navikt · Oct 13, 2023 · b1a76bb · b1a76bb
1 parent 57f450d
commit b1a76bb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/.nais/feature.yaml b/.nais/feature.yaml
@@ -2,7 +2,7 @@ name: bidrag-behandling-feature
 ingresses:
   - https://bidrag-behandling-feature.intern.dev.nav.no
 env:
-  BIDRAG_PERSON_URL: https://bidrag-person
+  BIDRAG_PERSON_URL: https://bidrag-person-feature.dev-fss-pub.nais.io/bidrag-person
   BIDRAG_PERSON_SCOPE: dev-fss.bidrag.bidrag-person-feature
   BIDRAG_BEREGN_FORSKUDD_URL: http://bidrag-beregn-forskudd-rest-feature
   BIDRAG_BEREGN_FORSKUDD_SCOPE: dev-gcp.bidrag.bidrag-beregn-forskudd-rest-feature
@@ -34,8 +34,9 @@ database:
   autoResize: false
   tier: db-f1-micro
 outbound-access-apps:
-  - bidrag-person
   - bidrag-beregn-forskudd-rest-feature
   - bidrag-grunnlag-feature
   - bidrag-dokument-forsendelse-feature
-  - bidrag-tilgangskontroll-feature
+  - bidrag-tilgangskontroll-feature
+outbound-access-hosts:
+  - bidrag-person-feature.dev-fss-pub.nais.io
diff --git a/.nais/main.yaml b/.nais/main.yaml
@@ -2,7 +2,7 @@ name: bidrag-behandling
 ingresses:
   - https://bidrag-behandling.intern.dev.nav.no
 env:
-  BIDRAG_PERSON_URL: https://bidrag-person
+  BIDRAG_PERSON_URL: https://bidrag-person.dev-fss-pub.nais.io/bidrag-person
   BIDRAG_PERSON_SCOPE: dev-fss.bidrag.bidrag-person
   BIDRAG_BEREGN_FORSKUDD_URL: http://bidrag-beregn-forskudd-rest
   BIDRAG_BEREGN_FORSKUDD_SCOPE: dev-gcp.bidrag.bidrag-beregn-forskudd-rest
@@ -34,8 +34,9 @@ database:
   autoResize: false
   tier: db-f1-micro
 outbound-access-apps:
-  - bidrag-person
   - bidrag-beregn-forskudd-rest
   - bidrag-grunnlag
   - bidrag-dokument-forsendelse
-  - bidrag-tilgangskontroll
+  - bidrag-tilgangskontroll
+outbound-access-hosts:
+  - bidrag-person.dev-fss-pub.nais.io
diff --git a/.nais/prod.yaml b/.nais/prod.yaml
@@ -2,7 +2,7 @@ name: bidrag-behandling
 ingresses:
   - https://bidrag-behandling.intern.nav.no
 env:
-  BIDRAG_PERSON_URL: https://bidrag-person
+  BIDRAG_PERSON_URL: https://bidrag-person.prod-fss-pub.nais.io/bidrag-person
   BIDRAG_PERSON_SCOPE: prod-fss.bidrag.bidrag-person
   BIDRAG_BEREGN_FORSKUDD_URL: http://bidrag-beregn-forskudd-rest
   BIDRAG_BEREGN_FORSKUDD_SCOPE: prod-gcp.bidrag.bidrag-beregn-forskudd-rest
@@ -33,8 +33,9 @@ database:
   autoResize: false
   tier: db-custom-1-3840
 outbound-access-apps:
-  - bidrag-person
   - bidrag-beregn-forskudd-rest
   - bidrag-grunnlag
   - bidrag-dokument-forsendelse
-  - bidrag-tilgangskontroll
+  - bidrag-tilgangskontroll
+outbound-access-hosts:
+  - bidrag-person.prod-fss-pub.nais.io
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -15,6 +15,15 @@ spring.config.activate.on-profile: nais,lokal-nais
 no.nav.security.jwt:
   client:
     registration:
+      bidrag-person:
+        resource-url: ${BIDRAG_PERSON_URL}
+        token-endpoint-url: https://login.microsoftonline.com/${AZURE_APP_TENANT_ID}/oauth2/v2.0/token
+        grant-type: urn:ietf:params:oauth:grant-type:jwt-bearer
+        scope: api://${BIDRAG_PERSON_SCOPE}/.default
+        authentication:
+          client-id: ${AZURE_APP_CLIENT_ID}
+          client-secret: ${AZURE_APP_CLIENT_SECRET}
+          client-auth-method: client_secret_post
       bidrag-beregn-forskudd-rest:
         resource-url: ${BIDRAG_BEREGN_FORSKUDD_URL}
         token-endpoint-url: https://login.microsoftonline.com/${AZURE_APP_TENANT_ID}/oauth2/v2.0/token