Fix: Env Vars used in UI app (#128)

fix: env vars used in UI app
payobills · May 12, 2024 · a1a401c · a1a401c
1 parent ee006ed
commit a1a401c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/apps/ui/k8s/values.yaml b/apps/ui/k8s/values.yaml
@@ -8,7 +8,7 @@ image:
  repository: ghcr.io/payobills/apps/ui
  pullPolicy: IfNotPresent
  # Overrides the image tag whose default is the chart appVersion.
- tag: "v0.2.0-alpha.8"
+ tag: "0.2.2"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -32,6 +32,14 @@ pod:
  value: "80"
  - name: BILLS_SERVICE
  value: "http://bills.payobills-dev.svc.cluster.local"
+ - name: OIDC_CLIENT_ID
+ value: "payobills"
+ - name: OIDC_TENANT_URL
+ value: "http://idp.mrsauravsahu.in"
+ - name: OWN_URL
+ value: "http://payobills.mrsauravsahu.in"
+ - name: OIDC_TENANT_LOGIN_URL_TEMPLATE
+ value: "${OIDC_TENANT_URL}/auth/realms/homelab/protocol/openid-connect/auth?client_id=${OIDC_CLIENT_ID}&redirect_uri=${OWN_URL}/callback&response_type=code&grant_type=authorization_code&scope=openid"
 
 podAnnotations: {}
 

diff --git a/apps/ui/src/src/routes/+page.server.ts b/apps/ui/src/src/routes/+page.server.ts
@@ -1,15 +1,16 @@
-import { OIDC_TENANT_LOGIN_URL_TEMPLATE, OIDC_TENANT_URL, OWN_URL } from '$env/static/private';
+import { env } from '$env/dynamic/private';
 
 /** @type {import('./$types').PageLoad} */
 export function load() {
 
- var loginUrl = OIDC_TENANT_LOGIN_URL_TEMPLATE
- .replace('${OWN_URL}', OWN_URL)
- .replace('${OIDC_TENANT_URL}', OIDC_TENANT_URL)
+ var loginUrl = env.OIDC_TENANT_LOGIN_URL_TEMPLATE
+ .replace('${OWN_URL}', env.OWN_URL)
+ .replace('${OIDC_CLIENT_ID}', env.OIDC_CLIENT_ID)
+ .replace('${OIDC_TENANT_URL}', env.OIDC_TENANT_URL)
 
  return {
  urls: {
- oidcUrl: OIDC_TENANT_URL,
+ oidcUrl: env.OIDC_TENANT_URL,
  loginUrl
  }
  };

diff --git a/apps/ui/src/src/routes/callback/+page.server.ts b/apps/ui/src/src/routes/callback/+page.server.ts
@@ -1,11 +1,11 @@
-import { OIDC_TENANT_URL, OWN_URL } from '$env/static/private';
+import { env } from '$env/dynamic/private';
 
 /** @type {import('./$types').PageLoad} */
 export function load() {
  return {
  urls: {
- oidcUrl: OIDC_TENANT_URL,
- ownUrl: OWN_URL
+ oidcUrl: env.OIDC_TENANT_URL,
+ ownUrl: env.OWN_URL
  }
  };
 }