regression: API endpoints query parameter validation not working for nested properties

apps/meteor/app/api/server/router.spec.ts

@@ -48,4 +48,44 @@ describe('Router use method', () => {
 		expect(response2.statusCode).toBe(200);
 		expect(response2.headers).not.toHaveProperty('x-api-version');
 	});
+
+	it('should parse nested query params into object for GET requests', async () => {
+		const ajv = new Ajv();
+		const app = express();
+
+		const isTestQueryParams = ajv.compile({
+			type: 'object',
+			properties: {
+				outerProperty: { type: 'object', properties: { innerProperty: { type: 'string' } } },
+			},
+			additionalProperties: false,
+		});
+
+		const api = new Router('/api').get(
+			'/test',
+			{
+				response: {
+					200: isTestQueryParams,
+				},
+				query: isTestQueryParams,
+			},
+			async function action() {
+				const { outerProperty } = this.queryParams as any;
+				return {
+					statusCode: 200,
+					body: {
+						outerProperty,
+					},
+				};
+			},
+		);
+
+		app.use(api.router);
+
+		const response1 = await request(app).get('/api/test?outerProperty[innerProperty]=test');
+
+		expect(response1.statusCode).toBe(200);
+		expect(response1.body).toHaveProperty('outerProperty');
+		expect(response1.body.outerProperty).toHaveProperty('innerProperty', 'test');
+	});
 });

apps/meteor/app/api/server/router.ts

@@ -191,9 +191,12 @@ export class Router<
 		this.innerRouter[method.toLowerCase() as Lowercase<Method>](`/${subpath}`.replace('//', '/'), ...middlewares, async (c) => {
 			const { req, res } = c;
 			req.raw.route = `${c.var.route ?? ''}${subpath}`;
+
+			const queryParams = this.parseQueryParams(req);
+
 			if (options.query) {
 				const validatorFn = options.query;
-				if (typeof options.query === 'function' && !validatorFn(req.query())) {
+				if (typeof options.query === 'function' && !validatorFn(queryParams)) {
 					return c.json(
 						{
 							success: false,
@@ -229,7 +232,7 @@ export class Router<
 				{
 					requestIp: c.get('remoteAddress'),
 					urlParams: req.param(),
-					queryParams: this.parseQueryParams(req),
+					queryParams,
 					bodyParams,
 					request: req.raw.clone(),
 					path: req.path,