refactor: middlewares

server/src/auth/passport.ts

@@ -7,12 +7,6 @@ import googleStrategy from './googleStrategy.js'
 import githubStrategy from './githubStrategy.js'
 import logger from '../utils/logger.js'
 
-interface SerializedUser extends Express.User {
-  _id: string
-  username: string
-  email: string
-}
-
 passport.use(passwordStrategy)
 passport.use(jwtStrategy)
 
@@ -32,21 +26,25 @@ if (githubStrategy !== null) {
   passport.use(githubStrategy)
 }
 
-passport.serializeUser((user: Express.User, done: any) => {
+passport.serializeUser((user: Express.User, done) => {
   process.nextTick(async () => {
     try {
-      const serializedUser = user as SerializedUser
-      if (!(await UserProfile.exists({ user: serializedUser._id }))) {
-        await UserProfile.create({ user: serializedUser._id })
+      const id = (user as any)._id
+      if (!id) {
+        done(new Error('User has no _id'))
+        return
       }
-      done(null, serializedUser)
+      if (!(await UserProfile.exists({ user: id }))) {
+        await UserProfile.create({ user: id })
+      }
+      done(null, user)
     } catch (err) {
       done(err)
     }
   })
 })
 
-passport.deserializeUser((user: SerializedUser, done) => {
+passport.deserializeUser((user: Express.User, done) => {
   process.nextTick(() => {
     done(null, user)
   })

server/src/middleware/authRequired.js

@@ -1,9 +0,0 @@
-export default function authRequired(req, res, next) {
-  if (req.isAuthenticated() && !req.session.newUser) {
-    next()
-    return
-  }
-  res.status(401).json({
-    message: 'not authenticated',
-  })
-}

server/src/middleware/authRequired.ts

@@ -0,0 +1,15 @@
+import type { Request, Response, NextFunction } from 'express'
+
+export default function authRequired(
+  req: Request,
+  res: Response,
+  next: NextFunction
+) {
+  if (req.isAuthenticated() && !('newUser' in req.session)) {
+    next()
+    return
+  }
+  res.status(401).json({
+    message: 'not authenticated',
+  })
+}

server/src/middleware/error.js

@@ -1,13 +0,0 @@
-import logger from '../utils/logger.js'
-
-export function asyncHandler(fn) {
-  return (req, res, next) => {
-    fn(req, res, next).catch(next)
-  }
-}
-
-// eslint-disable-next-line no-unused-vars
-export default function errorHandler(err, req, res, next) {
-  logger.error(err) // Log error stack trace to the console
-  res.status(500).send({ message: 'Something broke!' }) // Send error response
-}

server/src/middleware/error.ts

@@ -0,0 +1,20 @@
+import type { Request, Response, NextFunction } from 'express'
+import logger from '../utils/logger.js'
+
+export function asyncHandler(fn: any) {
+  return (req: Request, res: Response, next: NextFunction) => {
+    fn(req, res, next).catch(next)
+  }
+}
+
+// eslint-disable-next-line no-unused-vars
+export default function errorHandler(
+  err: any,
+  req: Request,
+  res: Response,
+  // eslint-disable-next-line no-unused-vars
+  next: NextFunction
+) {
+  logger.error(err) // Log error stack trace to the console
+  res.status(500).send({ message: 'Something broke!' }) // Send error response
+}

server/src/middleware/rateLimiter.ts

@@ -1,9 +1,11 @@
 import rateLimit from 'express-rate-limit'
+import type { Options } from 'express-rate-limit'
+import type { Request, Response, NextFunction } from 'express'
 import config from '../config.js'
 
-function createRateLimiter(options) {
+function createRateLimiter(options: Partial<Options>) {
   if (config.testing.enabled) {
-    return (req, res, next) => next()
+    return (req: Request, res: Response, next: NextFunction) => next()
   }
   return rateLimit(options)
 }
@@ -21,7 +23,7 @@ export const authenticateRateLimit = createRateLimiter({
 export const sessionRateLimit = createRateLimiter({
   windowMs: 10 * 1000,
   max: 1,
-  keyGenerator: (req) => {
-    return req.user ? req.user._id : req.ip
+  keyGenerator: (req: Request) => {
+    return req.user ? (req.user as any)._id : req.ip || ''
   },
 })

server/src/middleware/validator.ts

@@ -1,6 +1,7 @@
 import { validationResult } from 'express-validator'
+import type { Request, Response, NextFunction } from 'express'
 
-export function noError(req, res, next) {
+export function noError(req: Request, res: Response, next: NextFunction) {
   const result = validationResult(req)
   if (result.isEmpty()) {
     next()