secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Preventing urlvars of null breaking connection; Acceping test_mode=1 in URL

Browse Source
This commit is contained in:
James Barnsley
2020-02-13 08:54:12 +13:00
parent b3a15f01d0
commit 3ad0b7994b
8 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/index.html
View File

@ -111,7 +111,8 @@
var css = document.createElement("link");
css.rel = "stylesheet";
// Check for test mode. This is toggled under Settings > Debug > Test mode
// Check for test mode. This is toggled under Settings > Debug > Test mode or can
// be manually triggered with the URL var "?test_mode=1"
try {
var ui = JSON.parse(localStorage.getItem('ui') );
var test_mode = (
@ -119,22 +120,23 @@
&& ui
&& typeof(ui.test_mode) !== 'undefined'
&& ui.test_mode
);
) || window.location.href.indexOf('test_mode=1') > -1;
} catch(error){
console.error(error);
var test_mode = false;
}
// Test mode, use un-minified code
if (test_mode){
css.href = '/iris/app.css?v='+build;
js.src = '/iris/app.js?v='+build;
if (test_mode){
console.debug("Test mode enabled, using un-minified code");
css.href = '/iris/app.css?v='+build;
js.src = '/iris/app.js?v='+build;
// Production-grade, minified app
} else {
css.href = '/iris/app.min.css?v='+build;
js.src = '/iris/app.min.js?v='+build;
}
// Production-grade, minified app
} else {
css.href = '/iris/app.min.css?v='+build;
js.src = '/iris/app.min.js?v='+build;
}
// And finally inject our CSS/JS tags
document.body.appendChild(css);

3
src/js/views/modals/InitialSetup.js
View File

@ -41,8 +41,9 @@ class InitialSetup extends React.Component {
// Check for url-parsed configuration values
const customHost = helpers.queryString('host', search);
const customPort = helpers.queryString('port', search);
if (customHost) this.setState({ host: customHost });
if (customPort) this.setState({ port: customPort });
this.setState({ host: customHost, port: customPort });
uiActions.setWindowTitle('Welcome to Iris');
}