type fixes

cdimascio · Dec 1, 2019 · 9267dca · 9267dca
1 parent 7464364
commit 9267dca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/middlewares/openapi.request.validator.ts b/src/middlewares/openapi.request.validator.ts
@@ -7,20 +7,19 @@ import {
   augmentAjvErrors,
 } from './util';
 import ono from 'ono';
-import { NextFunction, Response } from 'express';
+import { NextFunction, RequestHandler, Response } from 'express';
 import {
   OpenAPIV3,
   OpenApiRequest,
   RequestValidatorOptions,
   ValidateRequestOpts,
   OpenApiRequestMetadata,
 } from '../framework/types';
-import { HandleFunction } from 'connect';
 
 const TYPE_JSON = 'application/json';
 
 export class RequestValidator {
-  private _middlewareCache: { string?: (string) => HandleFunction } = {};
+  private _middlewareCache: { [key: string]: RequestHandler } = {};
   private _apiDocs: OpenAPIV3.Document;
   private ajv: Ajv;
   private _requestOpts: ValidateRequestOpts = {};
@@ -81,7 +80,7 @@ export class RequestValidator {
     path: string,
     pathSchema: OpenAPIV3.OperationObject,
     contentType: ContentType,
-  ): HandleFunction {
+  ): RequestHandler {
     const parameters = this.parametersToSchema(path, pathSchema.parameters);
 
     let usedSecuritySchema: OpenAPIV3.SecurityRequirementObject[] = [];

diff --git a/src/middlewares/openapi.security.ts b/src/middlewares/openapi.security.ts
@@ -252,7 +252,7 @@ class AuthValidator {
 }
 
 class Util {
-  static isEmptyObject(o: {}) {
+  static isEmptyObject(o: {}): boolean {
     return (
       typeof o === 'object' &&
       Object.entries(o).length === 0 &&