@striae-org/striae 3.2.2 → 4.0.0

package/scripts/deploy-pages-secrets.sh

@@ -0,0 +1,231 @@
+#!/bin/bash
+
+# ======================================
+# STRIAE PAGES SECRETS DEPLOYMENT SCRIPT
+# ======================================
+# This script deploys required secrets to Cloudflare Pages environments.
+
+set -e
+set -o pipefail
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+echo -e "${BLUE}🔐 Striae Pages Secrets Deployment Script${NC}"
+echo "=========================================="
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+cd "$PROJECT_ROOT"
+
+trap 'echo -e "\n${RED}❌ deploy-pages-secrets.sh failed near line ${LINENO}${NC}"' ERR
+
+show_help=false
+deploy_production=true
+deploy_preview=true
+
+for arg in "$@"; do
+    case "$arg" in
+        -h|--help)
+            show_help=true
+            ;;
+        --production-only)
+            deploy_production=true
+            deploy_preview=false
+            ;;
+        --preview-only)
+            deploy_production=false
+            deploy_preview=true
+            ;;
+        *)
+            echo -e "${RED}❌ Unknown option: $arg${NC}"
+            echo "Use --help to see supported options."
+            exit 1
+            ;;
+    esac
+done
+
+if [ "$show_help" = "true" ]; then
+    echo "Usage: bash ./scripts/deploy-pages-secrets.sh [--production-only|--preview-only]"
+    echo ""
+    echo "Options:"
+    echo "  --production-only  Deploy secrets only to the production Pages environment"
+    echo "  --preview-only     Deploy secrets only to the preview Pages environment"
+    echo "  -h, --help         Show this help message"
+    exit 0
+fi
+
+if [ "$deploy_production" != "true" ] && [ "$deploy_preview" != "true" ]; then
+    echo -e "${RED}❌ No target environment selected${NC}"
+    exit 1
+fi
+
+require_command() {
+    local cmd=$1
+    if ! command -v "$cmd" > /dev/null 2>&1; then
+        echo -e "${RED}❌ Error: required command '$cmd' is not installed or not in PATH${NC}"
+        exit 1
+    fi
+}
+
+strip_carriage_returns() {
+    printf '%s' "$1" | tr -d '\r'
+}
+
+is_placeholder() {
+    local value="$1"
+    local normalized
+
+    normalized=$(echo "$value" | tr '[:upper:]' '[:lower:]')
+
+    if [ -z "$normalized" ]; then
+        return 0
+    fi
+
+    [[ "$normalized" == your_*_here ]]
+}
+
+load_required_project_id() {
+    local admin_service_path="app/config/admin-service.json"
+    local service_project_id
+
+    if [ ! -f "$admin_service_path" ]; then
+        echo -e "${RED}❌ Error: Required Firebase admin service file not found: $admin_service_path${NC}"
+        echo -e "${YELLOW}   Create app/config/admin-service.json before deploying Pages secrets.${NC}"
+        exit 1
+    fi
+
+    if ! service_project_id=$(node -e "const fs=require('fs'); const data=JSON.parse(fs.readFileSync(process.argv[1], 'utf8')); process.stdout.write(data.project_id || '');" "$admin_service_path"); then
+        echo -e "${RED}❌ Error: Could not parse project_id from $admin_service_path${NC}"
+        exit 1
+    fi
+
+    service_project_id=$(strip_carriage_returns "$service_project_id")
+
+    if [ -z "$service_project_id" ] || is_placeholder "$service_project_id"; then
+        echo -e "${RED}❌ Error: project_id in $admin_service_path is missing or placeholder${NC}"
+        exit 1
+    fi
+
+    PROJECT_ID="$service_project_id"
+    export PROJECT_ID
+
+    echo -e "${GREEN}✅ Loaded PROJECT_ID from $admin_service_path${NC}"
+}
+
+get_required_value() {
+    local var_name=$1
+    local value="${!var_name}"
+
+    value=$(strip_carriage_returns "$value")
+
+    if [ -z "$value" ] || is_placeholder "$value"; then
+        echo -e "${RED}❌ Error: required value for $var_name is missing or placeholder${NC}" >&2
+        exit 1
+    fi
+
+    printf '%s' "$value"
+}
+
+get_optional_value() {
+    local var_name=$1
+    local value="${!var_name}"
+
+    value=$(strip_carriage_returns "$value")
+
+    if [ -z "$value" ] || is_placeholder "$value"; then
+        printf ''
+        return 0
+    fi
+
+    printf '%s' "$value"
+}
+
+set_pages_secret() {
+    local secret_name=$1
+    local secret_value=$2
+    local pages_env=$3
+
+    echo -e "${YELLOW}  Setting $secret_name for $pages_env...${NC}"
+
+    if [ "$pages_env" = "production" ]; then
+        printf '%s' "$secret_value" | wrangler pages secret put "$secret_name" --project-name "$PAGES_PROJECT_NAME"
+        return 0
+    fi
+
+    printf '%s' "$secret_value" | wrangler pages secret put "$secret_name" --project-name "$PAGES_PROJECT_NAME" --env "$pages_env"
+}
+
+deploy_pages_environment_secrets() {
+    local pages_env=$1
+    local secret
+    local secret_value
+
+    echo -e "\n${BLUE}🔧 Deploying Pages secrets to $pages_env...${NC}"
+
+    for secret in "${required_pages_secrets[@]}"; do
+        secret_value=$(get_required_value "$secret")
+        set_pages_secret "$secret" "$secret_value" "$pages_env"
+    done
+
+    local optional_api_token
+    optional_api_token=$(get_optional_value "API_TOKEN")
+    if [ -n "$optional_api_token" ]; then
+        set_pages_secret "API_TOKEN" "$optional_api_token" "$pages_env"
+    fi
+
+    echo -e "${GREEN}✅ Pages secrets deployed to $pages_env${NC}"
+}
+
+require_command wrangler
+require_command node
+
+if [ ! -f ".env" ]; then
+    echo -e "${RED}❌ Error: .env file not found${NC}"
+    echo -e "${YELLOW}   Run deploy-config first to generate and populate .env.${NC}"
+    exit 1
+fi
+
+echo -e "${YELLOW}📖 Loading environment variables from .env...${NC}"
+source .env
+
+load_required_project_id
+
+PAGES_PROJECT_NAME=$(strip_carriage_returns "$PAGES_PROJECT_NAME")
+if [ -z "$PAGES_PROJECT_NAME" ] || is_placeholder "$PAGES_PROJECT_NAME"; then
+    echo -e "${RED}❌ Error: PAGES_PROJECT_NAME is missing or placeholder in .env${NC}"
+    exit 1
+fi
+
+required_pages_secrets=(
+    "AUDIT_WORKER_DOMAIN"
+    "DATA_WORKER_DOMAIN"
+    "IMAGES_API_TOKEN"
+    "IMAGES_WORKER_DOMAIN"
+    "PDF_WORKER_AUTH"
+    "PDF_WORKER_DOMAIN"
+    "PROJECT_ID"
+    "R2_KEY_SECRET"
+    "USER_DB_AUTH"
+    "USER_WORKER_DOMAIN"
+)
+
+echo -e "${YELLOW}🔍 Validating required Pages secret values...${NC}"
+for secret in "${required_pages_secrets[@]}"; do
+    get_required_value "$secret" > /dev/null
+done
+echo -e "${GREEN}✅ Required Pages secret values found${NC}"
+
+if [ "$deploy_production" = "true" ]; then
+    deploy_pages_environment_secrets "production"
+fi
+
+if [ "$deploy_preview" = "true" ]; then
+    deploy_pages_environment_secrets "preview"
+fi
+
+echo -e "\n${GREEN}🎉 Pages secrets deployment completed!${NC}"

package/scripts/deploy-worker-secrets.sh

@@ -181,7 +181,7 @@ fi
 
 # User Worker  
 if ! set_worker_secrets "User Worker" "workers/user-worker" \
-    "USER_DB_AUTH" "R2_KEY_SECRET" "IMAGES_API_TOKEN" "PROJECT_ID" "FIREBASE_SERVICE_ACCOUNT_EMAIL" "FIREBASE_SERVICE_ACCOUNT_PRIVATE_KEY"; then
+    "USER_DB_AUTH" "R2_KEY_SECRET" "IMAGES_API_TOKEN" "DATA_WORKER_DOMAIN" "IMAGES_WORKER_DOMAIN" "PROJECT_ID" "FIREBASE_SERVICE_ACCOUNT_EMAIL" "FIREBASE_SERVICE_ACCOUNT_PRIVATE_KEY"; then
     echo -e "${YELLOW}⚠️  Skipping User Worker (not configured)${NC}"
 fi
 

package/workers/audit-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "AUDIT_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/audit-worker.ts",
-  "compatibility_date": "2026-03-14",
+  "compatibility_date": "2026-03-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 
@@ -18,12 +18,5 @@
     }
   ],
 
-  "routes": [
-    {
-      "pattern": "AUDIT_WORKER_DOMAIN",
-      "custom_domain": true
-    }
-  ],
-
   "placement": { "mode": "smart" }
 }

package/workers/data-worker/wrangler.jsonc.example

@@ -3,7 +3,7 @@
   "name": "DATA_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/data-worker.ts",
-  "compatibility_date": "2026-03-14",
+  "compatibility_date": "2026-03-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 
@@ -19,12 +19,5 @@
     }
   ],
 
-  "routes": [
-    {
-      "pattern": "DATA_WORKER_DOMAIN",
-      "custom_domain": true
-    }
-  ],
-
   "placement": { "mode": "smart" }
 }

package/workers/image-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "IMAGES_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/image-worker.ts",
-  "compatibility_date": "2026-03-14",
+  "compatibility_date": "2026-03-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 
@@ -10,13 +10,6 @@
   "observability": { 
 	"enabled": true
   },
-  
-  "routes": [
-    {
-      "pattern": "IMAGES_WORKER_DOMAIN",
-      "custom_domain": true
-    }
-  ],
 
   "placement": { "mode": "smart" }
 }

package/workers/keys-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "KEYS_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/keys.ts",
-  "compatibility_date": "2026-03-14",
+  "compatibility_date": "2026-03-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 
@@ -10,13 +10,6 @@
   "observability": { 
 	"enabled": true
   },  
-
-  "routes": [
-    {
-      "pattern": "KEYS_WORKER_DOMAIN",
-      "custom_domain": true
-    }
-  ],
-
+  
   "placement": { "mode": "smart" }
 }

package/workers/pdf-worker/scripts/generate-assets.js

@@ -0,0 +1,94 @@
+#!/usr/bin/env node
+/**
+ * Scans src/assets/ and generates src/assets/generated-assets.ts with one named
+ * export per file.  Run via:  npm run generate:assets
+ *
+ * Naming rule: filename → remove extension → uppercase → non-alphanumeric → _
+ *   icon-256.png   → ICON_256
+ *   logo.svg       → LOGO
+ *   brand-mark.webp → BRAND_MARK
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const ASSETS_DIR = path.join(__dirname, '../src/assets');
+const OUTPUT_FILE = path.join(__dirname, '../src/assets/generated-assets.ts');
+
+const MIME_TYPES = {
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.svg': 'image/svg+xml',
+  '.gif': 'image/gif',
+  '.webp': 'image/webp',
+  '.ico': 'image/x-icon',
+};
+
+function toConstName(filename) {
+  return filename
+    .replace(/\.[^.]+$/, '')       // strip extension
+    .toUpperCase()
+    .replace(/[^A-Z0-9]+/g, '_')  // non-alphanumeric → underscore
+    .replace(/^_+|_+$/g, '');     // trim leading/trailing underscores
+}
+
+function toDataUri(filepath) {
+  const ext = path.extname(filepath).toLowerCase();
+  const mime = MIME_TYPES[ext];
+  if (!mime) return null;
+
+  const data = fs.readFileSync(filepath);
+  const b64 = data.toString('base64');
+  const chunks = b64.match(/.{1,120}/g) || [];
+
+  const lines = [];
+  lines.push(`  "data:${mime};base64," +`);
+  chunks.forEach((chunk, i) => {
+    lines.push(`  "${chunk}"${i === chunks.length - 1 ? ';' : ' +'}`);
+  });
+  return lines.join('\n');
+}
+
+if (!fs.existsSync(ASSETS_DIR)) {
+  console.error(`assets directory not found: ${ASSETS_DIR}`);
+  process.exit(1);
+}
+
+const files = fs
+  .readdirSync(ASSETS_DIR)
+  .filter((f) => Object.keys(MIME_TYPES).includes(path.extname(f).toLowerCase()))
+  .sort();
+
+if (files.length === 0) {
+  console.warn('No supported asset files found in src/assets/.');
+  process.exit(0);
+}
+
+const sections = [
+  '// Auto-generated by scripts/generate-assets.js',
+  '// Do not edit manually — run `npm run generate:assets` to regenerate.',
+  '',
+];
+
+const exported = [];
+
+for (const file of files) {
+  const uri = toDataUri(path.join(ASSETS_DIR, file));
+  if (!uri) continue;
+
+  const constName = toConstName(file);
+  exported.push({ file, constName });
+
+  sections.push(`// Source: src/assets/${file}`);
+  sections.push(`export const ${constName} =`);
+  sections.push(uri);
+  sections.push('');
+}
+
+fs.writeFileSync(OUTPUT_FILE, sections.join('\n'));
+
+console.log(`Generated ${OUTPUT_FILE}`);
+exported.forEach(({ file, constName }) =>
+  console.log(`  ${constName.padEnd(30)} ← src/assets/${file}`)
+);

package/workers/pdf-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "PDF_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/pdf-worker.ts",
-  "compatibility_date": "2026-03-14",
+  "compatibility_date": "2026-03-15",
   "compatibility_flags": [
     "nodejs_compat"
   ],
@@ -15,12 +15,5 @@
 	"enabled": true
   },
 
-  "routes": [
-    {
-      "pattern": "PDF_WORKER_DOMAIN",
-      "custom_domain": true
-    }
-  ],
-
   "placement": { "mode": "smart" }
 }

package/workers/user-worker/src/user-worker.example.ts

@@ -3,6 +3,8 @@ interface Env {
   USER_DB: KVNamespace;
   R2_KEY_SECRET: string;
   IMAGES_API_TOKEN: string;
+  DATA_WORKER_DOMAIN?: string;
+  IMAGES_WORKER_DOMAIN?: string;
   PROJECT_ID: string;
   FIREBASE_SERVICE_ACCOUNT_EMAIL: string;
   FIREBASE_SERVICE_ACCOUNT_PRIVATE_KEY: string;
@@ -84,9 +86,8 @@ const corsHeaders: Record<string, string> = {
 };
 
 // Worker URLs - configure these for deployment
-const DATA_WORKER_URL = 'DATA_WORKER_DOMAIN';
-
-const IMAGE_WORKER_URL = 'IMAGES_WORKER_DOMAIN';
+const DEFAULT_DATA_WORKER_BASE_URL = 'DATA_WORKER_DOMAIN';
+const DEFAULT_IMAGE_WORKER_BASE_URL = 'IMAGES_WORKER_DOMAIN';
 
 const GOOGLE_OAUTH_TOKEN_URL = 'https://oauth2.googleapis.com/token';
 const FIREBASE_IDENTITY_TOOLKIT_BASE_URL = 'https://identitytoolkit.googleapis.com/v1/projects';
@@ -98,6 +99,33 @@ async function authenticate(request: Request, env: Env): Promise<void> {
   if (authKey !== env.USER_DB_AUTH) throw new Error('Unauthorized');
 }
 
+function normalizeWorkerBaseUrl(workerDomain: string): string {
+  const trimmedDomain = workerDomain.trim().replace(/\/+$/, '');
+  if (trimmedDomain.startsWith('http://') || trimmedDomain.startsWith('https://')) {
+    return trimmedDomain;
+  }
+
+  return `https://${trimmedDomain}`;
+}
+
+function resolveDataWorkerBaseUrl(env: Env): string {
+  const configuredDomain = typeof env.DATA_WORKER_DOMAIN === 'string' ? env.DATA_WORKER_DOMAIN.trim() : '';
+  if (configuredDomain.length > 0) {
+    return normalizeWorkerBaseUrl(configuredDomain);
+  }
+
+  return normalizeWorkerBaseUrl(DEFAULT_DATA_WORKER_BASE_URL);
+}
+
+function resolveImageWorkerBaseUrl(env: Env): string {
+  const configuredDomain = typeof env.IMAGES_WORKER_DOMAIN === 'string' ? env.IMAGES_WORKER_DOMAIN.trim() : '';
+  if (configuredDomain.length > 0) {
+    return normalizeWorkerBaseUrl(configuredDomain);
+  }
+
+  return normalizeWorkerBaseUrl(DEFAULT_IMAGE_WORKER_BASE_URL);
+}
+
 function base64UrlEncode(value: string | Uint8Array): string {
   const bytes = typeof value === 'string' ? textEncoder.encode(value) : value;
   let binary = '';
@@ -317,49 +345,86 @@ async function deleteSingleCase(env: Env, userUid: string, caseNumber: string):
   const dataApiKey = env.R2_KEY_SECRET;
   const imageApiKey = env.IMAGES_API_TOKEN;
 
-  try {
-    // Get case data from data worker
-    const caseResponse = await fetch(`${DATA_WORKER_URL}/${encodeURIComponent(userUid)}/${encodeURIComponent(caseNumber)}/data.json`, {
-      headers: { 'X-Custom-Auth-Key': dataApiKey }
-    });
+  const dataWorkerBaseUrl = resolveDataWorkerBaseUrl(env);
+  const imageWorkerBaseUrl = resolveImageWorkerBaseUrl(env);
+  const encodedUserId = encodeURIComponent(userUid);
+  const encodedCaseNumber = encodeURIComponent(caseNumber);
 
-    if (!caseResponse.ok) {
-      return;
-    }
+  const caseResponse = await fetch(`${dataWorkerBaseUrl}/${encodedUserId}/${encodedCaseNumber}/data.json`, {
+    headers: { 'X-Custom-Auth-Key': dataApiKey }
+  });
 
-    const caseData: CaseData = await caseResponse.json();
+  if (caseResponse.status === 404) {
+    return;
+  }
 
-    // Delete all files associated with this case
-    if (caseData.files && caseData.files.length > 0) {
-      for (const file of caseData.files) {
-        try {
-          // Delete image file - correct endpoint
-          await fetch(`${IMAGE_WORKER_URL}/${encodeURIComponent(file.id)}`, {
-            method: 'DELETE',
-            headers: {
-              'Authorization': `Bearer ${imageApiKey}`
-            }
-          });
-          
-          // Delete notes file if exists
-          await fetch(`${DATA_WORKER_URL}/${encodeURIComponent(userUid)}/${encodeURIComponent(caseNumber)}/${encodeURIComponent(file.id)}/data.json`, {
+  if (!caseResponse.ok) {
+    throw new Error(`Failed to load case data for deletion (${caseNumber}): ${caseResponse.status}`);
+  }
+
+  const caseData = await caseResponse.json() as CaseData;
+  const deletionErrors: string[] = [];
+
+  // Delete all files associated with this case
+  if (caseData.files && caseData.files.length > 0) {
+    for (const file of caseData.files) {
+      const encodedFileId = encodeURIComponent(file.id);
+
+      try {
+        const imageDeleteResponse = await fetch(`${imageWorkerBaseUrl}/${encodedFileId}`, {
+          method: 'DELETE',
+          headers: {
+            'Authorization': `Bearer ${imageApiKey}`
+          }
+        });
+
+        if (!imageDeleteResponse.ok && imageDeleteResponse.status !== 404) {
+          deletionErrors.push(`image ${file.id} delete failed (${imageDeleteResponse.status})`);
+        }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : 'unknown image delete error';
+        deletionErrors.push(`image ${file.id} delete threw (${message})`);
+      }
+
+      try {
+        const notesDeleteResponse = await fetch(
+          `${dataWorkerBaseUrl}/${encodedUserId}/${encodedCaseNumber}/${encodedFileId}/data.json`,
+          {
             method: 'DELETE',
             headers: { 'X-Custom-Auth-Key': dataApiKey }
-          });
-        } catch {
-          // Continue with other files
+          }
+        );
+
+        if (!notesDeleteResponse.ok && notesDeleteResponse.status !== 404) {
+          deletionErrors.push(`annotation ${file.id} delete failed (${notesDeleteResponse.status})`);
         }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : 'unknown annotation delete error';
+        deletionErrors.push(`annotation ${file.id} delete threw (${message})`);
       }
     }
+  }
 
-    // Delete the case data file
-    await fetch(`${DATA_WORKER_URL}/${encodeURIComponent(userUid)}/${encodeURIComponent(caseNumber)}/data.json`, {
-      method: 'DELETE',
-      headers: { 'X-Custom-Auth-Key': dataApiKey }
-    });
+  // Delete case data file
+  try {
+    const caseDeleteResponse = await fetch(
+      `${dataWorkerBaseUrl}/${encodedUserId}/${encodedCaseNumber}/data.json`,
+      {
+        method: 'DELETE',
+        headers: { 'X-Custom-Auth-Key': dataApiKey }
+      }
+    );
 
-  } catch {
-    // Continue with user deletion even if case deletion fails
+    if (!caseDeleteResponse.ok && caseDeleteResponse.status !== 404) {
+      deletionErrors.push(`case ${caseNumber} delete failed (${caseDeleteResponse.status})`);
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : 'unknown case delete error';
+    deletionErrors.push(`case ${caseNumber} delete threw (${message})`);
+  }
+
+  if (deletionErrors.length > 0) {
+    throw new Error(`Case cleanup incomplete for ${caseNumber}: ${deletionErrors.join('; ')}`);
   }
 }
 
@@ -376,11 +441,10 @@ async function executeUserDeletion(
   const userObject: UserData = JSON.parse(userData);
   const ownedCases = (userObject.cases || []).map((caseItem) => caseItem.caseNumber);
   const readOnlyCases = (userObject.readOnlyCases || []).map((caseItem) => caseItem.caseNumber);
-  const allCaseNumbers = [...ownedCases, ...readOnlyCases];
+  const allCaseNumbers = Array.from(new Set([...ownedCases, ...readOnlyCases]));
   const totalCases = allCaseNumbers.length;
   let completedCases = 0;
-
-  await deleteFirebaseAuthUser(env, userUid);
+  const caseCleanupErrors: string[] = [];
 
   reportProgress?.({
     event: 'start',
@@ -396,17 +460,33 @@ async function executeUserDeletion(
       currentCaseNumber: caseNumber
     });
 
-    await deleteSingleCase(env, userUid, caseNumber);
+    let caseDeletionError: string | null = null;
+    try {
+      await deleteSingleCase(env, userUid, caseNumber);
+    } catch (error) {
+      caseDeletionError = error instanceof Error ? error.message : `Case cleanup failed for ${caseNumber}`;
+      caseCleanupErrors.push(caseDeletionError);
+      console.error(`Case cleanup error for ${caseNumber}:`, error);
+    }
+
     completedCases += 1;
 
     reportProgress?.({
       event: 'case-complete',
       totalCases,
       completedCases,
-      currentCaseNumber: caseNumber
+      currentCaseNumber: caseNumber,
+      success: caseDeletionError === null,
+      message: caseDeletionError || undefined
     });
   }
 
+  if (caseCleanupErrors.length > 0) {
+    throw new Error(`Failed to fully delete all case data: ${caseCleanupErrors.join(' | ')}`);
+  }
+
+  await deleteFirebaseAuthUser(env, userUid);
+
   // Delete the user account from the database
   await env.USER_DB.delete(userUid);