fix: update deps and structure

chertik77 · chertik77 · commit cdc90cd7bf83 · 2025-08-11T19:48:54.000+01:00
diff --git a/app/app.ts b/app/app.ts
@@ -4,18 +4,13 @@ import helmet from 'helmet'
 import logger from 'morgan'
 
 import { env } from './config'
-import {
-  globalErrorHandler,
-  globalLimiter,
-  notFoundHandler
-} from './middlewares'
+import { globalErrorHandler, notFoundHandler } from './middlewares'
 import { apiRouter } from './routes'
 
 export const app = express()
 
 app.use(helmet())
 app.use(cors({ origin: env.ALLOWED_ORIGINS }))
-app.use(globalLimiter)
 app.use(logger(app.get('env') === 'development' ? 'dev' : 'combined'))
 app.use(express.json())
 
diff --git a/app/config/default-user-avatars.config.ts b/app/config/default-user-avatars.config.ts
@@ -0,0 +1,9 @@
+import type { Theme } from '@prisma/client'
+
+export const defaultUserAvatars: Record<Theme, string> = {
+  light:
+    'https://res.cloudinary.com/dmbnnewoy/image/upload/v1706958682/TaskPro/user_avatar_default/user_light.png',
+  dark: 'https://res.cloudinary.com/dmbnnewoy/image/upload/v1706958682/TaskPro/user_avatar_default/user_dark.png',
+  violet:
+    'https://res.cloudinary.com/dmbnnewoy/image/upload/v1706958682/TaskPro/user_avatar_default/user_violet.png'
+}
diff --git a/app/config/env.config.ts b/app/config/env.config.ts
@@ -11,33 +11,28 @@ const envSchema = z.object({
   DATABASE_URL: z.string(),
   GOOGLE_CLIENT_ID: z.string(),
   GOOGLE_CLIENT_SECRET: z.string(),
-  GOOGLE_REDIRECT_URI: z.string().url(),
+  GOOGLE_REDIRECT_URI: z.url(),
   REDIS_USERNAME: z.string(),
   REDIS_PASSWORD: z.string(),
   REDIS_HOST: z.string(),
-  REDIS_PORT: z.preprocess(
-    v => (v ? v : undefined),
-    z.coerce.number().int().positive()
-  ),
+  REDIS_PORT: z.coerce.number().int().positive().min(1000).max(65535),
   ACCESS_JWT_SECRET: z.string().transform(v => new TextEncoder().encode(v)),
   REFRESH_JWT_SECRET: z.string().transform(v => new TextEncoder().encode(v)),
-  PORT: z.preprocess(
-    v => (v ? v : undefined),
-    z.coerce.number().int().positive()
-  ),
+  PORT: z.coerce.number().int().positive().min(1000).max(65535),
   API_PREFIX: z.string(),
   ALLOWED_ORIGINS: z
     .string()
     .transform(v => v.split(','))
-    .pipe(z.array(z.string().url())),
+    .pipe(z.array(z.url())),
   EMAIL_HOST: z.string(),
-  EMAIL_PORT: z
-    .number({ coerce: true })
-    .refine(v => availableEmailPorts.includes(v), {
-      message: `Email port must be one of the following: ${availableEmailPorts.join(', ')}`
-    }),
-  EMAIL_USER: z.string().email(),
-  EMAIL_RECEIVER: z.string().email(),
+  EMAIL_PORT: z.coerce
+    .number()
+    .refine(
+      v => availableEmailPorts.includes(v),
+      `Email port must be one of the following: ${availableEmailPorts.join(', ')}`
+    ),
+  EMAIL_USER: z.email(),
+  EMAIL_RECEIVER: z.email(),
   EMAIL_PASSWORD: z.string(),
   ACCESS_JWT_EXPIRES_IN: z.string(),
   REFRESH_JWT_EXPIRES_IN: z.string(),
diff --git a/app/config/index.ts b/app/config/index.ts
@@ -2,3 +2,4 @@ export { transport } from './mailer.config'
 export { default } from './cloudinary.config'
 export { env } from './env.config'
 export { redisClient } from './redis.config'
+export { defaultUserAvatars } from './default-user-avatars.config'
diff --git a/app/controllers/auth.controller.ts b/app/controllers/auth.controller.ts
@@ -5,9 +5,8 @@ import type {
   SigninSchema,
   SignupSchema
 } from '@/schemas'
-import type { JwtPayload } from '@/types'
+import type { JwtPayload, TypedRequestBody } from '@/types'
 import type { NextFunction, Request, Response } from 'express'
-import type { TypedRequestBody } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { hash, verify } from 'argon2'
@@ -16,7 +15,7 @@ import { Conflict, Forbidden, Unauthorized } from 'http-errors'
 import { jwtVerify, SignJWT } from 'jose'
 import { JWTExpired } from 'jose/errors'
 
-import { env, redisClient } from '@/config'
+import { defaultUserAvatars, env, redisClient } from '@/config'
 
 const {
   ACCESS_JWT_EXPIRES_IN,
@@ -31,7 +30,7 @@ const {
 } = env
 
 class AuthController {
-  googleClient = new OAuth2Client(
+  private googleClient = new OAuth2Client(
     GOOGLE_CLIENT_ID,
     GOOGLE_CLIENT_SECRET,
     GOOGLE_REDIRECT_URI
@@ -133,11 +132,15 @@ class AuthController {
 
     const payload = ticket.getPayload()
 
-    if (!payload || !payload.email || !payload.name || !payload.picture) {
+    if (!payload || !payload.email) {
       return next(Forbidden('Invalid token'))
     }
 
-    const { name, email, picture } = payload
+    const {
+      email,
+      name = 'Guest',
+      picture = defaultUserAvatars.light
+    } = payload
 
     const user = await prisma.user.findUnique({
       where: { email }
diff --git a/app/controllers/board.controller.ts b/app/controllers/board.controller.ts
@@ -3,13 +3,13 @@ import type {
   BoardParamsSchema,
   EditBoardSchema
 } from '@/schemas'
-import type { NextFunction, Request, Response } from 'express'
-import type { ZodType } from 'zod'
 import type {
   TypedRequest,
   TypedRequestBody,
   TypedRequestParams
-} from 'zod-express-middleware'
+} from '@/types'
+import type { NextFunction, Request, Response } from 'express'
+import type { ZodType } from 'zod'
 
 import { prisma } from '@/prisma'
 import { NotFound } from 'http-errors'
diff --git a/app/controllers/card.controller.ts b/app/controllers/card.controller.ts
@@ -5,9 +5,9 @@ import type {
   EditCardSchema,
   UpdateCardOrderSchema
 } from '@/schemas'
+import type { TypedRequest, TypedRequestParams } from '@/types'
 import type { NextFunction, Response } from 'express'
 import type { ZodType } from 'zod'
-import type { TypedRequest, TypedRequestParams } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { BadRequest, NotFound } from 'http-errors'
diff --git a/app/controllers/column.controller.ts b/app/controllers/column.controller.ts
@@ -5,9 +5,9 @@ import type {
   EditColumnSchema,
   UpdateColumnOrderSchema
 } from '@/schemas'
+import type { TypedRequest, TypedRequestParams } from '@/types'
 import type { NextFunction, Response } from 'express'
 import type { ZodType } from 'zod'
-import type { TypedRequest, TypedRequestParams } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { BadRequest, NotFound } from 'http-errors'
diff --git a/app/controllers/user.controller.ts b/app/controllers/user.controller.ts
@@ -1,8 +1,8 @@
 import type { EditUserSchema, NeedHelpSchema } from '@/schemas'
+import type { TypedRequestBody } from '@/types'
 import type { User } from '@prisma/client'
 import type { NextFunction, Request, Response } from 'express'
 import type { Options } from 'nodemailer/lib/mailer'
-import type { TypedRequestBody } from 'zod-express-middleware'
 
 import { prisma } from '@/prisma'
 import { hash } from 'argon2'
diff --git a/app/middlewares/index.ts b/app/middlewares/index.ts
@@ -1,4 +1,4 @@
 export { authenticate } from './authenticate'
 export { upload } from './multer'
-export { globalLimiter } from './limiter'
+export { validateRequest } from './validate-request'
 export { notFoundHandler, globalErrorHandler } from './errorHandler'
diff --git a/app/middlewares/limiter.ts b/app/middlewares/limiter.ts
diff --git a/app/middlewares/validate-request.ts b/app/middlewares/validate-request.ts
@@ -0,0 +1,57 @@
+import type { RequestHandler } from 'express'
+import type * as z from 'zod'
+
+import createHttpError from 'http-errors'
+
+type RequestValidation<P, Q, B> = {
+  params?: z.ZodType<P>
+  query?: z.ZodType<Q>
+  body?: z.ZodType<B>
+}
+
+export const validateRequest: <P, Q, B>(
+  schemas: RequestValidation<P, Q, B>
+) => RequestHandler<P, unknown, B, Q> =
+  ({ params, query, body }) =>
+  (req, _, next) => {
+    const errors: Record<string, string> = {}
+
+    if (params) {
+      const parsed = params.safeParse(req.params)
+
+      if (!parsed.success) {
+        parsed.error.issues.forEach(({ path, message }) => {
+          const errorPath = `${path.join('.')}`
+          errors[errorPath] = message
+        })
+      }
+    }
+
+    if (query) {
+      const parsed = query.safeParse(req.query)
+
+      if (!parsed.success) {
+        parsed.error.issues.forEach(({ path, message }) => {
+          const errorPath = `${path.join('.')}`
+          errors[errorPath] = message
+        })
+      }
+    }
+
+    if (body) {
+      const parsed = body.safeParse(req.body)
+
+      if (!parsed.success) {
+        parsed.error.issues.forEach(({ path, message }) => {
+          const errorPath = `${path.join('.')}`
+          errors[errorPath] = message
+        })
+      }
+    }
+
+    if (Object.keys(errors).length > 0) {
+      return next(createHttpError(400, { message: errors }))
+    }
+
+    return next()
+  }
diff --git a/app/prisma/extensions/user-with-default-avatar.extension.ts b/app/prisma/extensions/user-with-default-avatar.extension.ts
@@ -1,12 +1,6 @@
 import { Prisma } from '@prisma/client'
 
-const defaultUserAvatars = {
-  light:
-    'https://res.cloudinary.com/dmbnnewoy/image/upload/v1706958682/TaskPro/user_avatar_default/user_light.png',
-  dark: 'https://res.cloudinary.com/dmbnnewoy/image/upload/v1706958682/TaskPro/user_avatar_default/user_dark.png',
-  violet:
-    'https://res.cloudinary.com/dmbnnewoy/image/upload/v1706958682/TaskPro/user_avatar_default/user_violet.png'
-}
+import { defaultUserAvatars } from '@/config'
 
 export const userWithDefaultAvatar = Prisma.defineExtension(client =>
   client.$extends({
diff --git a/app/routes/api/auth.ts b/app/routes/api/auth.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { authController } from '@/controllers'
 
-import { authenticate } from '@/middlewares'
+import { authenticate, validateRequest } from '@/middlewares'
 
 import {
   GoogleCodeSchema,
diff --git a/app/routes/api/board.ts b/app/routes/api/board.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { boardController } from '@/controllers'
 
-import { authenticate } from '@/middlewares'
+import { authenticate, validateRequest } from '@/middlewares'
 
 import { AddBoardSchema, BoardParamsSchema, EditBoardSchema } from '@/schemas'
 
diff --git a/app/routes/api/card.ts b/app/routes/api/card.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { cardController } from '@/controllers'
 
-import { authenticate } from '@/middlewares'
+import { authenticate, validateRequest } from '@/middlewares'
 
 import {
   AddCardSchema,
diff --git a/app/routes/api/column.ts b/app/routes/api/column.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { columnController } from '@/controllers'
 
-import { authenticate } from '@/middlewares'
+import { authenticate, validateRequest } from '@/middlewares'
 
 import {
   AddColumnSchema,
diff --git a/app/routes/api/user.ts b/app/routes/api/user.ts
@@ -1,9 +1,8 @@
 import { Router } from 'express'
-import { validateRequest } from 'zod-express-middleware'
 
 import { userController } from '@/controllers'
 
-import { authenticate, upload } from '@/middlewares'
+import { authenticate, upload, validateRequest } from '@/middlewares'
 
 import { EditUserSchema, NeedHelpSchema } from '@/schemas'
 
diff --git a/app/schemas/auth.schema.ts b/app/schemas/auth.schema.ts
@@ -1,14 +1,15 @@
 import * as z from 'zod'
 
 export const SigninSchema = z.object({
-  email: z.string().email({ message: 'Email is invalid' }),
+  email: z.email('Email is required'),
   password: z
     .string()
     .min(8, 'Password must be at least 8 characters')
     .max(64, 'Password must be at most 64 characters')
 })
 
-export const SignupSchema = SigninSchema.extend({
+export const SignupSchema = z.object({
+  ...SigninSchema.shape,
   name: z.string().min(2, 'Name must be at least 2 characters')
 })
 
@@ -18,5 +19,5 @@ export const RefreshTokenSchema = z.object({
 
 export const GoogleCodeSchema = z.object({
   code: z.string().min(1, 'Code is required'),
-  state: z.string().min(1, 'State is required')
+  state: z.optional(z.string())
 })
diff --git a/app/schemas/board.schema.ts b/app/schemas/board.schema.ts
@@ -5,18 +5,18 @@ import boardImages from '@/data/board-bg-images.json'
 
 import { objectIdSchema } from './object-id.schema'
 
-function zodEnumFromObjKeys<K extends string>(
-  obj: Record<K, unknown>
-): z.ZodEnum<[K, ...K[]]> {
-  const [firstKey, ...otherKeys] = Object.keys(obj) as K[]
+const zObjectKeys = <T extends Record<string, unknown>>(obj: T) => {
+  const keys = Object.keys(obj) as Extract<keyof T, string>[]
 
-  return z.enum([firstKey, ...otherKeys])
+  return z.enum(
+    keys as [Extract<keyof T, string>, ...Extract<keyof T, string>[]]
+  )
 }
 
 export const AddBoardSchema = z.object({
   title: z.string().min(3, 'Title must be at least 3 characters'),
-  icon: z.nativeEnum(Icon),
-  background: zodEnumFromObjKeys(boardImages)
+  icon: z.enum(Icon),
+  background: zObjectKeys(boardImages)
 })
 
 export const EditBoardSchema = AddBoardSchema.partial()
diff --git a/app/schemas/card.schema.ts b/app/schemas/card.schema.ts
diff --git a/app/schemas/user.schema.ts b/app/schemas/user.schema.ts
diff --git a/app/types/index.ts b/app/types/index.ts
diff --git a/app/types/request.ts b/app/types/request.ts
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
