Merge pull request #612 from postmanlabs/fix/allOfStringProp

Fix/all of string prop

Author: SahilChoudhary22

lib/deref.js

@@ -112,7 +112,7 @@ module.exports = {
       return mergeAllOf({
         allOf: schemaArr.map((schema) => {
           return this.resolveRefs(schema, parameterSourceOption, components, schemaResolutionCache, resolveFor,
-            resolveTo, stack, seenRef, stackLimit);
+            resolveTo, stack, seenRef, stackLimit, true);
         })
       }, {
         resolvers: {
@@ -148,7 +148,7 @@ module.exports = {
    */
 
   resolveRefs: function (schema, parameterSourceOption, components, schemaResolutionCache,
-    resolveFor = 'CONVERSION', resolveTo = 'schema', stack = 0, seenRef = {}, stackLimit = 10) {
+    resolveFor = 'CONVERSION', resolveTo = 'schema', stack = 0, seenRef = {}, stackLimit = 10, isAllOf = false) {
     var resolvedSchema, prop, splitRef,
       ERR_TOO_MANY_LEVELS = '<Error: Too many levels of nesting to fake this schema>';
     let concreteUtils = components && components.hasOwnProperty('concreteUtils') ?
@@ -350,6 +350,9 @@ module.exports = {
           value: schema.enum[0]
         };
       }
+      else if (isAllOf) {
+        return schema;
+      }
       else {
         return {
           type: SCHEMA_TYPES.object

test/data/valid_openapi/all_of_property.json

@@ -0,0 +1,96 @@
+{
+  "openapi": "3.0.2",
+  "info": {
+    "title": "Platform API",
+    "description": "[ Platform](https://server.dev) provides functionality to provide access to content stored within. It provides endpoints for basic manipulation of files and folder.",
+    "termsOfService": "https://server.com/s",
+    "contact": {
+      "name": "nc",
+      "url": "https://server.dev",
+      "email": "dev@server.com"
+    },
+    "license": {
+      "name": "Apache-2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0"
+    },
+    "version": "2.0.0"
+  },
+  "servers": [
+    {
+      "url": "https://server.com/2.0",
+      "description": "Platform API server"
+    }
+  ],
+  "paths": {
+    "/files": {
+      "get": {
+        "operationId": "get_Files",
+        "summary": "List files ",
+        "tags": [
+          "Skills"
+        ],
+        "description": "List the files.",
+        "parameters": [
+          {
+            "name": "file_id",
+            "description": "The unique identifier",
+            "example": "12345",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns all the data.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/File"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "File": {
+        "title": "File",
+        "type": "object",
+        "description": "A mini representation of a file",
+        "required": [
+          "id"
+        ],
+        "allOf": [
+          {
+            "properties": {
+              "id": {
+                "allOf": [
+                  {
+                    "type": "string",
+                    "example": "3",
+                    "nullable": false,
+                    "description": "A numeric identifier"
+                  },
+                  {
+                    "nullable": false
+                  }
+                ]
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the file",
+                "example": "Contract.pdf"
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}

test/unit/validator.test.js

@@ -64,6 +64,7 @@ function getFoldersByVersion(folder30Path, folder31Path) {
 }
 
 describe('Validate with servers', function () {
+
   it('Fix for GITHUB#496: Should identify url with fragment', function () {
     const openAPI = path.join(__dirname, VALID_OPENAPI_FOLDER_PATH + '/explicit_server_in_path.json'),
       openAPIData = fs.readFileSync(openAPI, 'utf8'),
@@ -1639,3 +1640,45 @@ describe('validateTransaction method. Path variables matching validation (issue
     });
   });
 });
+
+describe('validateTransaction convert and validate schemas with allOf', function () {
+  it('Should convert and validate allOf properties for string schema', function () {
+    const openAPI = path.join(__dirname, VALID_OPENAPI_FOLDER_PATH + '/all_of_property.json'),
+      openAPIData = fs.readFileSync(openAPI, 'utf8'),
+      expectedRequestBody = '{\n  "id": "3",\n  "name": "Contract.pdf"\n}',
+      options = {
+        requestParametersResolution: 'Example',
+        exampleParametersResolution: 'Example',
+        showMissingInSchemaErrors: true,
+        strictRequestMatching: true,
+        ignoreUnresolvedVariables: true,
+        validateMetadata: true,
+        suggestAvailableFixes: true,
+        detailedBlobValidation: false
+      },
+      schemaPack = new Converter.SchemaPack({ type: 'string', data: openAPIData }, options);
+    schemaPack.convert((err, conversionResult) => {
+      expect(err).to.be.null;
+      expect(conversionResult.result).to.equal(true);
+      expect(conversionResult.output[0].data.item[0].response[0].body).to.equal(expectedRequestBody);
+
+      let historyRequest = [];
+
+      getAllTransactions(conversionResult.output[0].data, historyRequest);
+
+      schemaPack.validateTransaction(historyRequest, (err, result) => {
+        expect(err).to.be.null;
+        expect(result).to.be.an('object');
+
+        let requestIds = Object.keys(result.requests);
+        expect(err).to.be.null;
+        expect(result.missingEndpoints.length).to.eq(0);
+        requestIds.forEach((requestId) => {
+          expect(result.requests[requestId].endpoints[0]).to.not.be.undefined;
+          expect(result.requests[requestId].endpoints[0].matched).to.be.true;
+        });
+      });
+    });
+  });
+});
+