From 9042ce0df952308e2da0c0f51e666e988bba51cb Mon Sep 17 00:00:00 2001
From: Brendan Golden <git_laptop@brendan.ie>
Date: Mon, 1 Jan 2024 10:06:21 +0000
Subject: [PATCH] feat: since most pages were posting to the api and displaying
 any errors its easier to turn it into a shared function for easy refactoring.

Related to #9
---
 src/js/lib.js                    | 28 ++++++++++++++++++++++++++++
 src/modify.html                  |  2 +-
 src/modify.js                    | 31 ++++++-------------------------
 src/password.html                |  2 +-
 src/password.js                  | 27 +++------------------------
 src/recovery/password.html       |  6 ++++--
 src/recovery/password_reset.html |  2 +-
 src/recovery/password_reset.js   | 26 ++++----------------------
 src/recovery/ssh-request.html    |  2 +-
 src/recovery/ssh-request.js      | 27 +++------------------------
 src/recovery/username.html       |  2 +-
 src/recovery/username.js         | 27 +++------------------------
 src/register.html                |  2 +-
 src/register.js                  | 27 +++------------------------
 src/signup.html                  |  2 +-
 src/signup.js                    | 27 +++------------------------
 16 files changed, 64 insertions(+), 176 deletions(-)
 create mode 100644 src/js/lib.js

diff --git a/src/js/lib.js b/src/js/lib.js
new file mode 100644
index 0000000..2b585dd
--- /dev/null
+++ b/src/js/lib.js
@@ -0,0 +1,28 @@
+
+
+export async function post_request(url, body, form_status){
+    let req;
+
+    try {
+        req = await fetch(url, {
+            method: 'POST',
+            body: JSON.stringify(body),
+            mode: "cors"
+        });
+    } catch (e) {
+        form_status.innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
+        return;
+    }
+
+    if (req.status !== 200) {
+        form_status.innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
+        return;
+    }
+
+    let temp = await req.json();
+    if (temp.result === 'error') {
+        form_status.innerHTML = `<span style='background-color: red; color: white'>${temp.error}</span>`;
+    } else {
+        form_status.innerHTML = "<span style='background-color: green; color: white'>Success</span>";
+    }
+}
\ No newline at end of file
diff --git a/src/modify.html b/src/modify.html
index f201542..2498418 100644
--- a/src/modify.html
+++ b/src/modify.html
@@ -49,7 +49,7 @@
           </table>
         </form>
         <p id="formStatus"></p>
-        <script src="modify.js"></script>
+        <script type="module" src="modify.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/modify.js b/src/modify.js
index 131dc80..2bebb8d 100644
--- a/src/modify.js
+++ b/src/modify.js
@@ -1,6 +1,10 @@
+import {post_request} from "./js/lib.js";
+
 const form = document.getElementById("form");
 form.addEventListener('submit',  formHandler);
 
+const form_status = document.getElementById("formStatus");
+
 const button = document.getElementById("button");
 button.addEventListener('submit', formHandler);
 
@@ -13,7 +17,7 @@ async function formHandler(listener) {
     const dropdown_value = dropdown.value;
 
     if (dropdown_value === "") {
-        document.getElementById('formStatus').innerHTML = "<span style='background-color: red; color: white'>Please select a field to modify</span>";
+        form_status.innerHTML = "<span style='background-color: red; color: white'>Please select a field to modify</span>";
         return;
     }
 
@@ -23,30 +27,7 @@ async function formHandler(listener) {
     const body = {auth: {user: user, pass: pass}, field: dropdown_value, value: value};
 
     let url = 'https://api.account.skynet.ie/ldap/update';
-    let req;
-
-    try {
-        req = await fetch(url, {
-            method: 'POST',
-            body: JSON.stringify(body),
-            mode: "cors"
-        });
-    } catch (e) {
-        document.getElementById('formStatus').innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
-        return;
-    }
-
-    if (req.status !== 200) {
-        document.getElementById('formStatus').innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
-        return;
-    }
-
-    let temp = await req.json();
-    if (temp.result === 'error') {
-        document.getElementById('formStatus').innerHTML = `<span style='background-color: red; color: white'>${temp.error}</span>`;
-    } else {
-        document.getElementById('formStatus').innerHTML = "<span style='background-color: green; color: white'>Success</span>";
-    }
+    await post_request(url,  body, form_status);
 }
 
 function selectField() {
diff --git a/src/password.html b/src/password.html
index c719e80..b4c91ec 100644
--- a/src/password.html
+++ b/src/password.html
@@ -41,7 +41,7 @@
           </table>
         </form>
         <p id="formStatus"></p>
-        <script src="password.js"></script>
+        <script type="module" src="password.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/password.js b/src/password.js
index e6cc5f2..c0e2d67 100644
--- a/src/password.js
+++ b/src/password.js
@@ -1,3 +1,5 @@
+import {post_request} from "./js/lib.js";
+
 const form = document.getElementById("form");
 form.addEventListener('submit',  formHandler);
 
@@ -22,28 +24,5 @@ async function formHandler(listener) {
     const body = {auth: {user: user, pass: pass}, field: "userPassword", value: newPW}
 
     let url = 'https://api.account.skynet.ie/ldap/update';
-    let req;
-
-    try {
-        req = await fetch(url, {
-            method: 'POST',
-            body: JSON.stringify(body),
-            mode: "cors"
-        });
-    } catch (e) {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
-        return;
-    }
-
-    if (req.status !== 200) {
-        form_status.innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
-        return;
-    }
-
-    let temp = await req.json();
-    if (temp.result === 'error') {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${temp.error}</span>`;
-    } else {
-        form_status.innerHTML = "<span style='background-color: green; color: white'>Success</span>";
-    }
+    await post_request(url,  body, form_status);
 }
\ No newline at end of file
diff --git a/src/recovery/password.html b/src/recovery/password.html
index e00e3d2..6b29f2a 100644
--- a/src/recovery/password.html
+++ b/src/recovery/password.html
@@ -15,7 +15,9 @@
       <main class="page-body">
         <h2>Forgot Password</h2>
         <p>
-          Request a password reset sent to your linked email. <br> Enter either email address or skynet username. </br>
+          Request a password reset sent to your linked email.
+          <br>
+          Enter either email address or skynet username.
         </p>
         <form id="form">
           <table id="table">
@@ -36,7 +38,7 @@
           </table>
         </form>
         <p id="formStatus"></p>
-        <script src="password.js"></script>
+        <script type="module" src="password.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/recovery/password_reset.html b/src/recovery/password_reset.html
index 97bb9dc..77d9b92 100644
--- a/src/recovery/password_reset.html
+++ b/src/recovery/password_reset.html
@@ -33,7 +33,7 @@
           </table>
         </form>
         <p id="formStatus"></p>
-        <script src="password_reset.js"></script>
+        <script type="module" src="password_reset.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/recovery/password_reset.js b/src/recovery/password_reset.js
index 2483c85..92aa7b8 100644
--- a/src/recovery/password_reset.js
+++ b/src/recovery/password_reset.js
@@ -1,3 +1,5 @@
+import {post_request} from "../js/lib.js";
+
 const form = document.getElementById("form");
 form.addEventListener('submit',  formHandler);
 
@@ -29,27 +31,7 @@ async function formHandler(listener) {
     }
 
     let url = "https://api.account.skynet.ie/ldap/recover/password/auth";
-    let req;
-    try {
-        req = await fetch(url, {
-            method: 'POST',
-            body: JSON.stringify({auth: auth, pass: pass}),
-            mode: "cors"
-        });
-    } catch (e) {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
-        return;
-    }
+    let body = {auth: auth, pass: pass};
 
-    if (req.status !== 200) {
-        form_status.innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
-        return;
-    }
-
-    let data = await req.json();
-    if (data.result === 'error') {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${data.error}</span>`;
-    } else {
-        form_status.innerHTML = "<span style='background-color: green; color: white'>Success</span>";
-    }
+    await post_request(url,  body, form_status);
 }
\ No newline at end of file
diff --git a/src/recovery/ssh-request.html b/src/recovery/ssh-request.html
index c92d092..e693bee 100644
--- a/src/recovery/ssh-request.html
+++ b/src/recovery/ssh-request.html
@@ -36,7 +36,7 @@
           </table>
         </form>
         <p id="formStatus"></p>
-        <script src="ssh-request.js"></script>
+        <script type="module" src="ssh-request.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/recovery/ssh-request.js b/src/recovery/ssh-request.js
index d45b75f..f4d87aa 100644
--- a/src/recovery/ssh-request.js
+++ b/src/recovery/ssh-request.js
@@ -1,3 +1,5 @@
+import {post_request} from "../js/lib.js";
+
 const form = document.getElementById("form");
 form.addEventListener('submit',  formHandler);
 
@@ -13,28 +15,5 @@ async function formHandler(listener) {
     const body = {user: formData.get('user'), email: formData.get('mail')};
 
     let url = 'https://api.account.skynet.ie/ldap/recover/ssh/request';
-    let req;
-
-    try {
-        req = await fetch(url, {
-            method: 'POST',
-            body: JSON.stringify(body),
-            mode: "cors"
-        });
-    } catch (e) {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
-        return;
-    }
-
-    if (req.status !== 200) {
-        form_status.innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
-        return;
-    }
-
-    let temp = await req.json();
-    if (temp.result === 'error') {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${temp.error}</span>`;
-    } else {
-        form_status.innerHTML = "<span style='background-color: green; color: white'>Success</span>";
-    }
+    await post_request(url,  body, form_status);
 }
\ No newline at end of file
diff --git a/src/recovery/username.html b/src/recovery/username.html
index f606ce6..1b85138 100644
--- a/src/recovery/username.html
+++ b/src/recovery/username.html
@@ -31,7 +31,7 @@
           </form>
           <p id="formStatus"></p>
         </div>
-        <script src="username.js"></script>
+        <script type="module" src="username.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/recovery/username.js b/src/recovery/username.js
index 4388658..670daab 100644
--- a/src/recovery/username.js
+++ b/src/recovery/username.js
@@ -1,3 +1,5 @@
+import {post_request} from "../js/lib.js";
+
 const form = document.getElementById("form");
 form.addEventListener('submit',  formHandler);
 
@@ -19,28 +21,5 @@ async function formHandler(listener) {
 
 
     let url = 'https://api.account.skynet.ie/ldap/recover/username';
-    let req;
-
-    try {
-        req = await fetch(url, {
-            method: 'POST',
-            body: JSON.stringify(body),
-            mode: "cors"
-        });
-    } catch (e) {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
-        return;
-    }
-
-    if (req.status !== 200) {
-        form_status.innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
-        return;
-    }
-
-    let temp = await req.json();
-    if (temp.result === 'error') {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${temp.error}</span>`;
-    } else {
-        form_status.innerHTML = "<span style='background-color: green; color: white'>Success</span>";
-    }
+    await post_request(url,  body, form_status);
 }
\ No newline at end of file
diff --git a/src/register.html b/src/register.html
index 6477b0a..ad57474 100644
--- a/src/register.html
+++ b/src/register.html
@@ -43,7 +43,7 @@
           </table>
         </form>
         <p id="formStatus"></p>
-        <script src="register.js"></script>
+        <script type="module" src="register.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/register.js b/src/register.js
index 2e5f9a8..0020250 100644
--- a/src/register.js
+++ b/src/register.js
@@ -1,3 +1,5 @@
+import {post_request} from "./js/lib.js";
+
 const form = document.getElementById("form");
 form.addEventListener('submit',  formHandler);
 
@@ -29,28 +31,5 @@ async function formHandler(listener) {
     const body = {auth: auth, user: user, pass: pass};
 
     let url = 'https://api.account.skynet.ie/ldap/new/account';
-    let req;
-
-    try {
-        req = await fetch(url, {
-            method: 'POST',
-            body: JSON.stringify(body),
-            mode: "cors"
-        });
-    } catch (e) {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
-        return;
-    }
-
-    if (req.status !== 200) {
-        form_status.innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
-        return;
-    }
-
-    let temp = await req.json();
-    if (temp.result === 'error') {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${temp.error}</span>`;
-    } else {
-        form_status.innerHTML = "<span style='background-color: green; color: white'>Success</span>";
-    }
+    await post_request(url,  body, form_status);
 }
\ No newline at end of file
diff --git a/src/signup.html b/src/signup.html
index 35417f1..2242f92 100644
--- a/src/signup.html
+++ b/src/signup.html
@@ -46,7 +46,7 @@
           <input id="button" type="submit" value="Submit"/>
         </form>
         <p id="formStatus"></p>
-        <script src="signup.js"></script>
+        <script type="module" src="signup.js"></script>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/signup.js b/src/signup.js
index fcd3a50..cc14aad 100644
--- a/src/signup.js
+++ b/src/signup.js
@@ -1,3 +1,5 @@
+import {post_request} from "./js/lib.js";
+
 const form = document.getElementById("form");
 form.addEventListener('submit',  formHandler);
 
@@ -17,29 +19,6 @@ async function formHandler(listener) {
 
 
     let url = 'https://api.account.skynet.ie/ldap/new/email';
-    let req;
-
-    try {
-        req = await fetch(url, {
-            method: 'POST',
-            body: JSON.stringify(body),
-            mode: "cors"
-        });
-    } catch (e) {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${e}</span>`;
-        return;
-    }
-
-    if (req.status !== 200) {
-        form_status.innerHTML = "<span style='background-color: red; color: white'>Failure</span>";
-        return;
-    }
-
-    let temp = await req.json();
-    if (temp.result === 'error') {
-        form_status.innerHTML = `<span style='background-color: red; color: white'>${temp.error}</span>`;
-    } else {
-        form_status.innerHTML = "<span style='background-color: green; color: white'>Success</span>";
-    }
+    await post_request(url,  body, form_status);
 
 }
\ No newline at end of file