mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-01-19 23:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

improvement: postMessage handling for safer JSON parse & new events

Browse Source
This commit is contained in:
Zack Spear
2020-07-16 19:39:37 -07:00
parent 7fd6d98614
commit 929f5c2e6c
1 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
dynamix.unraid.net.plg
View File

@@ -833,8 +833,44 @@ function handleMessage(e) {
hideRegWizard();
return;
}
const SAFE_JSON_PARSE = (str) => {
try {
return [null, JSON.parse(str)];
} catch (err) {
return [err];
}
};
var data = JSON.parse(e.data);
const [err, data] = SAFE_JSON_PARSE(e.data);
if (err) return console.log('handleMessage', err);
const HANDLE_LICENSES = (data, e) => {
if (data.license) {
// @FIXME - instead of being a callback function of hideRegWizard()
// we need to implement a REDIRECT / RELOAD postMessage event so the
// launchpad / regwiz doesn't go away before the user closes the pop-up
$.get('/webGui/include/InstallKey.php', {url: data.license}, function() {
console.log('New license key installed: ' + data.license);
const payload = {
event: 'LICENSE_SUCCESS',
message: 'New license key installed',
license: data.license,
};
e.source.postMessage(JSON.stringify(payload), e.origin);
}).fail(function() {
console.error('Failed to license new key: ' + data.license);
const payload = {
event: 'LICENSE_ERROR',
message: 'Failed to license new key',
license: data.license,
};
e.source.postMessage(JSON.stringify(payload), e.origin);
});
} else {
console.error('KEY_PURCHASE event fired! but missing license data:', data);
}
};
switch (data.event) {
case "CLOSE_SHADOWBOX":
@@ -851,38 +887,18 @@ function handleMessage(e) {
}
$.post('/update.php', postargs, function() {
console.log('dynamix/dynamix.cfg: Updated apikey under [remote] section');
if (!data.license) {
setTimeout(function(){ window.location.href = '/Main'; }, 500);
}
//if (!data.license) {
// setTimeout(function(){ window.location.href = '/Main'; }, 500);
//}
}).fail(function() {
console.error('Failed to update apikey under [remote] section');
});
}
if (data.license) {
hideRegWizard(function (){
$.get('/webGui/include/InstallKey.php', {url: data.license}, function() {
console.log('New license key installed: ' + data.license);
setTimeout(function(){ window.location.href = '/Main'; }, 500);
}).fail(function() {
console.error('Failed to license new key: ' + data.license);
});
});
}
// duplicate conditional so we don't get the error from HANDLE_LICENSES()
if (data.license) HANDLE_LICENSES(data, e);
break;
case "INSTALL_KEY":
case "KEY_PURCHASE":
if (data.license) {
hideRegWizard(function () {
$.get('/webGui/include/InstallKey.php', {url: data.license}, function() {
console.log('New license key installed: ' + data.license);
setTimeout(function(){ window.location.href = '/Main'; }, 500);
}).fail(function() {
console.error('Failed to license new key: ' + data.license);
});
});
} else {
console.error('KEY_PURCHASE event fired! but missing license data:', data);
}
HANDLE_LICENSES(data, e);
break;
case "GET_STATE":
$.get('/plugins/dynamix.unraid.net/include/state.php', function(newstate) {
@@ -898,6 +914,10 @@ function handleMessage(e) {
console.error('Failed to unregister');
});
break;
case "RELOAD":
return window.location.reload();
case "REDIRECT_MAIN":
return window.location.href = '/Main';
default:
console.error('Unhandled event \'' + data.event + '\' fired. data:', data);
break;