Cleanup object check (remove tautology, verboseness)

cdimascio · Dec 17, 2019 · 74a0149 · 74a0149
1 parent 8a159f3
commit 74a0149
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/src/middlewares/openapi.request.validator.ts b/src/middlewares/openapi.request.validator.ts
@@ -366,21 +366,15 @@ export class RequestValidator {
         }
       } else if ($in === 'query') {
         // handle complex json types in schema
-        const schemaHasObject = schema => {
-          return (
-            schema.type === 'object' &&
-            schema.type !== 'array'
-          ) || (
-            schema.allOf &&
-            schema.allOf.some(schemaHasObject)
-          ) || (
-            schema.oneOf &&
-            schema.oneOf.some(schemaHasObject)
-          ) || (
-            schema.anyOf &&
-            schema.anyOf.some(schemaHasObject)
-          )
-        };
+        const schemaHasObject = schema =>
+          schema && (
+            schema.type === 'object' ||
+            [].concat(
+              schema.allOf,
+              schema.oneOf,
+              schema.anyOf,
+            ).some(schemaHasObject)
+          );
 
         if (schemaHasObject(parameterSchema)) {
           parseJson.push({ name, reqField });