0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Omada widget : v3 v4 and v5 versions don't use the same fields for the same stats, I've corrected the code to make it more reliable

Browse source
This commit is contained in:
Benoit 2022-12-09 21:06:09 +01:00
parent 8d66756a7d
commit 467b67802a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/widgets/omada/proxy.js
View file

@ -80,8 +80,7 @@ export default async function omadaProxyHandler(req, res) {
cid = JSON.parse(cidresult).result.omadacId; cid = JSON.parse(cidresult).result.omadacId;
cversion = JSON.parse(cidresult).result.controllerVer; cversion = JSON.parse(cidresult).result.controllerVer;
} catch (e) { } catch (e) {
cversion = "3.2.17"; cversion = "3.2.17"
} }
if (cversion < "4.0.0") { if (cversion < "4.0.0") {
loginUrl = `${widget.url}/api/user/login?ajax`; loginUrl = `${widget.url}/api/user/login?ajax`;
@ -121,7 +120,7 @@ export default async function omadaProxyHandler(req, res) {
} else if (cversion < "5.0.0") { } else if (cversion < "5.0.0") {
sitesUrl = `${widget.url}/api/v2/sites?token=${token}&currentPage=1&currentPageSize=1000`; sitesUrl = `${widget.url}/api/v2/sites?token=${token}&currentPage=1&currentPageSize=1000`;
body = {}; body = {};
params = { }; params = {"token": token};
headers = {"Csrf-Token": token }; headers = {"Csrf-Token": token };
method = "GET"; method = "GET";
@ -132,7 +131,6 @@ export default async function omadaProxyHandler(req, res) {
method = "GET"; method = "GET";
params = { }; params = { };
} }
requestresponse = await httpProxy(sitesUrl, { requestresponse = await httpProxy(sitesUrl, {
method, method,
params, params,
@ -140,7 +138,6 @@ export default async function omadaProxyHandler(req, res) {
headers, headers,
}); });
const listresult = JSON.parse(requestresponse[2]); const listresult = JSON.parse(requestresponse[2]);
if (listresult.errorCode !== 0) { if (listresult.errorCode !== 0) {
logger.debug(`HTTTP ${listresult.errorCode} getting list of sites with message ${listresult.msg}`); logger.debug(`HTTTP ${listresult.errorCode} getting list of sites with message ${listresult.msg}`);
return res.status(500).send(requestresponse[2]); return res.status(500).send(requestresponse[2]);
@ -204,7 +201,9 @@ export default async function omadaProxyHandler(req, res) {
} else { } else {
let siteStatsUrl; let siteStatsUrl;
let response; let response;
sitetoswitch = listresult.result.data.filter(site => site.name === widget.site);
// On 5.0.0, the key we need is id, on 4.x.x, it's key ...
siteName = sitetoswitch[0].id ?? sitetoswitch[0].key;
if (cversion < "5.0.0") { if (cversion < "5.0.0") {
siteStatsUrl = `${url}/api/v2/sites/${siteName}/dashboard/overviewDiagram?token=${token}&currentPage=1&currentPageSize=1000`; siteStatsUrl = `${url}/api/v2/sites/${siteName}/dashboard/overviewDiagram?token=${token}&currentPage=1&currentPageSize=1000`;
} else { } else {