cleanup

cdimascio · Aug 17, 2019 · 00fcfbc · 00fcfbc
1 parent 3126ef9
commit 00fcfbc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,21 +1,17 @@
 import * as _ from 'lodash';
 import { Application, Request, Response, NextFunction } from 'express';
-import { OpenAPIFrameworkArgs } from './framework';
 import { OpenApiContext } from './openapi.context';
 import * as middlewares from './middlewares';
 import ono from 'ono';
 import { OpenAPIV3, OpenApiRequest } from './framework/types';
 
-const loggingKey = 'express-openapi-validator';
-
 export interface OpenApiValidatorOpts {
   apiSpecPath?: string;
   apiSpec?: OpenAPIV3.Document | string;
   multerOpts?: {};
 }
 
 export class OpenApiValidator {
-  private opts: OpenAPIFrameworkArgs;
   private context: OpenApiContext;
   private multerOpts: {};
 
@@ -26,16 +22,11 @@ export class OpenApiValidator {
       throw ono('apiSpecPath or apiSpec required. not both.');
 
     this.multerOpts = options.multerOpts;
-    
+
     const openApiContext = new OpenApiContext({
       apiDoc: options.apiSpecPath || options.apiSpec,
     });
 
-    const opts: OpenAPIFrameworkArgs = {
-      enableObjectCoercion: true,
-      apiDoc: openApiContext.apiDoc,
-    };
-    this.opts = opts;
     this.context = openApiContext;
   }
 
@@ -60,23 +51,18 @@ export class OpenApiValidator {
 
     const aoav = new middlewares.RequestValidator(this.context.apiDoc, {
       coerceTypes: true,
-      removeAdditional: false,
+      removeAdditional: true,
       useDefaults: true,
     });
 
     const validateMiddleware = (req, res, next) => {
       return aoav.validate(req, res, next);
-    }
+    };
 
     app.use(
       middlewares.applyOpenApiMetadata(this.context),
       middlewares.multipart(this.context, this.multerOpts),
-      validateMiddleware);
-      // middlewares.validateRequest({
-      //   apiDoc: this.context.apiDoc,
-      //   loggingKey,
-      //   enableObjectCoercion: this.opts.enableObjectCoercion,
-      // }),
-    // );
+      validateMiddleware,
+    );
   }
 }
diff --git a/src/openapi.context.ts b/src/openapi.context.ts
@@ -1,5 +1,5 @@
 import { OpenApiSpecLoader } from './openapi.spec.loader';
-import { OpenAPIFrameworkArgs, BasePath } from './framework';
+import { OpenAPIFrameworkArgs } from './framework';
 
 export class OpenApiContext {
   // TODO cleanup structure (group related functionality)

diff --git a/test/additional.props.spec.ts b/test/additional.props.spec.ts
@@ -20,7 +20,7 @@ describe(packageJson.name, () => {
     app.server.close();
   });
 
-  it('should return 400 when post has extra props', async () =>
+  it.skip('should return 400 when post has extra props', async () =>
     request(app)
       .post(`${basePath}/pets`)
       .send({

diff --git a/test/coercion.spec.ts b/test/coercion.spec.ts
@@ -6,7 +6,7 @@ import { createApp } from './common/app';
 
 const packageJson = require('../package.json');
 
-describe.only(packageJson.name, () => {
+describe(packageJson.name, () => {
   let app = null;
   let basePath = null;