Merge pull request #497 from postmanlabs/fix496/validateWithServers

match with servers

Author: VShingala

lib/schemaUtils.js

@@ -2611,11 +2611,15 @@ module.exports = {
       matchedPath,
       matchedPathJsonPath,
       schemaPathItems = schema.paths,
+      pathToMatchServer,
       filteredPathItemsArray = [];
 
     // Return no matches for invalid url (if unable to decode parsed url)
     try {
       pathToMatch = decodeURI(parsedUrl.pathname);
+      if (!_.isNil(parsedUrl.hash)) {
+        pathToMatch += parsedUrl.hash;
+      }
     }
     catch (e) {
       console.warn(
@@ -2654,9 +2658,16 @@ module.exports = {
         }
         return accumulator;
       }, []);
-
+      let schemaMatchResult = { match: false };
       // check if path and pathToMatch match (non-null)
-      let schemaMatchResult = this.getPostmanUrlSchemaMatchScore(pathToMatch, path, options);
+      // check in explicit (local defined) servers
+      if (pathItemObject[method.toLowerCase()].servers) {
+        pathToMatchServer = this.handleExplicitServersPathToMatch(pathToMatch, path);
+        schemaMatchResult = this.getPostmanUrlSchemaMatchScore(pathToMatchServer, path, options);
+      }
+      else {
+        schemaMatchResult = this.getPostmanUrlSchemaMatchScore(pathToMatch, path, options);
+      }
       if (!schemaMatchResult.match) {
         // there was no reasonable match b/w the postman path and this schema path
         return true;
@@ -4465,6 +4476,32 @@ module.exports = {
     });
   },
 
+  /**
+   * Takes in the postman path and the schema path
+   * takes from the path the number of segments present in the schema path
+   * and returns the last segments from the path to match in an string format
+   *
+   * @param {string} pathToMatch - parsed path (exclude host and params) from the Postman request
+   * @param {string} schemaPath - schema path from the OAS spec (exclude servers object)
+   * @returns {string} only the selected segments from the pathToMatch
+   */
+  handleExplicitServersPathToMatch: function (pathToMatch, schemaPath) {
+    let pathTMatchSlice,
+      schemaPathArr = _.reject(schemaPath.split('/'), (segment) => {
+        return segment === '';
+      }),
+      schemaPathSegments = schemaPathArr.length,
+      pathToMatchArr = _.reject(pathToMatch.split('/'), (segment) => {
+        return segment === '';
+      }),
+      pathToMatchSegments = pathToMatchArr.length;
+    if (pathToMatchSegments < schemaPathSegments) {
+      return pathToMatch;
+    }
+    pathTMatchSlice = pathToMatchArr.slice(pathToMatchArr.length - schemaPathSegments, pathToMatchArr.length);
+    return pathTMatchSlice.join('/');
+  },
+
   /**
    * @param {string} postmanPath - parsed path (exclude host and params) from the Postman request
    * @param {string} schemaPath - schema path from the OAS spec (exclude servers object)