Merge pull request #2221 from OneCommunityGlobal/revert-1898

Sundar: revert PR-1898

Author: one-community

package-lock.json

@@ -22,7 +22,7 @@
     "test:ci": "npm test -- --coverage",
     "lint": "eslint ./src --ext .js,.jsx --max-warnings=2000 --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
     "lint:fix": "eslint ./src --ext .js,.jsx --fix --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
-    "build": "babel src -d dist && shx mkdir -p dist/data && shx cp -r src/data/* dist/data/",
+    "build": "babel src -d dist && mkdir -p dist/data && cp -r src/data/* dist/data/ 2>/dev/null || true",
     "buildw": "babel src -d dist --watch",
     "start": "node dist/server.js",
     "dev": "nodemon --exec \"babel-node --only src src/server.js\"",
@@ -61,7 +61,6 @@
     "pidtree": "^0.6.0",
     "prettier": "3.2.5",
     "puppeteer": "^24.40.0",
-    "shx": "^0.4.0",
     "supertest": "^6.3.4"
   },
   "dependencies": {
@@ -89,7 +88,7 @@
     "body-parser": "^1.20.4",
     "card-validator": "^10.0.2",
     "cheerio": "^0.22.0",
-    "cloudinary": "^2.9.0",
+    "cloudinary": "^2.8.0",
     "compression": "^1.8.0",
     "cors": "^2.8.4",
     "cron": "^1.8.2",

package.json

@@ -7,30 +7,33 @@ const logger = require('./startup/logger');
 const globalErrorHandler = require('./utilities/errorHandling/globalErrorHandler');
 // const experienceRoutes = require('./routes/applicantAnalyticsRoutes');
 
-// 1. Core initialization
 logger.init();
+
 app.use(Sentry.Handlers.requestHandler());
 
-// 2. Load essential middleware (The "Engine")
+// Then load all other setup
 require('./startup/compression')(app);
 require('./startup/cors')(app);
-require('./startup/bodyParser')(app); // <--- Crucial this runs before routes
-require('./startup/session')(app);
+require('./startup/bodyParser')(app);
+require('./startup/session')(app); // Add session before middleware and routes
 
-// 3. Define Routes (The "Destination")
-// It is better to move these INSIDE startup/routes.js, but if they stay here:
 app.use('/api/test', testRoutes);
 
 const helpFeedbackRouter = require('./routes/helpFeedbackRouter');
 const helpRequestRouter = require('./routes/helpRequestRouter');
+
 app.use('/api/feedback', helpFeedbackRouter);
 app.use('/api/helprequest', helpRequestRouter);
 
 require('./startup/middleware')(app);
-// This handles all other routes and likely has your 404 handler
-require('./startup/routes')(app); 
 
-// 4. Error Handling (The "Safety Net")
+const weeklyReportsRouter = require('./routes/weeklyReportsRouter');
+
+app.use('/api', weeklyReportsRouter);
+
+// ⚠ This must come *after* your custom /api routes
+require('./startup/routes')(app);
+
 app.use(Sentry.Handlers.errorHandler());
 app.use(globalErrorHandler);
 

src/app.js

@@ -3,8 +3,7 @@ const mongoose = require('mongoose');
 const userTaskSchema = new mongoose.Schema({
   name: { type: String, required: true },
   email: { type: String, required: true, unique: true },
-  role: { type: String, enum: ['student', 'educator','support'], required: true }, 
-  // Add 'support' role
+  role: { type: String, enum: ['student', 'educator'], required: true },
 });
 
 module.exports = mongoose.model('UserTask', userTaskSchema, 'usertask');

src/controllers/activityLogController.js

@@ -1,14 +1,14 @@
 /* eslint-disable complexity */
 /* eslint-disable no-magic-numbers */
-
+const jwt = require('jsonwebtoken');
+const moment = require('moment');
 const express = require('express');
+const config = require('../config');
 const webhookController = require('../controllers/lbdashboard/webhookController'); // your new controller
 const { Bids } = require('../models/lbdashboard/bids'); // or wherever you're getting Bids
 
 const { webhookTest } = webhookController(Bids);
 
-const jwtVerificationLogic = require('../utilities/jwtVerificationLogic');
-
 const paypalAuthMiddleware = (req, res, next) => {
   const authHeader = req.header('Paypal-Auth-Algo');
   if (!authHeader) {
@@ -123,31 +123,40 @@ module.exports = function (app) {
     if (openPaths.includes(req.path)) {
       return next(); // Allow PayPal requests through
     }
+    if (!req.header('Authorization')) {
+      res.status(401).send({ 'error:': 'Unauthorized request' });
+      return;
+    }
+    const authToken = req.header(config.REQUEST_AUTHKEY);
 
-    //  HEADER EXTRACTION
-    const authHeader = req.header('Authorization');
-    const payload = jwtVerificationLogic(authHeader, res);
-
-    // FIX: If payload is a response object (meaning logic already sent a 401), STOP HERE.
-    if (res.headersSent) return;
-
-    //  ATTACH DATA & CONTINUE
-    // Now we know payload is the valid decoded token
-    const requestor = {
-      requestorId: payload.userid,
-      role: payload.role,
-      permissions: payload.permissions,
-    };
-
-    req.user = requestor;
+    let payload = '';
 
-    if (req.body) {
-      req.body.requestor = requestor;
+    try {
+      payload = jwt.verify(authToken, config.JWT_SECRET);
+    } catch (error) {
+      res.status(401).send('Invalid token');
+      return;
+    }
+    if (
+      !payload ||
+      !payload.expiryTimestamp ||
+      !payload.userid ||
+      !payload.role ||
+      moment().isAfter(payload.expiryTimestamp)
+    ) {
+      res.status(401).send('Unauthorized request');
+      return;
     }
 
-    return next();
+    const requestor = {};
+    requestor.requestorId = payload.userid;
+    requestor.role = payload.role;
+    requestor.permissions = payload.permissions;
+
+    req.body.requestor = requestor;
+    next();
   });
 
-  // PROTECTED ROUTES
+  // Apply PayPal middleware only to specific route
   app.post('/api/lb/myWebhooks/', paypalAuthMiddleware, webhookTest);
 };

src/models/activityLog.js

@@ -383,7 +383,6 @@ const educatorRouter = require('../routes/educatorRouter');
 const atomRouter = require('../routes/atomRouter');
 const intermediateTaskRouter = require('../routes/intermediateTaskRouter');
 const savedFilterRouter = require('../routes/savedFilterRouter')(savedFilter);
-const summaryDashboardRouter = require('../routes/summaryDashboard.routes');
 // lbdashboard
 const bidTermsRouter = require('../routes/lbdashboard/bidTermsRouter');
 const bidsRouter = require('../routes/lbdashboard/bidsRouter');
@@ -421,19 +420,26 @@ const lessonPlanSubmissionRouter = require('../routes/lessonPlanner/lessonPlanSu
 const epBadge = require('../models/educationPortal/badgeModel');
 const studentBadges = require('../models/educationPortal/studentBadgesModel');
 const badgeSystemRouter = require('../routes/educationPortal/badgeSystemRouter');
+
 const promotionDetailsRouter = require('../routes/promotionDetailsRouter');
-const activityLogRouter = require('../routes/activityLogRouter');
-const jobHitsAndApplicationsRoutes = require('../routes/jobAnalyticsRouter');
 
-const actualCostRouter = require('../routes/actualCostRouter');
-const kitchenInventoryRouter = require('../routes/kitchenandinventory/KIInventoryRouter');
+const gardenRouter = require('../routes/kitchenInventory/gardenRouter')();
+// Kitchen and Inventory portal routes
+const kitchenInventoryRouter = require('../routes/kitchenandinventory/KIInventoryRouter')();
+const summaryDashboardRouter = require('../routes/summaryDashboard.routes');
+
+// Actual Cost
+const actualCostRouter = require('../routes/actualCostRouter')();
+
+const recipeRouter = require('../routes/kitchenInventory/recipeRouter')();
+
+const jobHitsAndApplicationsRoutes = require('../routes/jobAnalytics/JobHitsAndApplicationsRoutes');
 
 // Education Portal
 const educatorRoutes = require('../routes/educatorRoutes');
 
 module.exports = function (app) {
   app.use('/api/bm/summary-dashboard', summaryDashboardRouter);
-  app.use('/api/support/daily-log', activityLogRouter);
   app.use('/api', forgotPwdRouter);
   app.use('/api', loginRouter);
   app.use('/api', forcePwdRouter);
@@ -635,21 +641,23 @@ module.exports = function (app) {
   app.use('/api/lb', bidDeadlinesRouter);
   app.use('/api/lb', SMSRouter);
 
+  // Education Portal
+  app.use('/api/educationportal/educator', educatorRoutes);
   app.use('/api', materialCostRouter);
 
   app.use('/api/educator/reports', studentReportRouter());
   // education portal
-
   app.use('/api/education', badgeSystemRouter);
+
   app.use('/api/lp', lessonPlanSubmissionRouter);
+
   app.use('/api/education', browsableLessonPlanRouter);
+
   app.use('/api/educator/reports', downloadReportRouter);
 
   // Kitchen and Inventory portal routes
   app.use('/api/kitchenandinventory/inventory', kitchenInventoryRouter);
-
-  // Need to implement gardenRouter
-  // app.use('/api/kitchenandinventory/garden', gardenRouter);
+  app.use('/api/kitchenandinventory/garden', gardenRouter);
 
   // Education Portal
   app.use('/api/student/profile', educationProfileRouter);
@@ -658,6 +666,7 @@ module.exports = function (app) {
 
   app.use('/api/lp', lessonPlanSubmissionRouter);
 
-  // Need to implement gardenRouter
-  // app.use('/api/kitchenandinventory/recipes', recipeRouter);
+  app.use('/api/kitchenandinventory/recipes', recipeRouter);
+
+  app.use('/api/analytics', analyticsRouter);
 };