sascha_hemi/homeassistant-desktop
1
0
Fork 0
mirror of https://github.com/sascha-hemi/homeassistant-desktop.git synced 2026-03-21 04:06:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(4): Fixed URL validation when adding new instances

Browse Source
This commit is contained in:
Ivan Prodanov
2022-11-14 22:47:27 +02:00
parent 97ee1a0d50
commit 60b2e561b0
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
web/index.html
View File

@@ -45,7 +45,17 @@
})
function addInstance(url) {
ipcRenderer.send('ha-instance', url);
const urlField = document.getElementById('url');
urlField.value = url;
checkUrl();
}
function saveInstance() {
const urlField = document.getElementById('url');
document.getElementById('check-wrapper').style.display = 'block';
document.getElementById('url-wrapper').style.display = 'none';
showCheckmark = true;
ipcRenderer.send('ha-instance', urlField.value);
}
ipcRenderer.send('ha-instance');
@@ -77,27 +87,34 @@
function checkUrl() {
const urlField = document.getElementById('url');
const url = urlField.value;
const submitBtn = document.getElementById('submit');
submitBtn.disabled = true;
let url = urlField.value;
urlField.classList.remove('is-invalid', 'is-valid');
if (!url.startsWith('http') || !isValidUrl(url)) {
urlField.classList.add('is-invalid');
return;
}
url = new URL(url);
if (url.pathname.length > 1 && !url.pathname.startsWith('/lovelace') && !url.pathname.startsWith('/energy')) {
console.log(url.pathname, !url.pathname.startsWith('/lovelace'));
urlField.classList.add('is-invalid');
return;
}
urlField.classList.add('is-valid');
fetch(`${url}/auth/providers`)
fetch(`${url.origin}/auth/providers`)
.then(response => response.text())
.then(data => {
if (!data.includes('homeassistant')) {
return;
}
urlField.disabled = true;
document.getElementById('check-wrapper').style.display = 'block';
document.getElementById('url-wrapper').style.display = 'none';
showCheckmark = true;
ipcRenderer.send('ha-instance', url);
submitBtn.disabled = false;
}).catch((_) => {
});
}
@@ -141,6 +158,7 @@
<span class="bar"></span>
<label for="url">Home Assistant URL</label>
<div class="invalid-feedback">Please provide a valid url.</div>
<button class="pure-material-button-contained" id="submit" onclick="saveInstance()" disabled>Submit</button>
</div>
</div>
</div>