Test deployment and API updates

Author: chuckmilton

.github/workflows/deploy.yml

@@ -25,8 +25,20 @@ jobs:
           MONGODB_URI: ${{ secrets.MONGODB_URI }}
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
           BREVO_API_KEY: ${{ secrets.BREVO_API_KEY }}
+          BREVO_SENDER_EMAIL: ${{ secrets.BREVO_SENDER_EMAIL }}
+          BREVO_SENDER_NAME: ${{ secrets.BREVO_SENDER_NAME }}
+          GMAIL_CLIENT_ID: ${{ secrets.GMAIL_CLIENT_ID }}
+          GMAIL_CLIENT_SECRET: ${{ secrets.GMAIL_CLIENT_SECRET }}
+          GMAIL_REFRESH_TOKEN: ${{ secrets.GMAIL_REFRESH_TOKEN }}
+          GMAIL_USER: ${{ secrets.GMAIL_USER }}
+          RECIPIENT: ${{ secrets.RECIPIENT }}
         run: npm run build
 
+      - name: Create restart marker (Passenger)
+        run: |
+          mkdir -p tmp
+          date +%s > tmp/restart.txt
+
       - name: Deploy via FTP to cPanel
         uses: SamKirkland/[email protected]
         with:
@@ -44,7 +56,7 @@ jobs:
             **/out/**
             **/.env*
             **/README.md
-            **/deploy.yml
+            **/.github/workflows/**
             **/deploy.sh
 
       - name: Notify deployment completion

deploy.sh

@@ -9,6 +9,14 @@ echo "🚀 Starting automated Node.js deployment..."
 APP_DIR="/home/csulb/public_html"
 NODE_APP_NAME="acm-website"
 
+# Optional Next.js base path for subfolder deploys (e.g., /acm). Leave empty for root.
+export NEXT_BASE_PATH="${NEXT_BASE_PATH:-}"
+export NEXT_ASSET_PREFIX="${NEXT_ASSET_PREFIX:-}"
+
+# Ensure host/port are compatible with cPanel Node.js app
+export HOST="0.0.0.0"
+export PORT="${PORT:-3000}"
+
 # Function to check if Node.js app exists
 check_node_app() {
     echo "📋 Checking if Node.js app exists..."
@@ -20,7 +28,7 @@ check_node_app() {
 install_dependencies() {
     echo "📦 Installing dependencies..."
     cd $APP_DIR
-    npm install --production
+    npm ci --omit=dev || npm install --production
     if [ $? -eq 0 ]; then
         echo "✅ Dependencies installed successfully"
     else
@@ -48,7 +56,11 @@ restart_app() {
     # This would use cPanel API to restart the app
     echo "⚠️  Manual step required: Please restart your Node.js app in cPanel"
     echo "   1. Go to cPanel → Node.js Apps"
-    echo "   2. Find your app and click 'Restart'"
+    echo "   2. Click 'Install NPM Modules' (installs prod deps)"
+    echo "   3. Click 'Run JS Script' → Build command: npm run build"
+    echo "   4. Ensure the 'Application startup file' is server.js"
+    echo "   5. Add Environment Variables if needed: NEXT_BASE_PATH, NEXT_ASSET_PREFIX, JWT_SECRET, MONGODB_URI, BREVO_API_KEY"
+    echo "   6. Click 'Restart'"
 }
 
 # Main deployment process

lib/admin.js

@@ -1,5 +1,5 @@
 import clientPromise from './mongodb';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 
 export async function getAdminByEmail(email) {
     const client = await clientPromise;

lib/brevo.js

@@ -6,7 +6,7 @@ const SENDER           = {
   email: process.env.BREVO_SENDER_EMAIL,
   name:  process.env.BREVO_SENDER_NAME,
 };
-const BASE_URL = 'https://acmcsulb.com';
+const BASE_URL = 'https://csulb.acm.org';
 
 /**
  * Send an email via Brevo SMTP API, including List-Unsubscribe headers.

middleware.js

@@ -1,23 +1,18 @@
 import { NextResponse } from 'next/server';
-import jwt from 'jsonwebtoken';
-
-const SECRET_KEY = process.env.JWT_SECRET;
 
+// Note: Middleware runs on the Edge runtime, avoid Node-only libs like 'jsonwebtoken'.
+// We only check for the presence of a token and defer verification to API routes/pages.
 export function middleware(req) {
-  const authHeader = req.headers.get('Authorization');
-  const token = req.cookies.get('token') || authHeader?.split(' ')[1];
+  const authHeader = req.headers.get('authorization');
+  const bearer = authHeader?.split(' ')[1];
+  const cookieToken = req.cookies.get('token')?.value;
+  const token = bearer || cookieToken;
 
   if (!token) {
     return NextResponse.redirect(new URL('/login', req.url));
   }
 
-  try {
-    jwt.verify(token, SECRET_KEY);
-    return NextResponse.next(); // Allow access if token is valid
-  } catch (error) {
-    console.error('Token verification failed:', error.message);
-    return NextResponse.redirect(new URL('/login', req.url));
-  }
+  return NextResponse.next();
 }
 
 // Protect specific routes

next.config.mjs

@@ -1,4 +1,11 @@
 /** @type {import('next').NextConfig} */
+const isProd = process.env.NODE_ENV === 'production';
+
+// Allow overriding basePath/assetPrefix via env so we can deploy to domain root or a subfolder (e.g., /acm)
+const envBasePath = process.env.NEXT_BASE_PATH; // e.g. "/acm" or undefined for root
+const basePath = envBasePath && envBasePath !== '/' ? envBasePath : undefined;
+const assetPrefix = process.env.NEXT_ASSET_PREFIX || (basePath ? `${basePath}/` : undefined);
+
 const nextConfig = {
   // Dynamic deployment - no static export
   // output: "export", // static export
@@ -9,12 +16,38 @@ const nextConfig = {
     domains: ["localhost", "csulb.acm.org"], // Add your domain here
   },
 
-  // Configure for subfolder deployment
-  basePath: "/acm",
-  assetPrefix: "/acm/",
+  // Only set when provided
+  ...(basePath ? { basePath } : {}),
+  ...(assetPrefix ? { assetPrefix } : {}),
+
+  // Memory optimization for cPanel/low-memory environments
+  experimental: {
+    // Reduce memory usage during build
+    memoryBasedWorkers: false,
+  },
 
-  // If deploying to root:
-  // basePath: '/',
-  // assetPrefix: '/',
+  // Webpack optimization for memory (client-side only)
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.optimization.splitChunks = {
+        chunks: 'all',
+        cacheGroups: {
+          default: {
+            minChunks: 1,
+            priority: -20,
+            reuseExistingChunk: true,
+          },
+          vendor: {
+            test: /[\\/]node_modules[\\/]/,
+            name: 'vendors',
+            priority: -10,
+            chunks: 'all',
+          },
+        },
+      };
+    }
+    return config;
+  },
 };
+
 export default nextConfig;