Skip to content
12 changes: 12 additions & 0 deletions packages/backend/src/middleware/validate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ export function validateQuery<TOutput>(schema: Schema<TOutput>) {
return res.status(400).json({ error: 'Validation failed', errors })
}

Object.keys(req.query).forEach((key) => {
if (!(key in result.data)) {
delete req.query[key]
}
})
Object.assign(req.query, result.data)
next()
}
}
Expand All @@ -45,6 +51,12 @@ export function validateParams<TOutput>(schema: Schema<TOutput>) {
return res.status(400).json({ error: 'Validation failed', errors })
}

Object.keys(req.params).forEach((key) => {
if (!(key in result.data)) {
delete req.params[key]
}
})
Object.assign(req.params, result.data)
next()
}
}
4 changes: 3 additions & 1 deletion packages/backend/src/schemas/management.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ const logsSearchQuery = z.object({
.optional(),
})

const userIdParam = commonUserIdParam
const userIdParam = guildIdParam.extend({
userId: commonUserIdParam.shape.userId,
})

export const managementSchemas = {
guildIdParam,
Expand Down
4 changes: 3 additions & 1 deletion packages/backend/src/schemas/moderation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ const caseIdParam = guildIdParam.extend({
caseId: z.string().min(1).max(100),
})

const userCasesParam = commonUserIdParam
const userCasesParam = guildIdParam.extend({
userId: commonUserIdParam.shape.userId,
})

const casesQuery = z.object({
limit: z.coerce.number().int().min(1).max(500).optional(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ jest.mock('@lucky/shared/utils/general/log', () => ({
warnLog: jest.fn(),
}))

jest.mock('@lucky/shared/generated/prisma/client', () => ({
Prisma: { JsonNull: null },
}))

jest.mock('@lucky/shared/services/embedValidation', () => ({}))

jest.mock('@lucky/shared/services/ModerationService', () => ({}))
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/tests/unit/middleware/validate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,26 @@ describe('validateQuery', () => {
expect(res.status).toHaveBeenCalledWith(400)
expect(next).not.toHaveBeenCalled()
})

test('should assign validated query to req.query', () => {
const { req, res, next } = setup({ limit: '10' }, 'query')
validateQuery(schema)(req, res, next)
expect(req.query).toEqual({ limit: '10' })
})

test('should strip unknown query fields', () => {
const { req, res, next } = setup({ limit: '20', extra: 'ignored' }, 'query')
validateQuery(schema)(req, res, next)
expect(next).toHaveBeenCalled()
expect(req.query).toEqual({ limit: '20' })
})

test('should handle optional query fields correctly', () => {
const { req, res, next } = setup({}, 'query')
validateQuery(schema)(req, res, next)
expect(next).toHaveBeenCalled()
expect(req.query).toEqual({})
})
})

describe('validateParams', () => {
Expand Down Expand Up @@ -100,4 +120,23 @@ describe('validateParams', () => {
expect(response.errors[0]).toHaveProperty('field')
expect(response.errors[0]).toHaveProperty('message')
})

test('should assign validated params to req.params', () => {
const { req, res, next } = setup(
{ guildId: '123456789012345678' },
'params',
)
validateParams(schema)(req, res, next)
expect(req.params).toEqual({ guildId: '123456789012345678' })
})

test('should strip unknown params fields', () => {
const { req, res, next } = setup(
{ guildId: '123456789012345678', extra: 'ignored' },
'params',
)
validateParams(schema)(req, res, next)
expect(next).toHaveBeenCalled()
expect(req.params).toEqual({ guildId: '123456789012345678' })
})
})
Loading