Upload 60 files

server/src/middleware/auth.ts

@@ -1,17 +1,31 @@
 import { Request, Response, NextFunction } from 'express'
 import jwt from 'jsonwebtoken'
 import { prisma } from '../config/database'
-import { User } from '@prisma/client'
+
+export interface AuthUser {
+  id: string
+  email: string
+  username: string
+  displayName: string
+  avatar: string | null
+  bio: string | null
+  isOnline: boolean
+  lastSeen: Date
+  isAdmin: boolean
+  isVerified: boolean
+  createdAt: Date
+  updatedAt: Date
+}
 
 export interface AuthRequest extends Request {
-  user?: User
+  user?: AuthUser
 }
 
 export const authMiddleware = async (
   req: AuthRequest,
   res: Response,
   next: NextFunction
-) => {
+): Promise<void> => {
   try {
     const authHeader = req.headers.authorization
     
@@ -90,7 +104,7 @@ export const adminMiddleware = (
   req: AuthRequest,
   res: Response,
   next: NextFunction
-) => {
+): void => {
   if (!req.user) {
     return res.status(401).json({
       success: false,
@@ -112,7 +126,7 @@ export const optionalAuthMiddleware = async (
   req: AuthRequest,
   res: Response,
   next: NextFunction
-) => {
+): Promise<void> => {
   try {
     const authHeader = req.headers.authorization
     

server/src/middleware/errorHandler.ts

@@ -97,7 +97,7 @@ export const notFoundHandler = (req: Request, res: Response) => {
   })
 }
 
-export const asyncHandler = (fn: Function) => {
+export const asyncHandler = (fn: (req: Request, res: Response, next: NextFunction) => Promise<any>) => {
   return (req: Request, res: Response, next: NextFunction) => {
     Promise.resolve(fn(req, res, next)).catch(next)
   }

server/src/routes/auth.ts

@@ -1,4 +1,4 @@
-import { Router } from 'express'
+import { Router, Request, Response } from 'express'
 import bcrypt from 'bcryptjs'
 import jwt from 'jsonwebtoken'
 import Joi from 'joi'
@@ -28,7 +28,7 @@ const changePasswordSchema = Joi.object({
 })
 
 // Helper function to generate JWT token
-const generateToken = (userId: string) => {
+const generateToken = (userId: string): string => {
   return jwt.sign(
     { userId },
     process.env.JWT_SECRET!,
@@ -37,12 +37,12 @@ const generateToken = (userId: string) => {
 }
 
 // Register
-router.post('/register', authRateLimiter, asyncHandler(async (req, res) => {
+router.post('/register', authRateLimiter, asyncHandler(async (req: Request, res: Response) => {
   const { error, value } = registerSchema.validate(req.body)
   if (error) {
     return res.status(400).json({
       success: false,
-      error: error.details[0].message
+      error: error.details[0]?.message
     })
   }
 
@@ -105,12 +105,12 @@ router.post('/register', authRateLimiter, asyncHandler(async (req, res) => {
 }))
 
 // Login
-router.post('/login', authRateLimiter, asyncHandler(async (req, res) => {
+router.post('/login', authRateLimiter, asyncHandler(async (req: Request, res: Response) => {
   const { error, value } = loginSchema.validate(req.body)
   if (error) {
     return res.status(400).json({
       success: false,
-      error: error.details[0].message
+      error: error.details[0]?.message
     })
   }
 
@@ -162,7 +162,7 @@ router.post('/login', authRateLimiter, asyncHandler(async (req, res) => {
 }))
 
 // Logout
-router.post('/logout', authMiddleware, asyncHandler(async (req: AuthRequest, res) => {
+router.post('/logout', authMiddleware, asyncHandler(async (req: AuthRequest, res: Response) => {
   // Update user offline status
   await prisma.user.update({
     where: { id: req.user!.id },
@@ -179,7 +179,7 @@ router.post('/logout', authMiddleware, asyncHandler(async (req: AuthRequest, res
 }))
 
 // Get current user
-router.get('/me', authMiddleware, asyncHandler(async (req: AuthRequest, res) => {
+router.get('/me', authMiddleware, asyncHandler(async (req: AuthRequest, res: Response) => {
   res.json({
     success: true,
     data: req.user
@@ -187,12 +187,12 @@ router.get('/me', authMiddleware, asyncHandler(async (req: AuthRequest, res) =>
 }))
 
 // Change password
-router.post('/change-password', authMiddleware, asyncHandler(async (req: AuthRequest, res) => {
+router.post('/change-password', authMiddleware, asyncHandler(async (req: AuthRequest, res: Response) => {
   const { error, value } = changePasswordSchema.validate(req.body)
   if (error) {
     return res.status(400).json({
       success: false,
-      error: error.details[0].message
+      error: error.details[0]?.message
     })
   }
 
@@ -237,7 +237,7 @@ router.post('/change-password', authMiddleware, asyncHandler(async (req: AuthReq
 }))
 
 // Refresh token (optional - for token refresh functionality)
-router.post('/refresh', asyncHandler(async (req, res) => {
+router.post('/refresh', asyncHandler(async (req: Request, res: Response) => {
   const { refreshToken } = req.body
 
   if (!refreshToken) {

server/src/routes/upload.ts

@@ -26,7 +26,7 @@ const upload = multer({
   limits: {
     fileSize: 10 * 1024 * 1024, // 10MB limit
   },
-  fileFilter: (req, file, cb) => {
+  fileFilter: (req, file, cb): void => {
     // Allow images, videos, audio, and documents
     const allowedTypes = /jpeg|jpg|png|gif|webp|mp4|webm|mp3|wav|pdf|doc|docx|txt/
     const extname = allowedTypes.test(path.extname(file.originalname).toLowerCase())
@@ -41,7 +41,7 @@ const upload = multer({
 })
 
 // Upload single file
-router.post('/single', upload.single('file'), async (req: Request, res: Response) => {
+router.post('/single', upload.single('file'), async (req: Request, res: Response): Promise<void> => {
   try {
     if (!req.file) {
       return res.status(400).json({
@@ -72,7 +72,7 @@ router.post('/single', upload.single('file'), async (req: Request, res: Response
 })
 
 // Upload multiple files
-router.post('/multiple', upload.array('files', 10), async (req: Request, res: Response) => {
+router.post('/multiple', upload.array('files', 10), async (req: Request, res: Response): Promise<void> => {
   try {
     const files = req.files as Express.Multer.File[]
     
@@ -105,7 +105,7 @@ router.post('/multiple', upload.array('files', 10), async (req: Request, res: Re
 })
 
 // Upload avatar
-router.post('/avatar', upload.single('avatar'), async (req: Request, res: Response) => {
+router.post('/avatar', upload.single('avatar'), async (req: Request, res: Response): Promise<void> => {
   try {
     if (!req.file) {
       return res.status(400).json({
@@ -142,10 +142,10 @@ router.post('/avatar', upload.single('avatar'), async (req: Request, res: Respon
 })
 
 // Delete file
-router.delete('/:filename', async (req: Request, res: Response) => {
+router.delete('/:filename', async (req: Request, res: Response): Promise<void> => {
   try {
     const { filename } = req.params
-    const filePath = path.join(__dirname, '../../uploads', filename)
+    const filePath = path.join(__dirname, '../../uploads', filename!)
     
     if (fs.existsSync(filePath)) {
       fs.unlinkSync(filePath)