kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with the error messages

Browse Source 
Many of the errors where incorrectly showing "Required field is not
provided" when the field was provided but not valid.
This was raised by @ron on PR #3825
This commit is contained in:
HelderSepu
2017-10-28 16:21:40 -04:00
parent 4eae9b681b
commit ec2179f019
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/utils.js
View File

@@ -556,14 +556,19 @@ export const validateParam = (param, isXml, isOAS3 = false) => {
Only bother validating the parameter if the type was specified. Only bother validating the parameter if the type was specified.
*/ */
if ( type && (required || value) ) { if ( type && (required || value) ) {
// These checks should evaluate to true if the parameter's value is valid // These checks should evaluate to true if there is a parameter
let stringCheck = type === "string" && value && !validateString(value) let stringCheck = type === "string" && value
let arrayCheck = type === "array" && Array.isArray(value) && value.length let arrayCheck = type === "array" && Array.isArray(value) && value.length
let listCheck = type === "array" && Im.List.isList(value) && value.count() let listCheck = type === "array" && Im.List.isList(value) && value.count()
let fileCheck = type === "file" && value instanceof win.File let fileCheck = type === "file" && value instanceof win.File
let booleanCheck = type === "boolean" && !validateBoolean(value) let booleanCheck = type === "boolean" && (value || value === false)
let numberCheck = type === "number" && !validateNumber(value) // validateNumber returns undefined if the value is a number let numberCheck = type === "number" && value
let integerCheck = type === "integer" && !validateInteger(value) // validateInteger returns undefined if the value is an integer let integerCheck = type === "integer" && value
if ( required && !(stringCheck || arrayCheck || listCheck || fileCheck || booleanCheck || numberCheck || integerCheck) ) {
errors.push("Required field is not provided")
return errors
}
if (maxLength || maxLength === 0) { if (maxLength || maxLength === 0) {
let err = validateMaxLength(value, maxLength) let err = validateMaxLength(value, maxLength)
@@ -575,11 +580,6 @@ export const validateParam = (param, isXml, isOAS3 = false) => {
if (err) errors.push(err) if (err) errors.push(err)
} }
if ( required && !(stringCheck || arrayCheck || listCheck || fileCheck || booleanCheck || numberCheck || integerCheck) ) {
errors.push("Required field is not provided")
return errors
}
if (maximum || maximum === 0) { if (maximum || maximum === 0) {
let err = validateMaximum(value, maximum) let err = validateMaximum(value, maximum)
if (err) errors.push(err) if (err) errors.push(err)

6
test/core/utils.js
View File

@@ -524,7 +524,7 @@ describe("utils", function() {
type: "boolean", type: "boolean",
value: "test string" value: "test string"
} }
assertValidateParam(param, ["Required field is not provided"]) assertValidateParam(param, ["Value must be a boolean"])
// valid boolean value // valid boolean value
param = { param = {
@@ -584,7 +584,7 @@ describe("utils", function() {
type: "number", type: "number",
value: "test" value: "test"
} }
assertValidateParam(param, ["Required field is not provided"]) assertValidateParam(param, ["Value must be a number"])
// invalid number, undefined value // invalid number, undefined value
param = { param = {
@@ -666,7 +666,7 @@ describe("utils", function() {
type: "integer", type: "integer",
value: "test" value: "test"
} }
assertValidateParam(param, ["Required field is not provided"]) assertValidateParam(param, ["Value must be an integer"])
// invalid integer, undefined value // invalid integer, undefined value
param = { param = {