From 19e8d8e3cb2badf0f3f090d66b51d0b00d0ae906 Mon Sep 17 00:00:00 2001
From: Josh <jcoakley@aptivaai.com>
Date: Sat, 9 Aug 2025 19:37:37 +0000
Subject: [PATCH] Fixed bodyparser missing import server1

---
 .env               |  2 +-
 .woodpecker.yml    | 14 ++++++++------
 backend/server1.js |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index 7d018e3..c913fe6 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@ CORS_ALLOWED_ORIGINS=https://dev1.aptivaai.com,http://34.16.120.118:3000,http://
 SERVER1_PORT=5000
 SERVER2_PORT=5001
 SERVER3_PORT=5002
-IMG_TAG=c6a0305-202508081951
+IMG_TAG=9365ce4-202508091934
 
 ENV_NAME=dev
 PROJECT=aptivaai-dev
\ No newline at end of file
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 050c21a..2e79915 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -27,6 +27,7 @@ steps:
         trivy image --scanners vuln --ignore-unfixed --ignorefile .trivyignore --exit-code 1 --severity CRITICAL $REG/server3:$IMG_TAG
         trivy image --scanners vuln --ignore-unfixed --ignorefile .trivyignore --exit-code 1 --severity CRITICAL $REG/nginx:$IMG_TAG
 
+
   - name: staging-deploy
     image: google/cloud-sdk:latest
     entrypoint:
@@ -37,6 +38,7 @@ steps:
 
         mkdir -p ~/.ssh
 
+        # ── Inject known-hosts and SSH key ───────────────────────────────
         gcloud secrets versions access latest \
           --secret=STAGING_KNOWN_HOSTS --project=aptivaai-dev \
           | base64 -d > ~/.ssh/known_hosts
@@ -49,6 +51,7 @@ steps:
 
         echo "🔑 SSH prerequisites installed"
 
+        # ── SSH into staging and deploy ──────────────────────────────────
         ssh -o StrictHostKeyChecking=yes \
             -i ~/.ssh/id_ed25519 \
             jcoakley@10.128.0.12 \
@@ -107,12 +110,13 @@ steps:
              export DEK_PATH; \
              export FROM_SECRETS_MANAGER=true; \
              \
+             # ── DEK sync: copy dev wrapped DEK into staging volume path ── \
              if gcloud secrets describe WRAPPED_DEK_dev --project=$PROJECT >/dev/null 2>&1; then \
                echo "🔁 Syncing dev DEK into staging volume"; \
                gcloud secrets versions access latest --secret=WRAPPED_DEK_dev --project=$PROJECT > /tmp/dev_dek.enc; \
                if [ -s /tmp/dev_dek.enc ]; then \
-                 docker volume ls -q | grep -qx aptiva_dek_staging || docker volume create aptiva_dek_staging >/dev/null; \
-                 sudo docker run --rm -v aptiva_dek_staging:/v -v /tmp:/host busybox sh -c "set -e; mkdir -p /v/staging; cp -f /host/dev_dek.enc /v/staging/dek.enc; chown 1000:1000 /v/staging/dek.enc; chmod 400 /v/staging/dek.enc; rm -f /v/staging/dek.fpr; echo -n 'staging dek.enc bytes: '; wc -c </v/staging/dek.enc; ls -l /v/staging"; \
+                 sudo docker volume ls -q | grep -qx aptiva_dek_staging || sudo docker volume create aptiva_dek_staging >/dev/null; \
+                 sudo docker run --rm -v aptiva_dek_staging:/v -v /tmp:/host busybox sh -lc "set -e; mkdir -p /v/staging; cp -f /host/dev_dek.enc /v/staging/dek.enc; chown 1000:1000 /v/staging/dek.enc; chmod 400 /v/staging/dek.enc; rm -f /v/staging/dek.fpr; echo -n \"staging dek.enc bytes: \"; wc -c </v/staging/dek.enc; ls -l /v/staging"; \
                else \
                  echo "⚠️ WRAPPED_DEK_dev returned empty; skipping copy"; \
                fi; \
@@ -123,11 +127,9 @@ steps:
              cd /home/jcoakley/aptiva-staging-app; \
              sudo --preserve-env=IMG_TAG,FROM_SECRETS_MANAGER,JWT_SECRET,OPENAI_API_KEY,ONET_USERNAME,ONET_PASSWORD,STRIPE_SECRET_KEY,STRIPE_PUBLISHABLE_KEY,STRIPE_WH_SECRET,STRIPE_PRICE_PREMIUM_MONTH,STRIPE_PRICE_PREMIUM_YEAR,STRIPE_PRICE_PRO_MONTH,STRIPE_PRICE_PRO_YEAR,DB_NAME,DB_HOST,DB_PORT,DB_USER,DB_PASSWORD,DB_SSL_CA,DB_SSL_CERT,DB_SSL_KEY,TWILIO_ACCOUNT_SID,TWILIO_AUTH_TOKEN,TWILIO_MESSAGING_SERVICE_SID,KMS_KEY_NAME,DEK_PATH \
                docker compose pull; \
-             sudo --preserve-env=IMG_TAG,FROM_SECRETS_MANAGER,JWT_SECRET,OPENAI_API_KEY,ONET_USERNAME,ONET_PASSWORD,STRIPE_SECRET_KEY,STRIPE_PUBLISHABLE_KEY,STRIPE_WH_SECRET,STRIPE_PRICE_PREMIUM_MONTH,STRIPE_PRICE_PREMIUM_YEAR,STRIPE
+             sudo --preserve-env=IMG_TAG,FROM_SECRETS_MANAGER,JWT_SECRET,OPENAI_API_KEY,ONET_USERNAME,ONET_PASSWORD,STRIPE_SECRET_KEY,STRIPE_PUBLISHABLE_KEY,STRIPE_WH_SECRET,STRIPE_PRICE_PREMIUM_MONTH,STRIPE_PRICE_PREMIUM_YEAR,STRIPE_PRICE_PRO_MONTH,STRIPE_PRICE_PRO_YEAR,DB_NAME,DB_HOST,DB_PORT,DB_USER,DB_PASSWORD,DB_SSL_CA,DB_SSL_CERT,DB_SSL_KEY,TWILIO_ACCOUNT_SID,TWILIO_AUTH_TOKEN,TWILIO_MESSAGING_SERVICE_SID,KMS_KEY_NAME,DEK_PATH \
                docker compose up -d --force-recreate --remove-orphans; \
-             echo \"✅ Staging stack refreshed with tag \$IMG_TAG\"'
-
-
+             echo "✅ Staging stack refreshed with tag $IMG_TAG"'
 
     secrets:
       - STAGING_SSH_KEY
diff --git a/backend/server1.js b/backend/server1.js
index 42293cd..c4e32bf 100755
--- a/backend/server1.js
+++ b/backend/server1.js
@@ -4,6 +4,7 @@ import helmet from 'helmet';
 import dotenv from 'dotenv';
 import { fileURLToPath } from 'url';
 import path from 'path';
+import bodyParser from 'body-parser';
 import bcrypt from 'bcrypt';
 import jwt from 'jsonwebtoken';
 import { initEncryption, encrypt, decrypt, verifyCanary, SENTINEL } from './shared/crypto/encryption.js';