From d9a7cf6a77bc139e4ef2a1d5836bb8b57c480358 Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Fri, 13 Feb 2026 01:13:47 +0100
Subject: [PATCH] fix(cms): update env schema and cms-apply script to fix email
 and auth issues

---
 lib/env.ts           | 14 ++++++++++++++
 scripts/cms-apply.sh | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/lib/env.ts b/lib/env.ts
index bc0acb30..72df1efe 100644
--- a/lib/env.ts
+++ b/lib/env.ts
@@ -26,6 +26,20 @@ const envExtension = {
   // Analytics
   UMAMI_WEBSITE_ID: z.string().optional(),
   UMAMI_API_ENDPOINT: z.string().optional(),
+
+  // Mail Configuration
+  MAIL_HOST: z.string().optional(),
+  MAIL_PORT: z.coerce.number().optional(),
+  MAIL_USERNAME: z.string().optional(),
+  MAIL_PASSWORD: z.string().optional(),
+  MAIL_FROM: z.string().optional(),
+  MAIL_RECIPIENTS: z.string().optional(),
+
+  // Directus Authentication
+  DIRECTUS_URL: z.string().url().optional(),
+  DIRECTUS_ADMIN_EMAIL: z.string().email().optional(),
+  DIRECTUS_ADMIN_PASSWORD: z.string().optional(),
+  DIRECTUS_API_TOKEN: z.string().optional(),
 };
 
 /**
diff --git a/scripts/cms-apply.sh b/scripts/cms-apply.sh
index c8c5087c..62d61c65 100755
--- a/scripts/cms-apply.sh
+++ b/scripts/cms-apply.sh
@@ -9,7 +9,7 @@ if [ -z "$ENV" ]; then
     exit 1
 fi
 
-PRJ_ID=$(jq -r .name package.json | sed 's/@mintel\///' | sed 's/\.com$//')
+PRJ_ID=$(jq -r .name package.json | sed 's/@mintel\///' | sed 's/\.com$//' | sed 's/-nextjs$//')
 
 case $ENV in
   local)
@@ -25,7 +25,10 @@ case $ENV in
     case $ENV in
       testing)    PROJECT_NAME="${PRJ_ID}-testing" ;;
       staging)    PROJECT_NAME="${PRJ_ID}-staging" ;;
-      production) PROJECT_NAME="${PRJ_ID}-prod"    ;;
+      production) 
+        PROJECT_NAME="${PRJ_ID}-prod"
+        OLD_PROJECT_NAME="${PRJ_ID}com" # Fallback for legacy naming
+        ;;
     esac
     
     echo "📤 Uploading snapshot to $ENV..."
@@ -34,8 +37,16 @@ case $ENV in
     echo "🔍 Detecting remote container..."
     REMOTE_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus")
     
+    if [ -z "$REMOTE_CONTAINER" ] && [ -n "$OLD_PROJECT_NAME" ]; then
+        echo "⚠️ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
+        REMOTE_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus")
+        if [ -n "$REMOTE_CONTAINER" ]; then
+            PROJECT_NAME=$OLD_PROJECT_NAME
+        fi
+    fi
+
     if [ -z "$REMOTE_CONTAINER" ]; then
-        echo "❌ Remote container for $ENV not found."
+        echo "❌ Remote container for $ENV not found (checked $PROJECT_NAME)."
         exit 1
     fi