feat: Add session check functionality to App class and update session…

… status redirects - Added a `session` object to the `App` class with a `check` method to fetch the current session status. - The `check` method sends a GET request to `/sessions/current` and returns the session data or `null` if not authenticated. - Updated `home.ejs`, `login.ejs`, `password-reset.ejs`, `register.ejs`, and `two-factor-authentication.ejs` to handle session status redirects: - Redirects to `/two-factor-authentication` if authenticated but 2FA is not verified. - Redirects to `/login` if not authenticated.
tridecco · Jun 22, 2024 · 9b77cc2 · 9b77cc2
1 parent 3b67cfb
commit 9b77cc2
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 2 deletions.
diff --git a/public/js/app.js b/public/js/app.js
@@ -10,8 +10,36 @@ class App {
    */
   constructor(serverUrl) {
     this.serverUrl = serverUrl;
+    this.session.serverUrl = serverUrl;
   }
 
+  /**
+   * Session object.
+   * @type {object} session
+   */
+  session = {
+    /**
+     * Check the current session.
+     * @returns {Promise<object>} The session data.
+     */
+    async check() {
+      const response = await fetch(`${this.serverUrl}/sessions/current`, {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
+
+      const data = await response.json();
+
+      if (data.status === "success") {
+        return data.data;
+      } else {
+        return null;
+      }
+    },
+  };
+
   /**
    * Display a notification message in an element.
    * @param {string} type - The type of notification.

diff --git a/views/home.ejs b/views/home.ejs
@@ -3,7 +3,19 @@
 
 <head>
     <%- include("./components/head") %>
+    <script src="/js/app.js"></script>
+    <script src="/js/auth.js"></script>
     <title>Tridecco</title>
+    <script>
+        (async () => {
+            const sessionStatus = await app.session.check();
+            if (sessionStatus.authenticated === true && sessionStatus.twoFactorAuthenticated === false) {
+                window.location.href = '/two-factor-authentication';
+            } else if (sessionStatus.authenticated === false) {
+                window.location.href = '/login';
+            }
+        })();
+    </script>
 </head>
 
 <body class="h-full">

diff --git a/views/login.ejs b/views/login.ejs
@@ -6,6 +6,16 @@
     <script src="/js/app.js"></script>
     <script src="/js/auth.js"></script>
     <title>Login</title>
+    <script>
+        (async () => {
+            const sessionStatus = await app.session.check();
+            if (sessionStatus.authenticated === true && sessionStatus.twoFactorAuthenticated === true) {
+                window.location.href = '/';
+            } else if (sessionStatus.authenticated === true) {
+                window.location.href = '/two-factor-authentication';
+            }
+        })();
+    </script>
 </head>
 
 <body class="h-full">

diff --git a/views/password-reset.ejs b/views/password-reset.ejs
@@ -6,6 +6,16 @@
     <script src="/js/app.js"></script>
     <script src="/js/auth.js"></script>
     <title>Password Reset</title>
+    <script>
+        (async () => {
+            const sessionStatus = await app.session.check();
+            if (sessionStatus.authenticated === true && sessionStatus.twoFactorAuthenticated === true) {
+                window.location.href = '/';
+            } else if (sessionStatus.authenticated === true) {
+                window.location.href = '/two-factor-authentication';
+            }
+        })();
+    </script>
 </head>
 
 <body class="h-full">

diff --git a/views/register.ejs b/views/register.ejs
@@ -6,6 +6,16 @@
     <script src="/js/app.js"></script>
     <script src="/js/auth.js"></script>
     <title>Register</title>
+    <script>
+        (async () => {
+            const sessionStatus = await app.session.check();
+            if (sessionStatus.authenticated === true && sessionStatus.twoFactorAuthenticated === true) {
+                window.location.href = '/';
+            } else if (sessionStatus.authenticated === true) {
+                window.location.href = '/two-factor-authentication';
+            }
+        })();
+    </script>
 </head>
 
 <body class="h-full">

diff --git a/views/two-factor-authentication.ejs b/views/two-factor-authentication.ejs
@@ -5,7 +5,17 @@
     <%- include("./components/head") %>
     <script src="/js/app.js"></script>
     <script src="/js/auth.js"></script>
-    <title>Register</title>
+    <title>Two Factor Authentication</title>
+    <script>
+        (async () => {
+            const sessionStatus = await app.session.check();
+            if (sessionStatus.authenticated === true && sessionStatus.twoFactorAuthenticated === true) {
+                window.location.href = '/';
+            } else if (sessionStatus.authenticated === false) {
+                window.location.href = '/login';
+            }
+        })();
+    </script>
 </head>
 
 <body class="h-full">
@@ -53,7 +63,7 @@
     </div>
     <script>
         const auth = new Auth();
-        
+
         const email = localStorage.getItem("userEmail");
 
         const getCodeButton = document.querySelector('#get-code-button');