Frontend PR

shatter-backend/package.json

@@ -14,16 +14,21 @@
   "description": "",
   "dependencies": {
     "bcryptjs": "^3.0.3",
+    "cors": "^2.8.5",
     "dotenv": "^17.2.3",
     "express": "^5.1.0",
+    "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.19.2",
+    "socket.io": "^4.8.1",
     "zod": "^4.1.12"
   },
   "devDependencies": {
     "@eslint/js": "^9.38.0",
     "@types/bcryptjs": "^2.4.6",
     "@types/express": "^5.0.5",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "^24.9.2",
+    "@types/socket.io": "^3.0.1",
     "eslint": "^9.38.0",
     "globals": "^16.4.0",
     "jiti": "^2.6.1",

shatter-backend/src/app.ts

@@ -1,16 +1,30 @@
 import express from 'express';
+import cors from "cors";
+
 import userRoutes from './routes/user_route'; // these routes define how to handle requests to /api/users
 import authRoutes from './routes/auth_routes';
+import eventRoutes from './routes/event_routes';
 
 const app = express();
 
 app.use(express.json());
 
+app.use(cors({
+  origin: "http://localhost:3000",
+  credentials: true,
+}));
+
+app.use((req, _res, next) => {
+  req.io = app.get('socketio'); 
+  next();
+});
+
 app.get('/', (_req, res) => {
   res.send('Hello');
 });
 
 app.use('/api/users', userRoutes);
 app.use('/api/auth', authRoutes);
+app.use('/api/events', eventRoutes);
 
 export default app;

shatter-backend/src/controllers/auth_controller.ts

@@ -1,18 +1,19 @@
 import { Request, Response } from 'express';
 import { User } from '../models/user_model';
 import { hashPassword, comparePassword } from '../utils/password_hash';
+import { generateToken } from '../utils/jwt_utils';
 
 // Email validation regex
 const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/;
 
 /**
  * POST /api/auth/signup
  * Create new user account
- * 
+ *
  * @param req.body.name - User's display name
  * @param req.body.email - User's email
  * @param req.body.password - User's plain text password
- * @returns 201 with userId on success
+ * @returns 201 with userId and JWT token on success
  */
 export const signup = async (req: Request, res: Response) => {
     try {
@@ -66,10 +67,14 @@ export const signup = async (req: Request, res: Response) => {
 	    passwordHash
 	});
 
-	// return success
+	// generate JWT token for the new user
+	const token = generateToken(newUser._id.toString());
+
+	// return success with token
 	res.status(201).json({
 	    message: 'User created successfully',
-	    userId: newUser._id
+	    userId: newUser._id,
+	    token
 	});
 
     } catch (err: any) {
@@ -148,11 +153,14 @@ export const login = async (req: Request, res: Response) => {
 	user.lastLogin = new Date();
 	await user.save(); // save the updated user
 
-	// 9 - return success
+	// 9 - generate JWT token for the user
+	const token = generateToken(user._id.toString());
+
+	// 10 - return success with token
 	res.status(200).json({
 	    message: 'Login successful',
-	    userId: user._id
-	    // TODO: figure out a way to add JWT token here
+	    userId: user._id,
+	    token
 	});
 
     } catch (err: any) {