Skip to content

fix uri-schema handling in WoT TD #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kazuhitoyokoi merged 1 commit into from
Mar 8, 2022
Merged

fix uri-schema handling in WoT TD #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions templates/webofthings/node.js.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,8 @@ module.exports = function (RED) {
const urivars = prop.hasOwnProperty("uriVariables") ? msg.payload : {};
if (prop.uriVariables) {
const ajv = new Ajv({allErrors: true, strict: false, validateFormats: false});
if (!ajv.validate(prop.uriVariables, urivars)) {
const uvschema = { type: "object", properties: prop.uriVariables };
if (!ajv.validate(uvschema, urivars)) {
node.warn(`input schema validation error: ${ajv.errorsText()}`, msg);
}
}
Expand Down Expand Up @@ -512,7 +513,8 @@ module.exports = function (RED) {
const urivars = prop.hasOwnProperty("uriVariables") ? msg.payload : {};
if (prop.uriVariables) {
const ajv = new Ajv({allErrors: true, strict: false, validateFormats: false});
if (!ajv.validate(prop.uriVariables, urivars)) {
const uvschema = { type: "object", properties: prop.uriVariables };
if (!ajv.validate(uvschema, urivars)) {
node.warn(`input schema validation error: ${ajv.errorsText()}`, msg);
}
}
Expand All @@ -533,7 +535,8 @@ module.exports = function (RED) {
const urivars = act.hasOwnProperty("uriVariables") ? msg.payload : {};
if (act.uriVariables) {
const ajv = new Ajv({allErrors: true, strict: false, validateFormats: false});
if (!ajv.validate(act.uriVariables, urivars)) {
const uvschema = { type: "object", properties: act.uriVariables };
if (!ajv.validate(uvschema, urivars)) {
node.warn(`input schema validation error: ${ajv.errorsText()}`, msg);
}
}
Expand All @@ -556,7 +559,8 @@ module.exports = function (RED) {
const urivars = ev.hasOwnProperty("uriVariables") ? msg.payload : {};
if (ev.uriVariables) {
const ajv = new Ajv({allErrors: true, strict: false, validateFormats: false});
if (!ajv.validate(ev.uriVariables, urivars)) {
const uvschema = { type: "object", properties: ev.uriVariables };
if (!ajv.validate(uvschema, urivars)) {
node.warn(`input schema validation error: ${ajv.errorsText()}`, msg);
}
}
Expand Down
2 changes: 1 addition & 1 deletion templates/webofthings/package.json.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"https-proxy-agent": "5.0.0",
"request": "2.88.2",
"ws": "8.5.0",
"url-template": "3.0.0",
"url-template": "2.0.8",
"ajv": "8.10.0",
"coap": "1.0.3"
},
Expand Down