undo validation

undo validation

Author: LuisTejedaS

lib/ajValidation/ajvValidation.js

@@ -50,16 +50,6 @@ function getDraftToUse(localDraft, jsonSchemaDialect) {
   return localDraft ? localDraft : jsonSchemaDialect;
 }
 
-/**
- * Checks if the schema object property is deprecated
- *
- * @param {*} schema - Schema object used in validation
- * @returns {Boolean} postman variable or not
- */
-function isDeprecated (schema) {
-  return schema ? schema.deprecated ? schema.deprecated : false : false;
-}
-
 /**
  * Used to validate schema against a value.
  * NOTE: Used in assets/json-schema-faker.js to validate schema example
@@ -117,18 +107,6 @@ function validateSchema (schema, valueToUse, options = {}, jsonSchemaDialect) {
       return !isTypeValue(valueToValidate, schemaToUse);
     }
 
-    if (validationError.keyword === 'required') {
-      let schemaDataPath = formatDataPath(formatSchemaPathFromAJVErrorToConvertToDataPath(validationError.schemaPath)),
-        propertyError = _.get(validationError, 'params.missingProperty') || '',
-        schemaPropertyPath = schemaDataPath.replace('.required', '.properties.') + propertyError;
-
-      if (options.includeDeprecated === false &&
-        isDeprecated(_.get(schema, schemaPropertyPath))) {
-        return false;
-      }
-      return true;
-    }
-
     return true;
   });
 

lib/schemaUtils.js

@@ -3910,35 +3910,31 @@ module.exports = {
           return param.key === qp.name;
         })) {
 
-          if (shouldAddDeprecatedOperation(qp, options)) {
-
-            // assign parameter example(s) as schema examples;
-            this.assignParameterExamples(qp);
+          // assign parameter example(s) as schema examples;
+          this.assignParameterExamples(qp);
 
-            mismatchObj = {
-              property: mismatchProperty,
-              transactionJsonPath: transactionPathPrefix,
-              schemaJsonPath: qp.pathPrefix + '[?(@.name==\'' + qp.name + '\')]',
-              reasonCode: 'MISSING_IN_REQUEST',
-              reason: `The required query parameter "${qp.name}" was not found in the transaction`
-            };
+          mismatchObj = {
+            property: mismatchProperty,
+            transactionJsonPath: transactionPathPrefix,
+            schemaJsonPath: qp.pathPrefix + '[?(@.name==\'' + qp.name + '\')]',
+            reasonCode: 'MISSING_IN_REQUEST',
+            reason: `The required query parameter "${qp.name}" was not found in the transaction`
+          };
 
-            if (options.suggestAvailableFixes) {
-              mismatchObj.suggestedFix = {
+          if (options.suggestAvailableFixes) {
+            mismatchObj.suggestedFix = {
+              key: qp.name,
+              actualValue: null,
+              suggestedValue: {
                 key: qp.name,
-                actualValue: null,
-                suggestedValue: {
-                  key: qp.name,
-                  value: safeSchemaFaker(qp.schema || {}, 'example', PROCESSING_TYPE.VALIDATION,
-                    PARAMETER_SOURCE.REQUEST, components, SCHEMA_FORMATS.DEFAULT, options.indentCharacter, schemaCache,
-                    options.stackLimit, options.includeDeprecated),
-                  description: this.getParameterDescription(qp)
-                }
-              };
-            }
-            mismatches.push(mismatchObj);
+                value: safeSchemaFaker(qp.schema || {}, 'example', PROCESSING_TYPE.VALIDATION,
+                  PARAMETER_SOURCE.REQUEST, components, SCHEMA_FORMATS.DEFAULT, options.indentCharacter, schemaCache,
+                  options.stackLimit, options.includeDeprecated),
+                description: this.getParameterDescription(qp)
+              }
+            };
           }
-
+          mismatches.push(mismatchObj);
         }
       });
       return callback(null, _.concat(_.flatten(res), mismatches));

test/unit/validator.test.js

@@ -1894,7 +1894,7 @@ describe('validateTransaction convert and validate schemas with deprecated eleme
     });
   });
 
-  it('Should convert and validate without error excluding deprecated query param when ' +
+  it('Should convert and validate required parameter even if it is deprecated' +
   'includeDeprecated is false', function() {
     const openAPI = path.join(__dirname, VALID_OPENAPI_FOLDER_PATH + '/petstore_deprecated_param.json'),
       openAPIData = fs.readFileSync(openAPI, 'utf8'),
@@ -1921,16 +1921,14 @@ describe('validateTransaction convert and validate schemas with deprecated eleme
         expect(err).to.be.null;
         expect(result.missingEndpoints.length).to.eq(0);
         let requestIds = Object.keys(result.requests);
-        requestIds.forEach((requestId) => {
-          expect(result.requests[requestId].endpoints[0]).to.not.be.undefined;
-          expect(result.requests[requestId].endpoints[0].matched).to.be.true;
-        });
+        expect(result.requests[requestIds[0]].endpoints[0].matched).to.be.false;
+        expect(result.requests[requestIds[0]].endpoints[0].mismatches[0].reason.includes('variable2')).to.be.true;
       });
     });
 
   });
 
-  it('Should convert and validate without error excluding deprecated query param when ' +
+  it('Should convert and validate required parameter even if it is deprecated' +
   'includeDeprecated is true', function() {
     const openAPI = path.join(__dirname, VALID_OPENAPI_FOLDER_PATH + '/petstore_deprecated_param.json'),
       openAPIData = fs.readFileSync(openAPI, 'utf8'),

test/unit/xajvValidation.test.js

@@ -580,7 +580,7 @@ describe('validateSchema', function () {
     expect(result[0].keyword).to.equal('type');
   });
 
-  it('Should not report error with deprecated property when is not present and' +
+  it('Should report error with deprecated property when is not present and it is required' +
    ' includeDeprecated is false', function () {
     const schema = {
         type: 'object',
@@ -616,7 +616,8 @@ describe('validateSchema', function () {
         }
       },
       result = validateSchema(schema, valueToUse, { includeDeprecated: false });
-    expect(result).to.be.empty;
+    expect(result).to.not.be.empty;
+    expect(result[0].params.missingProperty).to.equal('id');
   });
 
   it('Should report error with deprecated property when is not present and' +
@@ -656,6 +657,7 @@ describe('validateSchema', function () {
       },
       result = validateSchema(schema, valueToUse, { includeDeprecated: true });
     expect(result).to.not.be.empty;
+    expect(result[0].params.missingProperty).to.equal('id');
   });
 });