fix: multipart middlware ajv options

cdimascio · Nov 8, 2020 · 72253ce · 72253ce
1 parent 46ed8fb
commit 72253ce
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/framework/types.ts b/src/framework/types.ts
@@ -31,8 +31,9 @@ export type SecurityHandlers = {
   ) => boolean | Promise<boolean>;
 };
 
-export interface MultipartOpts extends ajv.Options {
-  multerOpts: any;
+export interface MultipartOpts {
+  multerOpts: boolean | multer.Options;
+  ajvOpts: ajv.Options;
 }
 
 export interface RequestValidatorOptions

diff --git a/src/middlewares/openapi.multipart.ts b/src/middlewares/openapi.multipart.ts
@@ -19,9 +19,7 @@ export function multipart(
   options: MultipartOpts,
 ): OpenApiRequestHandler {
   const mult = multer(options.multerOpts);
-  const Ajv = createRequestAjv(apiDoc, {
-    unknownFormats: options.unknownFormats,
-  });
+  const Ajv = createRequestAjv(apiDoc, { ...options.ajvOpts });
   return (req, res, next) => {
     // TODO check that format: binary (for upload) else do not use multer.any()
     // use multer.none() if no binary parameters exist

diff --git a/src/openapi.validator.ts b/src/openapi.validator.ts
@@ -85,7 +85,6 @@ export class OpenApiValidator {
   }
 
   installMiddleware(spec: Promise<Spec>): OpenApiRequestHandler[] {
-    const { formats } = this.options;
     const middlewares: OpenApiRequestHandler[] = [];
     const pContext = spec.then((spec) => {
       const responseApiDoc = this.options.validateResponses
@@ -98,7 +97,7 @@ export class OpenApiValidator {
         useDefaults: true,
         unknownFormats: this.options.unknownFormats,
         format: this.options.validateFormats,
-        formats: formats.reduce((acc, f) => {
+        formats: this.options.formats.reduce((acc, f) => {
           acc[f.name] = {
             type: f.type,
             validate: f.validate,
@@ -257,7 +256,17 @@ export class OpenApiValidator {
   private multipartMiddleware(apiDoc: OpenAPIV3.Document) {
     return middlewares.multipart(apiDoc, {
       multerOpts: this.options.fileUploader,
-      unknownFormats: this.options.unknownFormats,
+      ajvOpts: {
+        unknownFormats: this.options.unknownFormats,
+        format: this.options.validateFormats,
+        formats: this.options.formats.reduce((acc, f) => {
+          acc[f.name] = {
+            type: f.type,
+            validate: f.validate,
+          };
+          return acc;
+        }, {}),
+      },
     });
   }