From e1c51c95f091500a431527faf5fb39922799e6e4 Mon Sep 17 00:00:00 2001 From: Aleksandr Yackovlev Date: Mon, 10 Aug 2020 14:41:32 +0300 Subject: [PATCH] fix(types): fix typecasting --- src/middleware/isAuthenticated.spec.ts | 28 +++++++++++++------------- src/middleware/validateBody.ts | 4 +++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/middleware/isAuthenticated.spec.ts b/src/middleware/isAuthenticated.spec.ts index ddb203b..4c93124 100644 --- a/src/middleware/isAuthenticated.spec.ts +++ b/src/middleware/isAuthenticated.spec.ts @@ -140,21 +140,21 @@ describe('isAuthenticated', () => { name: 'authKey', } as OpenAPIV3.SecuritySchemeObject; - expect( - checkAuthByType(securityScheme, { - query: { - authKey: 'test', - }, - } as express.Request) - ).toBe(false); + const query: unknown = { + query: { + authKey: 'test', + }, + }; - expect( - checkAuthByType(securityScheme, { - query: { - someOtherKey: 'test', - }, - } as express.Request) - ).toBe(true); + expect(checkAuthByType(securityScheme, query as express.Request)).toBe(false); + + const wrongQuery: unknown = { + query: { + someOtherKey: 'test', + }, + }; + + expect(checkAuthByType(securityScheme, wrongQuery as express.Request)).toBe(true); }); it('should check auth for the apiKey security type in cookies', () => { diff --git a/src/middleware/validateBody.ts b/src/middleware/validateBody.ts index 783ceb4..7628019 100644 --- a/src/middleware/validateBody.ts +++ b/src/middleware/validateBody.ts @@ -17,7 +17,9 @@ const validateBody = ( return next(); } - const bodySchema = res.locals.operation.getBodySchema(req.get('content-type')); + const bodySchema = res.locals.operation.getBodySchema( + req.get('content-type') || 'application/json' + ); if (Object.keys(req.body).length && !bodySchema) { return res.status(400).json({