From 202c89ca7421d3ede9cb7c4b3e670507258d3c6b Mon Sep 17 00:00:00 2001 From: daragh Date: Sun, 31 Dec 2023 08:18:33 +0000 Subject: [PATCH] fix : early return, logging errors into frontend --- src/ssh/index.html | 16 ++++---- src/ssh/ssh.js | 93 +++++++++++++++++++++++----------------------- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/src/ssh/index.html b/src/ssh/index.html index 955f38f..a7938e7 100644 --- a/src/ssh/index.html +++ b/src/ssh/index.html @@ -7,21 +7,21 @@ - -
@@ -63,7 +62,8 @@
SSH Keys
- +
diff --git a/src/ssh/ssh.js b/src/ssh/ssh.js index 515c363..66a4cce 100644 --- a/src/ssh/ssh.js +++ b/src/ssh/ssh.js @@ -4,30 +4,30 @@ async function get_keys() { let username = document.getElementById("user").value; let password = document.getElementById("pass").value; let request = {auth: {user: username, pass: password}}; - try { const response = await fetch('https://api.account.skynet.ie/ldap/ssh', { method: 'POST', body: JSON.stringify(request), mode: 'cors', }); - if (response.status === 200) { - const data = await response.json(); - if (data.result === "success") { - document.getElementById('formStatus').innerHTML = "Success: Got keys"; - let keys = data.success; - document.getElementById('key_table').style.display = "table"; - got_keys = true; - keys.forEach(key => { - add_to_table(key); - }); - } else { - document.getElementById('formStatus').innerHTML = "Error: Failed to get keys"; - } - } else { + if (response.status !== 200) { document.getElementById('formStatus').innerHTML = "Failed to fetch"; + return; } + const data = await response.json(); + if (data.result !== "success") { + document.getElementById('formStatus').innerHTML = `Error: ${data.error}`; + return; + } + document.getElementById('formStatus').innerHTML = "Success: Got keys"; + let keys = data.success; + document.getElementById('key_table').style.display = "table"; + got_keys = true; + keys.forEach(key => { + add_to_table(key); + }); } catch (err) { + document.getElementById('formStatus').innerHTML = `Error: ${err}`; console.log(err); } } @@ -48,20 +48,21 @@ async function add_key() { body: JSON.stringify(request), mode: 'cors', }); - if (response.status === 200) { - const data = await response.json(); - if (data.result === "success") { - document.getElementById('formStatus').innerHTML = "Success: Key added"; - document.getElementById('key_table').style.display = "table"; - add_to_table(request.key); - } else { - document.getElementById('formStatus').innerHTML = "Error:Failed to add"; - } - } else { + if (response.status !== 200) { document.getElementById('formStatus').innerHTML = "Failed to fetch"; + return; } + const data = await response.json(); + if (data.result !== "success") { + document.getElementById('formStatus').innerHTML = `Error: ${data.error}`; + return; + } + document.getElementById('formStatus').innerHTML = "Success: Key added"; + document.getElementById('key_table').style.display = "table"; + add_to_table(request.key); + } catch (err) { - document.getElementById('formStatus').innerHTML = "Error "; + document.getElementById('formStatus').innerHTML = `Error: ${err}`; console.log(err); } } @@ -78,46 +79,46 @@ async function delete_key(row_idx) { body: JSON.stringify(request), mode: 'cors', }); - if (response.status === 200) { - const data = await response.json(); - if (data.result === "success") { - table.deleteRow(row_idx); - document.getElementById('formStatus').innerHTML = "Success: Key deleted"; - } else { - document.getElementById('formStatus').innerHTML = "Error: Failed to delete"; - } - } else { + if (response.status !== 200) { document.getElementById('formStatus').innerHTML = "Failed to fetch"; + return; } + const data = await response.json(); + if (data.result !== "success") { + document.getElementById('formStatus').innerHTML = `Error: ${data.error}`; + return; + } + table.deleteRow(row_idx); + document.getElementById('formStatus').innerHTML = "Success: Key deleted"; + } catch (err) { - document.getElementById('formStatus').innerHTML = "Error "; + document.getElementById('formStatus').innerHTML = `Error: ${err}`; console.log(err); } } function add_to_table(key) { let table = document.getElementById("key_table"); - let new_row = table.insertRow(); - let name_cell = new_row.insertCell(0); - let key_cell = new_row.insertCell(1); + let row = table.insertRow(); + let cell_name = row.insertCell(0); + let cell_key = row.insertCell(1); //Splitting by spaces, first two make the key + type, rest is a comment/name of the key let key_split = key.split(' '); - let key_string = key_split[0] + ' ' + key_split[1]; - key_cell.textContent = key_string; + cell_key.textContent = `${key_split[0]} ${key_split[1]}`; //Names for SSH keys can have multiple spaces let comment = ""; for (i = 2; i < key_split.length; i++) { comment += " " + key_split[i]; } - name_cell.textContent = comment; - let delete_cell = new_row.insertCell(2); + cell_name.textContent = comment; + let cell_delete = row.insertCell(2); let delete_button = document.createElement("button"); delete_button.innerHTML = "Delete"; - delete_cell.appendChild(delete_button); - delete_cell.addEventListener("click", function () { - delete_key(new_row.rowIndex); + cell_delete.appendChild(delete_button); + cell_delete.addEventListener("click", function () { + delete_key(row.rowIndex); }); }