Fix auth build

incubateur-ademe · Nov 20, 2024 · 01564b8 · 01564b8
1 parent a5b2ed8
commit 01564b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Earthfile b/Earthfile
@@ -449,7 +449,7 @@ app-run: ## construit et lance l'image de l'app en local
 app-test-build: ## construit une image pour exécuter les tests unitaires de l'app
     FROM +front-deps
     ENV NEXT_PUBLIC_SUPABASE_URL
-    ENV NEXT_PUBLIC_SUPABASE_KEY
+    ENV NEXT_PUBLIC_SUPABASE_ANON_KEY
     # copie les sources du module à tester
     COPY $APP_DIR $APP_DIR
     COPY $API_DIR $API_DIR
@@ -467,7 +467,7 @@ app-test: ## lance les tests unitaires de l'app
         --name app-test_tet \
         --env CI=true \ # désactive le mode watch quand on lance la commande en local
         --env NEXT_PUBLIC_SUPABASE_URL='http://fake' \
-        --env NEXT_PUBLIC_SUPABASE_KEY='fake' \
+        --env NEXT_PUBLIC_SUPABASE_ANON_KEY='fake' \
         app-test:latest
 
 package-api-test-build: ## construit une image pour exécuter les tests d'intégration de l'api

diff --git a/app.territoiresentransitions.react/.env.sample b/app.territoiresentransitions.react/.env.sample
@@ -1,4 +1,4 @@
-NEXT_PUBLIC_SUPABASE_KEY=${ANON_KEY}
+NEXT_PUBLIC_SUPABASE_ANON_KEY=${ANON_KEY}
 NEXT_PUBLIC_SUPABASE_URL=${API_URL}
 NEXT_PUBLIC_CRISP_WEBSITE_ID="// Crisp integration (warning: use different ID by deployment env.)"
 NEXT_PUBLIC_SENTRY_DSN=

diff --git a/app.territoiresentransitions.react/Earthfile b/app.territoiresentransitions.react/Earthfile
@@ -18,7 +18,7 @@ build:
   # Disable telemetry during build
   ENV NEXT_TELEMETRY_DISABLED=1
 
-  ENV NEXT_PUBLIC_SUPABASE_KEY=$ANON_KEY
+  ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=$ANON_KEY
   ENV NEXT_PUBLIC_SUPABASE_URL=$API_URL
   ENV NEXT_PUBLIC_AUTH_URL=$AUTH_URL
   ENV NEXT_PUBLIC_PANIER_URL=$PANIER_URL
@@ -48,7 +48,7 @@ docker:
   ARG CRISP_WEBSITE_ID
   ARG SENTRY_DSN
 
-  ENV NEXT_PUBLIC_SUPABASE_KEY=$ANON_KEY
+  ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=$ANON_KEY
   ENV NEXT_PUBLIC_SUPABASE_URL=$API_URL
   ENV NEXT_PUBLIC_AUTH_URL=$AUTH_URL
   ENV NEXT_PUBLIC_PANIER_URL=$PANIER_URL

diff --git a/packages/api/src/environmentVariables.ts b/packages/api/src/environmentVariables.ts
@@ -1,7 +1,9 @@
 export const ENV = {
   node_env: process.env.NODE_ENV,
   logActionsDuration: process.env.NEXT_PUBLIC_LOG_ACTION_DURATION === 'TRUE',
-  supabase_anon_key: process.env.NEXT_PUBLIC_SUPABASE_KEY,
+  supabase_anon_key:
+    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY ??
+    process.env.NEXT_PUBLIC_SUPABASE_KEY,
   supabase_url: process.env.NEXT_PUBLIC_SUPABASE_URL,
   sentry_dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
   posthog: {