Updates as per review comments.

This commit is contained in:
mike12345567 2020-09-21 23:19:45 +01:00
parent f6e3d43bd7
commit 39dbf78359
2 changed files with 15 additions and 14 deletions

View File

@ -1,18 +1,19 @@
function validate(schema, property) {
// Return a Koa middleware function
return (ctx, next) => {
if (schema) {
let params =
ctx[property] != null
? ctx[property]
: ctx.request[property] != null
? ctx.request[property]
: null
const { error } = schema.validate(params)
if (error) {
ctx.throw(400, `Invalid ${property} - ${error.message}`)
return
}
if (!schema) {
return next()
}
let params = null
if (ctx[property] != null) {
params = ctx[property]
} else if (ctx.request[property] != null) {
params = ctx.request[property]
}
const { error } = schema.validate(params)
if (error) {
ctx.throw(400, `Invalid ${property} - ${error.message}`)
return
}
return next()
}

View File

@ -10,8 +10,8 @@ function cleanMustache(string) {
"]": "",
}
let regex = new RegExp(/{{[^}}]*}}/g)
let match
while ((match = regex.exec(string)) !== null) {
let matches = [...string.matchAll(regex)]
for (let match of matches) {
let baseIdx = string.indexOf(match)
for (let key of Object.keys(charToReplace)) {
let idxChar = match[0].indexOf(key)