Fix csv update/import on settings page + lots of cors work

inventory-server/src/server.js

@@ -1,5 +1,12 @@
 const path = require('path');
 const fs = require('fs');
+const express = require('express');
+const mysql = require('mysql2/promise');
+const { corsMiddleware, corsErrorHandler } = require('./middleware/cors');
+const productsRouter = require('./routes/products');
+const dashboardRouter = require('./routes/dashboard');
+const ordersRouter = require('./routes/orders');
+const csvRouter = require('./routes/csv');
 
 // Get the absolute path to the .env file
 const envPath = path.resolve(process.cwd(), '.env');
@@ -21,23 +28,6 @@ try {
   console.error('Error loading .env file:', error);
 }
 
-// Log environment variables (excluding sensitive data)
-console.log('Environment variables loaded:', {
-  NODE_ENV: process.env.NODE_ENV,
-  PORT: process.env.PORT,
-  DB_HOST: process.env.DB_HOST,
-  DB_USER: process.env.DB_USER,
-  DB_NAME: process.env.DB_NAME,
-  // Not logging DB_PASSWORD for security
-});
-
-const express = require('express');
-const cors = require('cors');
-const mysql = require('mysql2/promise');
-const productsRouter = require('./routes/products');
-const dashboardRouter = require('./routes/dashboard');
-const ordersRouter = require('./routes/orders');
-
 // Ensure required directories exist
 ['logs', 'uploads'].forEach(dir => {
   if (!fs.existsSync(dir)) {
@@ -47,39 +37,62 @@ const ordersRouter = require('./routes/orders');
 
 const app = express();
 
-// CORS configuration - move before route handlers
-app.use(cors({
-  origin: ['https://inventory.kent.pw', 'https://www.inventory.kent.pw'],
-  methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
-  allowedHeaders: ['Content-Type', 'Authorization'],
-  credentials: true,
-  optionsSuccessStatus: 200 // Some legacy browsers (IE11) choke on 204
-}));
+// Debug middleware to log request details
+app.use((req, res, next) => {
+  console.log('Request details:', {
+    method: req.method,
+    url: req.url,
+    origin: req.get('Origin'),
+    headers: req.headers
+  });
+  next();
+});
+
+// Apply CORS middleware first, before any other middleware
+app.use(corsMiddleware);
 
 // Body parser middleware
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
-// Request logging middleware
-app.use((req, res, next) => {
-  const start = Date.now();
-  res.on('finish', () => {
-    const duration = Date.now() - start;
-    console.log(
-      `[${new Date().toISOString()}] ${req.method} ${req.url} ${res.statusCode} ${duration}ms`
-    );
+// Routes
+app.use('/api/products', productsRouter);
+app.use('/api/dashboard', dashboardRouter);
+app.use('/api/orders', ordersRouter);
+app.use('/api/csv', csvRouter);
+
+// Basic health check route
+app.get('/health', (req, res) => {
+  res.json({ 
+    status: 'ok',
+    timestamp: new Date().toISOString(),
+    environment: process.env.NODE_ENV
   });
-  next();
 });
 
-// Error handling middleware - move before route handlers
+// CORS error handler - must be before other error handlers
+app.use(corsErrorHandler);
+
+// Error handling middleware - MUST be after routes and CORS error handler
 app.use((err, req, res, next) => {
   console.error(`[${new Date().toISOString()}] Error:`, err);
-  res.status(500).json({ 
-    error: process.env.NODE_ENV === 'production' 
-      ? 'An internal server error occurred' 
-      : err.message 
-  });
+  
+  // Send detailed error in development, generic in production
+  const error = process.env.NODE_ENV === 'production'
+    ? 'An internal server error occurred'
+    : err.message || err;
+    
+  res.status(err.status || 500).json({ error });
+});
+
+// Handle uncaught exceptions
+process.on('uncaughtException', (err) => {
+  console.error(`[${new Date().toISOString()}] Uncaught Exception:`, err);
+  process.exit(1);
+});
+
+process.on('unhandledRejection', (reason, promise) => {
+  console.error(`[${new Date().toISOString()}] Unhandled Rejection at:`, promise, 'reason:', reason);
 });
 
 // Database connection pool
@@ -109,30 +122,6 @@ pool.getConnection()
     process.exit(1);
   });
 
-// Routes
-app.use('/api/products', productsRouter);
-app.use('/api/dashboard', dashboardRouter);
-app.use('/api/orders', ordersRouter);
-
-// Basic health check route
-app.get('/health', (req, res) => {
-  res.json({ 
-    status: 'ok',
-    timestamp: new Date().toISOString(),
-    environment: process.env.NODE_ENV
-  });
-});
-
-// Handle uncaught exceptions
-process.on('uncaughtException', (err) => {
-  console.error(`[${new Date().toISOString()}] Uncaught Exception:`, err);
-  process.exit(1);
-});
-
-process.on('unhandledRejection', (reason, promise) => {
-  console.error(`[${new Date().toISOString()}] Unhandled Rejection at:`, promise, 'reason:', reason);
-});
-
 const PORT = process.env.PORT || 3000;
 app.listen(PORT, () => {
   console.log(`[Server] Running in ${process.env.NODE_ENV || 'development'} mode on port ${PORT}`);