From d82171f7e3799de60f613339252729e81438fc9c Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Tue, 24 Sep 2024 17:39:50 +0530 Subject: [PATCH] fix: extend request to include user --- server/src/routes/auth.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/server/src/routes/auth.ts b/server/src/routes/auth.ts index 4c578db8..b743543e 100644 --- a/server/src/routes/auth.ts +++ b/server/src/routes/auth.ts @@ -1,4 +1,4 @@ -import { Router } from 'express'; +import { Router, Request, Response } from 'express'; import { hashPassword, comparePassword } from '../utils/auth'; import User from '../models/User'; import bcrypt from 'bcrypt'; @@ -6,6 +6,10 @@ import jwt from 'jsonwebtoken'; // Todo: DB export const router = Router(); +interface AuthenticatedRequest extends Request { + user?: { id: string }; +} + router.post('/register', async (req, res) => { try { const { email, password } = req.body @@ -63,8 +67,11 @@ router.get('/logout', async (req, res) => { } }) -router.get('/current-user', async (req, res) => { +router.get('/current-user', async (req: AuthenticatedRequest, res) => { try { + if (!req.user) { + return res.status(401).send('Unauthorized'); + } const user = await User.findByPk(req.user.id, { attributes: { exclude: ['password'] }, });