Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions packages/backend/src/middleware/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,42 +23,40 @@ export interface AuthenticatedRequest extends Request {
}
}

export function requireAuth(
export async function requireAuth(
req: AuthenticatedRequest,
res: Response,
next: NextFunction,
): void {
): Promise<void> {
const sessionId = req.sessionID

if (!sessionId) {
res.status(401).json({ error: 'Not authenticated' })
return
}

sessionService
.getSession(sessionId)
.then((sessionData) => {
if (!sessionData) {
res.status(401).json({ error: 'Session expired or invalid' })
return
}
try {
const sessionData = await sessionService.getSession(sessionId)
if (!sessionData) {
res.status(401).json({ error: 'Session expired or invalid' })
return
}

req.sessionId = sessionId
req.userId = sessionData.userId
req.user = {
id: sessionData.user.id,
username: sessionData.user.username,
discriminator: sessionData.user.discriminator,
globalName: sessionData.user.global_name,
avatar: sessionData.user.avatar,
}
req.sessionId = sessionId
req.userId = sessionData.userId
req.user = {
id: sessionData.user.id,
username: sessionData.user.username,
discriminator: sessionData.user.discriminator,
globalName: sessionData.user.global_name,
avatar: sessionData.user.avatar,
}

next()
})
.catch((error) => {
errorLog({ message: 'Error validating session:', error })
res.status(500).json({ error: 'Internal server error' })
})
next()
} catch (error) {
errorLog({ message: 'Error validating session:', error })
res.status(500).json({ error: 'Internal server error' })
}
}

export function optionalAuth(
Expand Down
Loading