From 2f5e83deb7cdc8efdad48df3d9603ebc802931ef Mon Sep 17 00:00:00 2001
From: Tyler Adam Martinez <TylerAdamMartinez@outlook.com>
Date: Fri, 3 Apr 2026 13:13:49 -0500
Subject: [PATCH 1/3] fix(CD_preview): Rm VITE_TEST_AUTH requiring user to sign
 in

---
 .github/workflows/CD_preview.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/CD_preview.yml b/.github/workflows/CD_preview.yml
index dc8c11dc..285b3694 100644
--- a/.github/workflows/CD_preview.yml
+++ b/.github/workflows/CD_preview.yml
@@ -66,7 +66,6 @@ jobs:
             --build-arg VITE_MAPBOX_TOKEN=${{ secrets.VITE_MAPBOX_TOKEN }} \
             --build-arg VITE_PUBLIC_POSTHOG_KEY=${{ env.VITE_PUBLIC_POSTHOG_KEY }} \
             --build-arg VITE_PUBLIC_POSTHOG_HOST=${{ env.VITE_PUBLIC_POSTHOG_HOST }} \
-            --build-arg VITE_TEST_AUTH=true \
             -t "us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-$SANITIZED-ocotillo:$IMAGE_TAG" .
 
           docker push "us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-$SANITIZED-ocotillo:$IMAGE_TAG"

From 437c0c5edbc4de91351ddd03bf45e5df86784096 Mon Sep 17 00:00:00 2001
From: Tyler Adam Martinez <TylerAdamMartinez@outlook.com>
Date: Fri, 3 Apr 2026 13:37:07 -0500
Subject: [PATCH 2/3] fix(CD_preview): If REDIRECT_URL is not set it will
 dynmatically set it

---
 .github/workflows/CD_preview.yml | 1 -
 src/config/auth.ts               | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CD_preview.yml b/.github/workflows/CD_preview.yml
index 285b3694..d1c1a035 100644
--- a/.github/workflows/CD_preview.yml
+++ b/.github/workflows/CD_preview.yml
@@ -61,7 +61,6 @@ jobs:
             --build-arg VITE_BASE_URL="/" \
             --build-arg VITE_AUTHENTIK_CLIENT_ID=${{ vars.VITE_AUTHENTIK_CLIENT_ID }} \
             --build-arg VITE_AUTHENTIK_URL=${{ vars.VITE_AUTHENTIK_URL }} \
-            --build-arg VITE_AUTHENTIK_REDIRECT_URI=${{ vars.VITE_AUTHENTIK_REDIRECT_URI }} \
             --build-arg VITE_OCOTILLO_API_URL=${{ vars.VITE_OCOTILLO_API_URL }} \
             --build-arg VITE_MAPBOX_TOKEN=${{ secrets.VITE_MAPBOX_TOKEN }} \
             --build-arg VITE_PUBLIC_POSTHOG_KEY=${{ env.VITE_PUBLIC_POSTHOG_KEY }} \
diff --git a/src/config/auth.ts b/src/config/auth.ts
index a12f0334..0bbaabe7 100644
--- a/src/config/auth.ts
+++ b/src/config/auth.ts
@@ -3,9 +3,13 @@ export const AUTHENTIK_URL =
 
 export const CLIENT_ID = import.meta.env.VITE_AUTHENTIK_CLIENT_ID || 'authentik'
 
+const envRedirect = import.meta.env.VITE_AUTHENTIK_REDIRECT_URI
+
 export const REDIRECT_URI =
-  import.meta.env.VITE_AUTHENTIK_REDIRECT_URI ||
-  'http://localhost:3000/callback'
+  envRedirect ||
+  (typeof window !== 'undefined' && window.location?.origin
+    ? `${window.location.origin}/callback`
+    : 'http://localhost:3000/callback')
 
 const isTruthyEnvValue = (value: unknown): boolean =>
   typeof value === 'string' &&

From 4c60a55fbb2b7acd444b94cc3d5a93cef36539a1 Mon Sep 17 00:00:00 2001
From: Tyler Adam Martinez <TylerAdamMartinez@outlook.com>
Date: Fri, 3 Apr 2026 20:44:27 -0500
Subject: [PATCH 3/3] feat(CD_preview): Update workflow to use our custom
 domain

---
 .github/workflows/CD_preview.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/CD_preview.yml b/.github/workflows/CD_preview.yml
index d1c1a035..51e84e97 100644
--- a/.github/workflows/CD_preview.yml
+++ b/.github/workflows/CD_preview.yml
@@ -65,17 +65,17 @@ jobs:
             --build-arg VITE_MAPBOX_TOKEN=${{ secrets.VITE_MAPBOX_TOKEN }} \
             --build-arg VITE_PUBLIC_POSTHOG_KEY=${{ env.VITE_PUBLIC_POSTHOG_KEY }} \
             --build-arg VITE_PUBLIC_POSTHOG_HOST=${{ env.VITE_PUBLIC_POSTHOG_HOST }} \
-            -t "us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-$SANITIZED-ocotillo:$IMAGE_TAG" .
+            -t "us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-$SANITIZED:$IMAGE_TAG" .
 
-          docker push "us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-$SANITIZED-ocotillo:$IMAGE_TAG"
+          docker push "us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-$SANITIZED:$IMAGE_TAG"
 
       - name: Deploy to Cloud Run
         env:
           IMAGE_TAG: ${{ github.sha }}
           GCP_PROJECT_ID: waterdatainitiative-271000
         run: |
-          gcloud run deploy preview-${{ env.SANITIZED_BRANCH }}-ocotillo \
-            --image us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-${{ env.SANITIZED_BRANCH }}-ocotillo:$IMAGE_TAG \
+          gcloud run deploy preview-${{ env.SANITIZED_BRANCH }} \
+            --image us-central1-docker.pkg.dev/$GCP_PROJECT_ID/ocotillo-previews/preview-${{ env.SANITIZED_BRANCH }}:$IMAGE_TAG \
             --platform managed \
             --region us-central1 \
             --allow-unauthenticated \
@@ -83,10 +83,10 @@ jobs:
             --memory 512Mi \
             --cpu 1
 
-      - name: Get preview URL
+      - name: Set preview URL
         id: preview-url
         run: |
-          echo "url=$(gcloud run services describe preview-${{ env.SANITIZED_BRANCH }}-ocotillo --platform managed --region us-central1 --format 'value(status.url)')" >> $GITHUB_OUTPUT
+          echo "url=https://preview-${{ env.SANITIZED_BRANCH }}.previews.newmexicowaterdata.org" >> $GITHUB_OUTPUT
 
       - name: Comment PR with preview URL
         if: github.event_name == 'pull_request'
@@ -108,4 +108,4 @@ jobs:
         env:
           GCP_PROJECT_ID: waterdatainitiative-271000
         run: |
-          gcloud run services delete preview-${{ env.SANITIZED_BRANCH }}-ocotillo --platform managed --region us-central1 --quiet || true
+          gcloud run services delete preview-${{ env.SANITIZED_BRANCH }} --platform managed --region us-central1 --quiet || true