From e6e9cb173f033c49ac591b599fe96deb80742db5 Mon Sep 17 00:00:00 2001 From: Sven Anders Robbestad Date: Thu, 10 Dec 2020 15:18:29 +0100 Subject: [PATCH] legger til client_id for API --- server/.env | 3 ++- server/config.js | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/server/.env b/server/.env index 2a8b62397..176e2fb5c 100644 --- a/server/.env +++ b/server/.env @@ -3,7 +3,8 @@ AZURE_APP_LOGOUT_REDIRECT_URL=/logout REDIS_HOST=klage-redis.klage.svc.cluster.local REDIS_SERVICE=redis://klage-redis REDIS_PORT=6379 -DOWNSTREAM_API_CLIENT_ID=0bc199ef-35dd-4aa3-87e6-01506da3dd90 +DOWNSTREAM_API_CLIENT_ID_DEV=0bc199ef-35dd-4aa3-87e6-01506da3dd90 +DOWNSTREAM_API_CLIENT_ID_PROD=21688952-e787-4e49-9564-fcd47783ffc9 DOWNSTREAM_API_SERVICE_URL=http://klage-oppgave-api DOWNSTREAM_API_PATH=/api PORT=8080 diff --git a/server/config.js b/server/config.js index 44633f8a4..6667c53e2 100644 --- a/server/config.js +++ b/server/config.js @@ -129,13 +129,21 @@ const loadReverseProxyConfig = () => { downstream_api = "https://klage-oppgave-api.dev.nav.no/"; } + let api_client_id = envVar({ + name: "DOWNSTREAM_API_CLIENT_ID_PROD", + required: false, + }); + if (server.cluster === "dev-gcp") { + api_client_id = envVar({ + name: "DOWNSTREAM_API_CLIENT_ID_DEV", + required: false, + }); + } + config = { apis: [ { - clientId: envVar({ - name: "DOWNSTREAM_API_CLIENT_ID", - required: false, - }), + clientId: api_client_id, path: envVar({ name: "DOWNSTREAM_API_PATH", required: false }) || "downstream",