Gebruik OIDC_PUBLIC_CLIENT_ID voor Keycloak config

Author: robbertbos

apps/boekhouding-backend/src/config.ts

@@ -13,6 +13,6 @@ export const config = {
   keycloak: {
     issuer: `${oidcUrl}/realms/${oidcRealm}`,
     jwksUri: `${oidcInternalUrl}/realms/${oidcRealm}/protocol/openid-connect/certs`,
-    audience: process.env.OIDC_CLIENT_ID || 'boekhouding-frontend',
+    audience: process.env.OIDC_PUBLIC_CLIENT_ID || 'boekhouding-frontend',
   },
 }

containers/compose.dev.yaml

@@ -50,7 +50,7 @@ services:
       OIDC_URL: http://localhost:8080
       OIDC_INTERNAL_URL: http://keycloak:8080
       OIDC_REALM: assessment-boekhouding
-      OIDC_CLIENT_ID: boekhouding-frontend
+      OIDC_PUBLIC_CLIENT_ID: boekhouding-frontend
       NODE_ENV: development
     depends_on:
       postgres:

containers/frontend/Containerfile

@@ -52,7 +52,7 @@ COPY --chmod=755 containers/frontend/entrypoint.sh /entrypoint.sh
 
 ENV OIDC_URL=http://localhost:8080
 ENV OIDC_REALM=assessment-boekhouding
-ENV OIDC_CLIENT_ID=boekhouding-frontend
+ENV OIDC_PUBLIC_CLIENT_ID=boekhouding-frontend
 ENV STANDALONE_URL=/invulhulpen/
 
 EXPOSE 8080

containers/frontend/config.json.template

@@ -1,6 +1,6 @@
 {
   "keycloakUrl": "${OIDC_URL}",
   "keycloakRealm": "${OIDC_REALM}",
-  "keycloakClientId": "${OIDC_CLIENT_ID}",
+  "keycloakClientId": "${OIDC_PUBLIC_CLIENT_ID}",
   "standaloneUrl": "${STANDALONE_URL}"
 }

docs/deployment.md

@@ -37,12 +37,12 @@ ZAD ondersteunt geen init containers of jobs. De backend container draait migrat
 
 De frontend fetcht `/config.json` bij het laden. Dit bestand wordt bij container start gegenereerd via `envsubst` uit env vars. In development (Vite dev server) wordt teruggevallen op `VITE_*` env vars.
 
-| Variabele        | Default                  | ZAD                           |
-|------------------|--------------------------|-------------------------------|
-| `OIDC_URL`       | `http://localhost:8080`  | Auto-inject door ZAD Keycloak |
-| `OIDC_REALM`     | `assessment-boekhouding` | Auto-inject door ZAD Keycloak |
-| `OIDC_CLIENT_ID` | `boekhouding-frontend`   | Auto-inject door ZAD Keycloak |
-| `STANDALONE_URL` | `/invulhulpen/`          | Default is correct            |
+| Variabele               | Default                  | ZAD                           |
+|-------------------------|--------------------------|-------------------------------|
+| `OIDC_URL`              | `http://localhost:8080`  | Auto-inject door ZAD Keycloak |
+| `OIDC_REALM`            | `assessment-boekhouding` | Auto-inject door ZAD Keycloak |
+| `OIDC_PUBLIC_CLIENT_ID` | `boekhouding-frontend`   | Auto-inject door ZAD Keycloak |
+| `STANDALONE_URL`        | `/invulhulpen/`          | Default is correct            |
 
 ### Backend (runtime)