Cleanup data validation

This commit is contained in:
shamoon
2023-04-11 11:05:30 -07:00
parent 8476b97f7d
commit a83d105764
3 changed files with 34 additions and 24 deletions

View File

@@ -39,15 +39,15 @@ export default async function genericProxyHandler(req, res, map) {
let resultData = data;
if (!validateWidgetData(widget, endpoint, resultData)) {
if (resultData.error && resultData.error.url) {
resultData.error.url = sanitizeErrorURL(url);
}
return res.status(status).json({error: {message: "Invalid data", url: sanitizeErrorURL(url), data: resultData}});
if (resultData.error?.url) {
resultData.error.url = sanitizeErrorURL(url);
}
if (status === 200 && map) {
resultData = map(data);
if (status === 200) {
if (!validateWidgetData(widget, endpoint, resultData)) {
return res.status(status).json({error: {message: "Invalid data", url: sanitizeErrorURL(url), data: resultData}});
}
if (map) resultData = map(resultData);
}
if (contentType) res.setHeader("Content-Type", contentType);
@@ -58,7 +58,7 @@ export default async function genericProxyHandler(req, res, map) {
if (status >= 400) {
logger.debug("HTTP Error %d calling %s//%s%s...", status, url.protocol, url.hostname, url.pathname);
return res.status(status).json({error: {message: "HTTP Error", url: sanitizeErrorURL(url), data}});
return res.status(status).json({error: {message: "HTTP Error", url: sanitizeErrorURL(url), resultData}});
}
return res.status(status).send(resultData);