Merge branch 'main' into trevor/getMenteesEndpoint/39

.gitignore

@@ -30,3 +30,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+**/**/.env

api/package.json

@@ -5,8 +5,8 @@
   "main": "src/server.ts",
   "scripts": {
     "build": "tsc",
-    "start": "nodemon ./dist/server.js",
-    "dev": "nodemon ./src/server.ts",
+    "start": "npx ts-node src/server.ts",
+    "dev": "nodemon --watch 'src/**/*.ts' --exec 'npx ts-node src/server.ts'",
     "test": "echo \"Error: no test specified\" && exit 1",
     "prettier": "npx prettier --write .",
     "format": "prettier --check ."
@@ -34,6 +34,7 @@
     "body-parser": "^1.20.3",
     "nodemon": "^3.1.7",
     "prettier": "^3.3.3",
+    "ts-node": "^10.9.2",
     "typescript": "^5.6.2"
   }
 }

api/src/controllers/auth0-errors.ts

@@ -0,0 +1,35 @@
+import { Request, Response, NextFunction } from "express";
+import {
+  InvalidTokenError,
+  UnauthorizedError,
+} from "express-oauth2-jwt-bearer";
+
+export const errorHandler = (
+  error: any,
+  request: Request,
+  response: Response,
+  next: NextFunction,
+) => {
+  console.log("Auth Error");
+
+  if (error instanceof InvalidTokenError) {
+    const message = "Bad credentials";
+
+    response.status(error.status).json({ message });
+
+    return;
+  }
+
+  if (error instanceof UnauthorizedError) {
+    const message = "Requires authentication";
+
+    response.status(error.status).json({ message });
+
+    return;
+  }
+
+  const status = 500;
+  const message = "Internal Server Error";
+
+  response.status(status).json({ message });
+};

api/src/controllers/auth0-middleware.ts

@@ -0,0 +1,21 @@
+import { auth } from "express-oauth2-jwt-bearer";
+import dotenv from "dotenv";
+import path from "path";
+
+dotenv.config({ path: path.resolve(__dirname, "../.env") });
+
+const auth0Domain = process.env.AUTH0_DOMAIN;
+const auth0Audience = process.env.AUTH0_AUDIENCE;
+
+try {
+  if (!auth0Domain || !auth0Audience) {
+    throw new Error("AUTH0_DOMAIN or AUTH0_AUDIENCE is not set");
+  }
+} catch (error) {
+  console.error(error);
+}
+
+export const validateAccessToken = auth({
+  issuerBaseURL: `https://${auth0Domain}`,
+  audience: auth0Audience,
+});

api/src/controllers/auth0-notFound.ts

@@ -0,0 +1,11 @@
+import { Request, Response, NextFunction } from "express";
+
+export const notFoundHandler = (
+  request: Request,
+  response: Response,
+  next: NextFunction,
+) => {
+  const message = "Not Found";
+
+  response.status(404).json({ message });
+};

api/src/routes/user.ts

@@ -7,6 +7,9 @@ import User from "../model/User";
 
 const router = express.Router();
 
+// TODO: Add auth0 middleware
+// router.use(validateAccessToken);
+
 // Call the dbConnect function to connect to MongoDB
 dbConnect();
 
@@ -22,6 +25,7 @@ router.post("/create-user", async (req: any, res: any) => {
     menteeInfo,
     meetingSchedule,
     mentorData,
+    meetings,
   } = req.body;
 
   if (!firstName || !lastName || !username || !email || !role) {
@@ -39,6 +43,7 @@ router.post("/create-user", async (req: any, res: any) => {
     menteeInfo: role === "mentor" ? menteeInfo : undefined,
     meetingSchedule: role === "mentee" ? meetingSchedule : undefined,
     mentorData: role === "mentee" ? mentorData : undefined,
+    meetings: meetings || [],
   });
 
   try {
@@ -54,9 +59,15 @@ router.post("/create-user", async (req: any, res: any) => {
 // Test route to check if the API is working
 router.post("/test", async (req: any, res: any) => {
   console.log("Received group data:");
-  const { name } = req.body;
 
-  return res.status(200).json({ name });
+  let name;
+  if (req.body.name === undefined) {
+    name = "empty";
+  } else {
+    ({ name } = req.body);
+  }
+
+  return res.status(200).json(`Your name is ${name}`);
 });
 
 router.post("/send-email", async (req: any, res: any) => {
@@ -68,14 +79,19 @@ router.post("/send-email", async (req: any, res: any) => {
       throw new Error("SendGrid API key or test email is missing");
     }
 
-    const { email, name } = req.body;
+    const { email, name, role } = req.body;
 
     sgMail.setApiKey(SENDGRID_API_KEY);
 
+    const templateId =
+      role.toLowerCase().trim() === "mentor"
+        ? "d-1694192e437348e2a0517103acae3f00"
+        : "d-7e26b82cf8624bafa4077b6ed73b52bf";
+
     await sgMail.send({
       to: email,
       from: SEND_GRID_TEST_EMAIL,
-      templateId: "d-7e26b82cf8624bafa4077b6ed73b52bf",
+      templateId: templateId,
       dynamicTemplateData: {
         name: name,
       },
@@ -87,4 +103,39 @@ router.post("/send-email", async (req: any, res: any) => {
   }
 });
 
+// Route to add a meeting
+router.post("/add-meeting", async (req, res) => {
+  const { username, meeting, notes } = req.body;
+
+  // Validate required fields
+  if (!username || !meeting || !notes) {
+    return res.status(400).json({ message: "Missing required fields" });
+  }
+
+  try {
+    // Find the user by username
+    console.log("Searching for user with username:", username);
+    const user = await User.findOne({ username });
+
+    if (!user) {
+      console.error(`User not found for username: ${username}`);
+      return res.status(404).json({ message: "User not found" });
+    }
+
+    // Add the meeting to the user's meetings array
+    user.meetings.push({ name: meeting, notes });
+
+    // Save the updated user document
+    await user.save();
+
+    console.log("Meeting added successfully for username:", username);
+    return res
+      .status(200)
+      .json({ message: "Meeting added successfully", user });
+  } catch (error) {
+    console.error("Error adding meeting:", error);
+    return res.status(500).json({ message: "Error adding meeting", error });
+  }
+});
+
 export default router;

api/src/routes/workshop.ts

@@ -1,67 +1,47 @@
 import express from "express";
 import mongoose from "mongoose";
 import dbConnect from "../config/db"; // Import the dbConnect function
-
-import { createWorkshop, getWorkshop } from "../controllers/workshopController";
+// import { validateAccessToken } from "../controllers/auth0-middleware";
 
 const router = express.Router();
 
+// TODO: Add auth0 middleware
+// router.use(validateAccessToken);
+
 // Call the dbConnect function to connect to MongoDB
 dbConnect();
 
-// Workshop schema definition (name and S3 bucket ID)
-const workshopIDSchema = new mongoose.Schema({
-  name: String,
-  s3ID: String,
+// Workshop schema definition (name (required by user), description (required by user), and S3 bucket ID (not required as user input))
+const workshopSchema = new mongoose.Schema({
+  name: { type: String, required: true },
+  description: { type: String, required: true },
+  s3id: { type: String, required: false },
 });
 
-const Workshop = mongoose.model("WorkshopID", workshopIDSchema);
+const Workshop = mongoose.model("Workshop", workshopSchema);
 
 // Route to create a new workshop
 router.post("/create-workshop", async (req: any, res: any) => {
-  const { name, s3id } = req.body;
+  const { name, description, s3id } = req.body;
 
-  if (!name || !s3id) {
+  if (!name || !description) {
     return res.status(400).json({ message: "Missing required fields" });
   }
 
-  // Create a new workshop
-  const newWorkshop = new Workshop({
-    name,
-    s3id,
-  });
-
   try {
+    // Create a new workshop with
+    const newWorkshop = new Workshop({ name, description, s3id });
     const savedWorkshop = await newWorkshop.save();
+
+    // Success:
     res.status(201).json({
       message: "Workshop created successfully",
-      WorkshopID: savedWorkshop,
+      workshop: savedWorkshop,
     });
   } catch (error) {
-    res.status(401).json({ message: "Failed to create workshop", error });
+    console.error("Error saving workshop:", error);
+    res.status(500).json({ message: "Failed to create workshop", error });
   }
 });
 
-// router.post("/workshops", createWorkshop)
-// router.get('/workshops/:id', getWorkshop);
-router.get(
-  "/workshops/:id",
-  async (req: express.Request, res: express.Response) => {
-    await getWorkshop(req, res);
-  },
-);
-
-// POPULATE VERSION (if details of mentor/mentee objects are needed on the frontend like name or picture)
-
-// import express from 'express';
-// import { createWorkshop, getWorkshop } from '../controllers/workshopController';
-
-// const router = express.Router();
-
-// router.post('/workshops', createWorkshop);
-// router.get('/workshops/:id', getWorkshop);
-
-// export default router;
-
 export default router;
-// NO POPULATE VERSION

api/src/server.ts

@@ -12,16 +12,14 @@ import router from "./routes";
 var cors = require("cors");
 
 const app = express();
-app.use(cors());
+app.use(cors({ origin: "http://localhost:3000" })); // Connect to the frontend PORT 3000
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: true }));
 
-app.use("/user", routes.user);
-app.use("/workshop", routes.workshop);
-
 connectDB();
 
 app.use("/user", routes.user);
 app.use("/api", router);
+app.use("/workshop", routes.workshop);
 
 app.listen(process.env.PORT || 8000, () => console.log("Server running..."));