diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..479993c
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false,
+  "printWidth": 120
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..d1987c7
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,13 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": [
+		
+	]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b92b3ac..65c7960 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
-  }
\ No newline at end of file
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true,
+  "prettier.singleQuote": false
+}
diff --git a/app.js b/app.js
index adc6a7e..57620cb 100644
--- a/app.js
+++ b/app.js
@@ -13,7 +13,7 @@ const buildApp = async (serverOptions) => {
   const app = Fastify(serverOptions);
 
   try {
-    // Register the defaul authc plugins and routes
+    // Register the default authc plugins and routes
     await app
       .register(sqlite3)
       .register(serverkey)
diff --git a/client/admin/dashboardPage.html b/client/admin/dashboardPage.html
index f92384f..4163b13 100644
--- a/client/admin/dashboardPage.html
+++ b/client/admin/dashboardPage.html
@@ -20,16 +20,10 @@
     <div class="flex flex-row">
       <div class="">
         <!-- Left Nav -->
-        <div
-          class="flex flex-col justify-between w-16 h-screen bg-gray-100 border-e"
-        >
+        <div class="flex flex-col justify-between w-16 h-screen bg-gray-100 border-e">
           <div>
-            <div
-              class="inline-flex items-center justify-center w-16 h-16 cursor-pointer"
-            >
-              <span
-                class="grid w-12 h-12 text-xs font-semibold text-white bg-gray-900 rounded-lg place-content-center"
-              >
+            <div class="inline-flex items-center justify-center w-16 h-16 cursor-pointer">
+              <span class="grid w-12 h-12 text-xs font-semibold text-white bg-gray-900 rounded-lg place-content-center">
                 Admin
               </span>
             </div>
@@ -37,10 +31,7 @@
             <div class="border-t border-gray-200">
               <div class="px-2">
                 <div class="py-4">
-                  <a
-                    href=""
-                    class="t group relative flex justify-center rounded bg-blue-50 px-2 py-1.5 text-blue-700"
-                  >
+                  <a href="" class="t group relative flex justify-center rounded bg-blue-50 px-2 py-1.5 text-blue-700">
                     <svg
                       xmlns="http://www.w3.org/2000/svg"
                       fill="none"
@@ -70,9 +61,7 @@
             </div>
           </div>
 
-          <div
-            class="sticky inset-x-0 bottom-0 p-2 bg-gray-100 border-t border-gray-100"
-          >
+          <div class="sticky inset-x-0 bottom-0 p-2 bg-gray-100 border-t border-gray-100">
             <form>
               <button
                 type="submit"
@@ -106,22 +95,14 @@
       </div>
       <div class="">
         <header>
-          <div
-            class="max-w-screen-xl px-4 pt-8 mx-auto sm:px-6 sm:pt-8 lg:px-8"
-          >
+          <div class="max-w-screen-xl px-4 pt-8 mx-auto sm:px-6 sm:pt-8 lg:px-8">
             <div class="sm:flex sm:items-center sm:justify-between">
               <div class="text-center sm:text-left">
-                <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
-                  Admin Panel
-                </h1>
+                <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">Admin Panel</h1>
 
-                <p class="mt-1.5 text-sm text-gray-500">
-                  Manage and oversee your application's user accounts
-                </p>
+                <p class="mt-1.5 text-sm text-gray-500">Manage and oversee your application's user accounts</p>
               </div>
-              <div
-                class="flex flex-col gap-4 mt-4 sm:mt-0 sm:flex-row sm:items-center"
-              >
+              <div class="flex flex-col gap-4 mt-4 sm:mt-0 sm:flex-row sm:items-center">
                 <button
                   class="inline-flex items-center justify-center gap-1.5 rounded-lg border border-gray-200 px-5 py-3 text-gray-500 transition hover:bg-gray-50 hover:text-gray-700 focus:outline-none focus:ring"
                   type="button"
@@ -154,16 +135,10 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                 </button>
               </div>
             </div>
-            <div
-              class="flex flex-row justify-between pt-8 max-w-7xl place-items-center"
-            >
+            <div class="flex flex-row justify-between pt-8 max-w-7xl place-items-center">
               <div class="w-1/4">
                 <div>
-                  <label
-                    for="default-search"
-                    class="mb-2 text-sm font-medium text-gray-900 sr-only"
-                    >Search</label
-                  >
+                  <label for="default-search" class="mb-2 text-sm font-medium text-gray-900 sr-only">Search</label>
                   <div class="relative">
                     <input
                       type="search"
@@ -205,12 +180,8 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
           <div class="py-6 mx-auto max-w-fit sm:px-6 lg:px-8">
             <div class="flex flex-col">
               <div class="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
-                <div
-                  class="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8"
-                >
-                  <div
-                    class="overflow-hidden border-b border-gray-200 shadow sm:rounded-lg"
-                  >
+                <div class="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8">
+                  <div class="overflow-hidden border-b border-gray-200 shadow sm:rounded-lg">
                     <table class="min-w-full divide-y divide-gray-200">
                       <thead class="bg-gray-100">
                         <tr>
@@ -269,51 +240,27 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                           :class="index % 2 ? 'bg-gray-50' : 'bg-white'"
                           @click="toggleEditPanel(user)"
                         >
-                          <td
-                            class="px-6 py-4 text-sm font-medium text-gray-900 whitespace-nowrap"
-                          >
-                            {{ user.id }}
-                          </td>
-                          <td
-                            class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap"
-                          >
-                            {{ user.attributes.name }}
-                          </td>
-                          <td
-                            class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap"
-                          >
-                            {{ user.attributes.email }}
-                          </td>
-                          <td
-                            class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap"
-                          >
+                          <td class="px-6 py-4 text-sm font-medium text-gray-900 whitespace-nowrap">{{ user.id }}</td>
+                          <td class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap">{{ user.attributes.name }}</td>
+                          <td class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap">{{ user.attributes.email }}</td>
+                          <td class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap">
                             <span
                               :class="[
                               'inline-flex', 'items-center', 'rounded-full', 'px-3', 'py-0.5', 'text-sm', 'font-medium',
                               user.attributes.active ? 'text-green-800 bg-green-100' : 'text-red-800 bg-red-100'
                             ]"
                             >
-                              {{ user.attributes.active == 1 ? 'Active (1)' :
-                              'Inactive (0)' }}
+                              {{ user.attributes.active == 1 ? 'Active (1)' : 'Inactive (0)' }}
                             </span>
                           </td>
-                          <td
-                            class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap"
-                          >
+                          <td class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap">
                             {{ user.attributes.created }}
                           </td>
-                          <td
-                            class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap"
-                          >
+                          <td class="px-6 py-4 text-sm text-gray-500 whitespace-nowrap">
                             {{ user.attributes.updated }}
                           </td>
-                          <td
-                            class="px-6 py-4 text-sm font-medium text-right whitespace-nowrap"
-                          >
-                            <a
-                              href="#"
-                              class="underline text-sky-800 hover:text-sky-900"
-                              @click="toggleEditPanel(user)"
+                          <td class="px-6 py-4 text-sm font-medium text-right whitespace-nowrap">
+                            <a href="#" class="underline text-sky-800 hover:text-sky-900" @click="toggleEditPanel(user)"
                               >Edit</a
                             >
                             <a
@@ -350,29 +297,16 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
               v-if="showEditPanel"
             >
               <!-- Background backdrop, show/hide based on slide-over state. -->
-              <div
-                class="fixed inset-0 transition-opacity bg-gray-500 bg-opacity-75"
-              ></div>
+              <div class="fixed inset-0 transition-opacity bg-gray-500 bg-opacity-75"></div>
               <div class="fixed inset-0 overflow-hidden">
                 <div class="absolute inset-0 overflow-hidden">
-                  <div
-                    class="fixed inset-y-0 right-0 flex max-w-full pl-10 pointer-events-none"
-                  >
+                  <div class="fixed inset-y-0 right-0 flex max-w-full pl-10 pointer-events-none">
                     <div class="w-screen max-w-md pointer-events-auto">
-                      <div
-                        class="flex flex-col h-full bg-white divide-y divide-gray-200 shadow-xl"
-                      >
-                        <div
-                          class="flex flex-col flex-1 min-h-0 py-6 overflow-y-scroll"
-                        >
+                      <div class="flex flex-col h-full bg-white divide-y divide-gray-200 shadow-xl">
+                        <div class="flex flex-col flex-1 min-h-0 py-6 overflow-y-scroll">
                           <div class="px-4 sm:px-6">
                             <div class="flex items-start justify-between">
-                              <h2
-                                class="text-lg font-medium text-gray-900"
-                                id="slide-over-title"
-                              >
-                                Details
-                              </h2>
+                              <h2 class="text-lg font-medium text-gray-900" id="slide-over-title">Details</h2>
                               <div class="flex items-center ml-3 h-7">
                                 <button
                                   @click="showEditPanel = !showEditPanel"
@@ -390,11 +324,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                     stroke="currentColor"
                                     aria-hidden="true"
                                   >
-                                    <path
-                                      stroke-linecap="round"
-                                      stroke-linejoin="round"
-                                      d="M6 18L18 6M6 6l12 12"
-                                    />
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                                   </svg>
                                 </button>
                               </div>
@@ -406,9 +336,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                               <form>
                                 <!-- div containing the user's id -->
                                 <div v-if="!showCreateMenu" class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >ID</span
-                                  >
+                                  <span class="font-medium text-gray-700">ID</span>
                                   <input
                                     disabled
                                     type="text"
@@ -418,9 +346,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                 </div>
                                 <!-- div containing the user's name -->
                                 <div class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >Name</span
-                                  >
+                                  <span class="font-medium text-gray-700">Name</span>
                                   <input
                                     type="text"
                                     class="block w-full px-3 py-2 mt-1 text-base text-black placeholder-gray-500 bg-gray-100 border-transparent rounded-md focus:bg-white"
@@ -430,9 +356,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                 </div>
                                 <!-- div containing the user's email -->
                                 <div class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >Email</span
-                                  >
+                                  <span class="font-medium text-gray-700">Email</span>
                                   <input
                                     type="email"
                                     class="block w-full px-3 py-2 mt-1 text-base text-black placeholder-gray-500 bg-gray-100 border-transparent rounded-md focus:bg-white"
@@ -442,9 +366,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                 </div>
                                 <!-- div containing the user's password -->
                                 <div class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >New Password</span
-                                  >
+                                  <span class="font-medium text-gray-700">New Password</span>
                                   <input
                                     type="password"
                                     class="block w-full px-3 py-2 mt-1 text-base text-black placeholder-gray-500 bg-gray-100 border-transparent rounded-md focus:bg-white"
@@ -453,9 +375,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                 </div>
                                 <!-- div containing the user's password -->
                                 <div v-if="showCreateMenu" class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >Confirm Password</span
-                                  >
+                                  <span class="font-medium text-gray-700">Confirm Password</span>
                                   <input
                                     type="password"
                                     class="block w-full px-3 py-2 mt-1 text-base text-black placeholder-gray-500 bg-gray-100 border-transparent rounded-md focus:bg-white"
@@ -464,9 +384,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                 </div>
                                 <!-- div containing the user's active status -->
                                 <div class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >Active</span
-                                  >
+                                  <span class="font-medium text-gray-700">Active</span>
                                   <input
                                     type="number"
                                     min="0"
@@ -479,9 +397,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                 </div>
                                 <!-- div containing the user's created date -->
                                 <div v-if="!showCreateMenu" class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >Created At</span
-                                  >
+                                  <span class="font-medium text-gray-700">Created At</span>
                                   <input
                                     disabled
                                     type="text"
@@ -491,9 +407,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                                 </div>
                                 <!-- div containing the user's updated at date -->
                                 <div v-if="!showCreateMenu" class="mt-3">
-                                  <span class="font-medium text-gray-700"
-                                    >Updated At</span
-                                  >
+                                  <span class="font-medium text-gray-700">Updated At</span>
                                   <input
                                     disabled
                                     type="text"
@@ -531,9 +445,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
 
           <!-- Pagination Area -->
           <paginate class="bg-white shadow-sm">
-            <div
-              class="flex flex-row justify-between px-5 text-sm max-w-8xl place-items-center"
-            >
+            <div class="flex flex-row justify-between px-5 text-sm max-w-8xl place-items-center">
               <div class="flex flex-row ml-4">
                 <select
                   name="pagesize"
@@ -554,12 +466,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                   class="inline-flex items-center justify-center w-8 h-8 text-gray-900 bg-white border border-gray-100 rounded rtl:rotate-180"
                 >
                   <span class="sr-only">Prev Page</span>
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    class="w-3 h-3"
-                    viewBox="0 0 20 20"
-                    fill="currentColor"
-                  >
+                  <svg xmlns="http://www.w3.org/2000/svg" class="w-3 h-3" viewBox="0 0 20 20" fill="currentColor">
                     <path
                       fill-rule="evenodd"
                       d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
@@ -582,12 +489,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                   class="inline-flex items-center justify-center w-8 h-8 text-gray-900 bg-white border border-gray-100 rounded rtl:rotate-180"
                 >
                   <span class="sr-only">Next Page</span>
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    class="w-3 h-3"
-                    viewBox="0 0 20 20"
-                    fill="currentColor"
-                  >
+                  <svg xmlns="http://www.w3.org/2000/svg" class="w-3 h-3" viewBox="0 0 20 20" fill="currentColor">
                     <path
                       fill-rule="evenodd"
                       d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
@@ -623,9 +525,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
             <div class="p-4">
               <div class="flex items-center">
                 <div class="flex justify-between flex-1 w-0">
-                  <p class="flex-1 w-0 text-sm font-medium text-gray-900">
-                    {{ notificationMessage }}
-                  </p>
+                  <p class="flex-1 w-0 text-sm font-medium text-gray-900">{{ notificationMessage }}</p>
                 </div>
                 <div class="flex flex-shrink-0 ml-2">
                   <button
@@ -657,10 +557,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
 
     <!-- Scripts -->
     <script type="module">
-      import {
-        createApp,
-        ref,
-      } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
+      import { createApp, ref } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
 
       createApp({
         setup() {
@@ -909,7 +806,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
                     "Content-type": "application/json",
                     Authorization: `Bearer ${token}`,
                   },
-                },
+                }
               );
               const data = await response.json();
               // If the response is not ok, throw an error
@@ -921,9 +818,7 @@ <h1 class="text-2xl font-bold text-gray-900 sm:text-3xl">
               users.value = data;
 
               // Call the showNotificationMessage function to show a success message
-              showNotificationMessage(
-                `Found ${users.value.data.length} user(s) matching the search.`,
-              );
+              showNotificationMessage(`Found ${users.value.data.length} user(s) matching the search.`);
             } catch (e) {
               console.log("Search User Failed");
               console.log(e);
diff --git a/client/admin/loginAdminPage.html b/client/admin/loginAdminPage.html
index 9be49c8..3d1cfb5 100644
--- a/client/admin/loginAdminPage.html
+++ b/client/admin/loginAdminPage.html
@@ -19,19 +19,9 @@
   </head>
   <body id="app">
     <!-- Alert -->
-    <div
-      v-cloak
-      v-if="showError"
-      role="alert"
-      class="p-4 border-red-500 rounded border-s-4 bg-red-50"
-    >
+    <div v-cloak v-if="showError" role="alert" class="p-4 border-red-500 rounded border-s-4 bg-red-50">
       <div class="flex items-center gap-2 text-red-800">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 24 24"
-          fill="currentColor"
-          class="w-5 h-5"
-        >
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-5 h-5">
           <path
             fill-rule="evenodd"
             d="M9.401 3.003c1.155-2 4.043-2 5.197 0l7.355 12.748c1.154 2-.29 4.5-2.599 4.5H4.645c-2.309 0-3.752-2.5-2.598-4.5L9.4 3.003zM12 8.25a.75.75 0 01.75.75v3.75a.75.75 0 01-1.5 0V9a.75.75 0 01.75-.75zm0 8.25a.75.75 0 100-1.5.75.75 0 000 1.5z"
@@ -47,11 +37,7 @@
     <!-- Form -->
     <div class="max-w-screen-xl px-4 py-16 mx-auto sm:px-6 lg:px-8">
       <div class="max-w-lg mx-auto">
-        <form
-          @submit.prevent
-          action=""
-          class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8"
-        >
+        <form @submit.prevent action="" class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8">
           <div class="flex flex-row text-xl font-semibold">
             <span class="mr-1 -rotate-90">
               <svg
@@ -72,9 +58,7 @@
             Admin Dashboard Login
           </div>
 
-          <p class="my-4 text-lg mx-4text-left">
-            Welcome, sign in with your admin credentials.
-          </p>
+          <p class="my-4 text-lg mx-4text-left">Welcome, sign in with your admin credentials.</p>
 
           <div class="my-4">
             <label for="email" class="sr-only">Email</label>
@@ -88,9 +72,7 @@
                 placeholder="Enter email"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -120,9 +102,7 @@
                 placeholder="Enter password"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -184,19 +164,13 @@
       <div class="m-4 text-xs text-gray-400">
         Powered by
         <span class="underline">
-          <a href="https://github.com/authcompanion/authcompanion2"
-            >AuthCompanion</a
-          >
+          <a href="https://github.com/authcompanion/authcompanion2">AuthCompanion</a>
         </span>
       </div>
     </div>
     <!-- scripts -->
     <script type="module">
-      import {
-        createApp,
-        ref,
-        computed,
-      } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
+      import { createApp, ref, computed } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
 
       createApp({
         setup() {
@@ -225,15 +199,11 @@
                   "content-type": "application/json",
                 },
               });
-              const appOrigin =
-                await response.headers.get("x-authc-app-origin");
+              const appOrigin = await response.headers.get("x-authc-app-origin");
               const resbody = await response.json();
 
               if (response.ok) {
-                window.localStorage.setItem(
-                  "ACCESS_TOKEN",
-                  resbody.data.attributes.access_token,
-                );
+                window.localStorage.setItem("ACCESS_TOKEN", resbody.data.attributes.access_token);
 
                 window.location.href = appOrigin;
               } else {
@@ -247,8 +217,7 @@
               showError.value = true;
 
               errorTitle.value = "Error";
-              errorDetail.value =
-                "There was an issue logging in, please try again";
+              errorDetail.value = "There was an issue logging in, please try again";
             }
           };
 
diff --git a/client/auth/homePage.html b/client/auth/homePage.html
index beacfb4..cf4bbc8 100644
--- a/client/auth/homePage.html
+++ b/client/auth/homePage.html
@@ -20,40 +20,26 @@
     <!-- Form -->
     <div class="max-w-screen-xl px-4 py-16 mx-auto sm:px-6 lg:px-8">
       <div class="max-w-lg mx-auto">
-        <form
-          @submit.prevent
-          action=""
-          class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8"
-        >
+        <form @submit.prevent action="" class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8">
           <p class="text-2xl text-green-500">Success 🎉 !</p>
-          <p class="py-3 text-black">
-            Nice job getting started with AuthCompanion.
-          </p>
+          <p class="py-3 text-black">Nice job getting started with AuthCompanion.</p>
 
           <p class="pt-8 text-black">
-            When you're ready, tell AuthC to redirect users after successful
-            login to your application's home page (instead of this temporary
-            one).
+            When you're ready, tell AuthC to redirect users after successful login to your application's home page
+            (instead of this temporary one).
           </p>
 
           <p class="py-3 text-black">
-            For a full guide on how to integrate and launch AuthCompanion, check
-            those sections in the docs:
-            <a
-              class="text-blue-600 underline hover:text-blue-800"
-              href="https://docs.authcompanion.com/"
+            For a full guide on how to integrate and launch AuthCompanion, check those sections in the docs:
+            <a class="text-blue-600 underline hover:text-blue-800" href="https://docs.authcompanion.com/"
               >https://docs.authcompanion.com/</a
             >
           </p>
 
           <p class="text-black">
-            After a successful login or account registration, AuthC provides
-            developers a user's access token which is used for managing your
-            user's session. The access token contains helpful information about
-            the user.
-            <a
-              class="text-blue-600 underline hover:text-blue-800"
-              :href="jwtDebugUrl"
+            After a successful login or account registration, AuthC provides developers a user's access token which is
+            used for managing your user's session. The access token contains helpful information about the user.
+            <a class="text-blue-600 underline hover:text-blue-800" :href="jwtDebugUrl"
               >Decode the token's payload here to find out.</a
             >
           </p>
@@ -65,19 +51,13 @@
       <div class="m-4 text-xs text-gray-400">
         Powered by
         <span class="underline">
-          <a href="https://github.com/authcompanion/authcompanion2"
-            >AuthCompanion</a
-          >
+          <a href="https://github.com/authcompanion/authcompanion2">AuthCompanion</a>
         </span>
       </div>
     </div>
     <!-- Scripts -->
     <script type="module">
-      import {
-        createApp,
-        ref,
-        computed,
-      } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
+      import { createApp, ref, computed } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
 
       createApp({
         setup() {
diff --git a/client/auth/loginPage.html b/client/auth/loginPage.html
index e462da5..6d6323d 100644
--- a/client/auth/loginPage.html
+++ b/client/auth/loginPage.html
@@ -19,19 +19,9 @@
   </head>
   <body id="app">
     <!-- Alert -->
-    <div
-      v-cloak
-      v-if="showError"
-      role="alert"
-      class="p-4 border-red-500 rounded border-s-4 bg-red-50"
-    >
+    <div v-cloak v-if="showError" role="alert" class="p-4 border-red-500 rounded border-s-4 bg-red-50">
       <div class="flex items-center gap-2 text-red-800">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 24 24"
-          fill="currentColor"
-          class="w-5 h-5"
-        >
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-5 h-5">
           <path
             fill-rule="evenodd"
             d="M9.401 3.003c1.155-2 4.043-2 5.197 0l7.355 12.748c1.154 2-.29 4.5-2.599 4.5H4.645c-2.309 0-3.752-2.5-2.598-4.5L9.4 3.003zM12 8.25a.75.75 0 01.75.75v3.75a.75.75 0 01-1.5 0V9a.75.75 0 01.75-.75zm0 8.25a.75.75 0 100-1.5.75.75 0 000 1.5z"
@@ -47,11 +37,7 @@
     <!-- Form -->
     <div class="max-w-screen-xl px-4 py-16 mx-auto sm:px-6 lg:px-8">
       <div class="max-w-lg mx-auto">
-        <form
-          @submit.prevent
-          action=""
-          class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8"
-        >
+        <form @submit.prevent action="" class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8">
           <div class="flex flex-row text-xl font-semibold">
             <span class="mr-1 -rotate-90">
               <svg
@@ -72,9 +58,7 @@
             Login
           </div>
 
-          <p class="my-4 text-lg font-medium mx-4text-left">
-            Sign in to your account
-          </p>
+          <p class="my-4 text-lg font-medium mx-4text-left">Sign in to your account</p>
 
           <div class="my-4">
             <label for="email" class="sr-only">Email</label>
@@ -88,9 +72,7 @@
                 placeholder="Enter email"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -120,9 +102,7 @@
                 placeholder="Enter password"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -220,19 +200,13 @@
       <div class="m-4 text-xs text-gray-400">
         Powered by
         <span class="underline">
-          <a href="https://github.com/authcompanion/authcompanion2"
-            >AuthCompanion</a
-          >
+          <a href="https://github.com/authcompanion/authcompanion2">AuthCompanion</a>
         </span>
       </div>
     </div>
     <!-- Scripts -->
     <script type="module">
-      import {
-        createApp,
-        ref,
-        computed,
-      } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
+      import { createApp, ref, computed } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
 
       const { startAuthentication } = SimpleWebAuthnBrowser;
 
@@ -263,31 +237,25 @@
                   "content-type": "application/json",
                 },
               });
-              const appOrigin =
-                await response.headers.get("x-authc-app-origin");
+              const appOrigin = await response.headers.get("x-authc-app-origin");
               const resbody = await response.json();
 
               if (response.ok) {
-                window.localStorage.setItem(
-                  "ACCESS_TOKEN",
-                  resbody.data.attributes.access_token,
-                );
+                window.localStorage.setItem("ACCESS_TOKEN", resbody.data.attributes.access_token);
 
                 window.location.href = appOrigin;
               } else {
                 showError.value = true;
 
                 errorTitle.value = "Error";
-                errorDetail.value =
-                  "Login failed, please check your credentials and try again.";
+                errorDetail.value = "Login failed, please check your credentials and try again.";
               }
             } catch (e) {
               console.log(e);
               showError.value = true;
 
               errorTitle.value = "Error";
-              errorDetail.value =
-                "There was an issue connecting, please refresh your browser and try again.";
+              errorDetail.value = "There was an issue connecting, please refresh your browser and try again.";
             }
           };
 
@@ -309,41 +277,32 @@
 
                 let attResp = await startAuthentication(opts);
 
-                let verificationResponse = await fetch(
-                  "/v1/auth/login-verification",
-                  {
-                    method: "POST",
-                    body: JSON.stringify(attResp),
-                    headers: {
-                      "content-type": "application/json",
-                      "x-authc-app-challenge": opts.challenge,
-                    },
+                let verificationResponse = await fetch("/v1/auth/login-verification", {
+                  method: "POST",
+                  body: JSON.stringify(attResp),
+                  headers: {
+                    "content-type": "application/json",
+                    "x-authc-app-challenge": opts.challenge,
                   },
-                );
+                });
                 const reply = await verificationResponse.json();
-                const appOrigin =
-                  await verificationResponse.headers.get("x-authc-app-origin");
+                const appOrigin = await verificationResponse.headers.get("x-authc-app-origin");
 
-                window.localStorage.setItem(
-                  "ACCESS_TOKEN",
-                  reply.data.attributes.access_token,
-                );
+                window.localStorage.setItem("ACCESS_TOKEN", reply.data.attributes.access_token);
                 showError.value = false;
                 window.location.href = appOrigin;
               } else {
                 showError.value = true;
 
                 errorTitle.value = "Error";
-                errorDetail.value =
-                  "There was an issue logging in, please try again";
+                errorDetail.value = "There was an issue logging in, please try again";
               }
             } catch (e) {
               console.log(e);
               showError.value = true;
 
               errorTitle.value = "Error";
-              errorDetail.value =
-                "There was an issue connecting, please refresh your browser and try again.";
+              errorDetail.value = "There was an issue connecting, please refresh your browser and try again.";
             }
           };
 
diff --git a/client/auth/profilePage.html b/client/auth/profilePage.html
index 09346ce..b0740b3 100644
--- a/client/auth/profilePage.html
+++ b/client/auth/profilePage.html
@@ -41,29 +41,17 @@
           />
         </svg>
 
-        <strong
-          class="block font-medium"
-          :class="{ 'text-red-800': isError, 'text-green-800': isSuccess }"
-        >
+        <strong class="block font-medium" :class="{ 'text-red-800': isError, 'text-green-800': isSuccess }">
           {{ errorTitle }}
         </strong>
       </div>
 
-      <p
-        class="mt-2 text-sm"
-        :class="{ 'text-red-800': isError, 'text-green-800': isSuccess }"
-      >
-        {{ errorDetail }}
-      </p>
+      <p class="mt-2 text-sm" :class="{ 'text-red-800': isError, 'text-green-800': isSuccess }">{{ errorDetail }}</p>
     </div>
     <!-- Form -->
     <div class="max-w-screen-xl px-4 py-16 mx-auto sm:px-6 lg:px-8">
       <div class="max-w-lg mx-auto">
-        <form
-          @submit.prevent
-          action=""
-          class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8"
-        >
+        <form @submit.prevent action="" class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8">
           <div class="flex flex-row text-xl font-semibold">
             <span class="mr-1">
               <svg
@@ -84,9 +72,7 @@
             Profile
           </div>
 
-          <p class="my-4 text-lg font-medium mx-4text-left">
-            Update your account
-          </p>
+          <p class="my-4 text-lg font-medium mx-4text-left">Update your account</p>
 
           <div class="my-4">
             <label for="name" class="sr-only">Name</label>
@@ -112,9 +98,7 @@
                 placeholder="Enter email"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -144,9 +128,7 @@
                 placeholder="New password"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -181,9 +163,7 @@
                 v-model="confirmPassword"
                 placeholder="Confirm password"
               />
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -243,19 +223,13 @@
       <div class="m-4 text-xs text-gray-400">
         Powered by
         <span class="underline">
-          <a href="https://github.com/authcompanion/authcompanion2"
-            >AuthCompanion</a
-          >
+          <a href="https://github.com/authcompanion/authcompanion2">AuthCompanion</a>
         </span>
       </div>
     </div>
     <!-- Scripts -->
     <script type="module">
-      import {
-        createApp,
-        ref,
-        computed,
-      } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
+      import { createApp, ref, computed } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
 
       import jwtDecode from "https://cdn.skypack.dev/jwt-decode";
 
@@ -341,24 +315,17 @@
 
                 if (refreshResponse.ok) {
                   const refreshBody = await refreshResponse.json();
-                  window.localStorage.setItem(
-                    "ACCESS_TOKEN",
-                    refreshBody.data.attributes.access_token,
-                  );
+                  window.localStorage.setItem("ACCESS_TOKEN", refreshBody.data.attributes.access_token);
                   const updatedResponse = await updateUser();
 
                   if (updatedResponse.ok) {
                     showError.value = true;
                     errorTitle.value = "Success";
-                    errorDetail.value =
-                      "Your account has been updated, thank you!";
+                    errorDetail.value = "Your account has been updated, thank you!";
                   }
                 }
               } else if (response.ok) {
-                window.localStorage.setItem(
-                  "ACCESS_TOKEN",
-                  webserviceResponse.data.attributes.access_token,
-                );
+                window.localStorage.setItem("ACCESS_TOKEN", webserviceResponse.data.attributes.access_token);
                 showError.value = true;
                 errorTitle.value = "Success";
                 errorDetail.value = "Your account has been updated, thank you!";
@@ -367,8 +334,7 @@
               console.error(error);
               showError.value = true;
               errorTitle.value = "Error";
-              errorDetail.value =
-                "An issue with your account has occurred, please try again";
+              errorDetail.value = "An issue with your account has occurred, please try again";
             }
           };
 
diff --git a/client/auth/recoveryPage.html b/client/auth/recoveryPage.html
index 45e990c..737fc3c 100644
--- a/client/auth/recoveryPage.html
+++ b/client/auth/recoveryPage.html
@@ -19,19 +19,9 @@
   </head>
   <body id="app">
     <!-- Alert -->
-    <div
-      v-cloak
-      v-if="showError"
-      role="alert"
-      class="p-4 border-red-500 rounded border-s-4 bg-red-50"
-    >
+    <div v-cloak v-if="showError" role="alert" class="p-4 border-red-500 rounded border-s-4 bg-red-50">
       <div class="flex items-center gap-2 text-red-800">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 24 24"
-          fill="currentColor"
-          class="w-5 h-5"
-        >
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-5 h-5">
           <path
             fill-rule="evenodd"
             d="M9.401 3.003c1.155-2 4.043-2 5.197 0l7.355 12.748c1.154 2-.29 4.5-2.599 4.5H4.645c-2.309 0-3.752-2.5-2.598-4.5L9.4 3.003zM12 8.25a.75.75 0 01.75.75v3.75a.75.75 0 01-1.5 0V9a.75.75 0 01.75-.75zm0 8.25a.75.75 0 100-1.5.75.75 0 000 1.5z"
@@ -47,11 +37,7 @@
     <!-- Form -->
     <div class="max-w-screen-xl px-4 py-16 mx-auto sm:px-6 lg:px-8">
       <div class="max-w-lg mx-auto">
-        <form
-          @submit.prevent
-          action=""
-          class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8"
-        >
+        <form @submit.prevent action="" class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8">
           <div class="flex flex-row text-xl font-semibold text-gray-700">
             <span class="mr-1">
               <svg
@@ -88,9 +74,7 @@
                 placeholder="Enter email"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -135,20 +119,14 @@
           </button>
 
           <p class="my-4 text-sm text-center text-gray-500">
-            <a class="underline" href="/v1/web/login"
-              >Have an account? Login.</a
-            >
+            <a class="underline" href="/v1/web/login">Have an account? Login.</a>
           </p>
         </form>
       </div>
     </div>
     <!-- Scripts -->
     <script type="module">
-      import {
-        createApp,
-        ref,
-        computed,
-      } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
+      import { createApp, ref, computed } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
 
       createApp({
         setup() {
@@ -184,16 +162,14 @@
 
               if (response.ok) {
                 errorTitle.value = "Success";
-                errorDetail.value =
-                  "A recovery email has been sent to the address provided";
+                errorDetail.value = "A recovery email has been sent to the address provided";
                 showError.value = true;
               }
             } catch (e) {
               showError.value = true;
 
               errorTitle.value = "Error";
-              errorDetail.value =
-                "There was an issue with the request. Please try again later.";
+              errorDetail.value = "There was an issue with the request. Please try again later.";
             }
           };
           // expose to template
diff --git a/client/auth/registrationPage.html b/client/auth/registrationPage.html
index 00f9f82..aebd03a 100644
--- a/client/auth/registrationPage.html
+++ b/client/auth/registrationPage.html
@@ -19,19 +19,9 @@
   </head>
   <body id="app">
     <!-- Alert -->
-    <div
-      v-cloak
-      v-if="showError"
-      role="alert"
-      class="p-4 border-red-500 rounded border-s-4 bg-red-50"
-    >
+    <div v-cloak v-if="showError" role="alert" class="p-4 border-red-500 rounded border-s-4 bg-red-50">
       <div class="flex items-center gap-2 text-red-800">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 24 24"
-          fill="currentColor"
-          class="w-5 h-5"
-        >
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-5 h-5">
           <path
             fill-rule="evenodd"
             d="M9.401 3.003c1.155-2 4.043-2 5.197 0l7.355 12.748c1.154 2-.29 4.5-2.599 4.5H4.645c-2.309 0-3.752-2.5-2.598-4.5L9.4 3.003zM12 8.25a.75.75 0 01.75.75v3.75a.75.75 0 01-1.5 0V9a.75.75 0 01.75-.75zm0 8.25a.75.75 0 100-1.5.75.75 0 000 1.5z"
@@ -47,11 +37,7 @@
     <!-- Form -->
     <div class="max-w-screen-xl px-4 py-16 mx-auto sm:px-6 lg:px-8">
       <div class="max-w-lg mx-auto">
-        <form
-          @submit.prevent
-          action=""
-          class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8"
-        >
+        <form @submit.prevent action="" class="p-4 mt-6 mb-0 rounded-lg shadow-lg sm:p-6 lg:p-8">
           <div class="flex flex-row text-xl font-semibold">
             <span class="mr-1">
               <svg
@@ -72,9 +58,7 @@
             Register
           </div>
 
-          <p class="my-4 text-lg font-medium mx-4text-left">
-            Create an account
-          </p>
+          <p class="my-4 text-lg font-medium mx-4text-left">Create an account</p>
 
           <div class="my-4">
             <label for="name" class="sr-only">Email</label>
@@ -100,9 +84,7 @@
                 placeholder="Enter email"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -132,9 +114,7 @@
                 placeholder="Enter password"
               />
 
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -169,9 +149,7 @@
                 v-model="confirmPassword"
                 placeholder="Confirm password"
               />
-              <span
-                class="absolute inset-y-0 grid px-4 end-0 place-content-center"
-              >
+              <span class="absolute inset-y-0 grid px-4 end-0 place-content-center">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   class="w-4 h-4 text-gray-400"
@@ -252,9 +230,7 @@
           </button>
 
           <p class="my-4 text-sm text-center text-gray-500">
-            <a class="underline" href="/v1/web/login"
-              >Have an account? Login.</a
-            >
+            <a class="underline" href="/v1/web/login">Have an account? Login.</a>
           </p>
         </form>
       </div>
@@ -263,19 +239,13 @@
       <div class="m-4 text-xs text-gray-400">
         Powered by
         <span class="underline">
-          <a href="https://github.com/authcompanion/authcompanion2"
-            >AuthCompanion</a
-          >
+          <a href="https://github.com/authcompanion/authcompanion2">AuthCompanion</a>
         </span>
       </div>
     </div>
     <!-- Scripts -->
     <script type="module">
-      import {
-        createApp,
-        ref,
-        computed,
-      } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
+      import { createApp, ref, computed } from "https://cdn.jsdelivr.net/npm/vue@3.2.45/dist/vue.esm-browser.prod.js";
 
       const { startRegistration } = SimpleWebAuthnBrowser;
       createApp({
@@ -316,15 +286,11 @@
                   "content-type": "application/json",
                 },
               });
-              const appOrigin =
-                await response.headers.get("x-authc-app-origin");
+              const appOrigin = await response.headers.get("x-authc-app-origin");
               const resbody = await response.json();
 
               if (response.ok) {
-                window.localStorage.setItem(
-                  "ACCESS_TOKEN",
-                  resbody.data.attributes.access_token,
-                );
+                window.localStorage.setItem("ACCESS_TOKEN", resbody.data.attributes.access_token);
                 showError.value = false;
 
                 window.location.href = appOrigin;
@@ -332,55 +298,43 @@
                 showError.value = true;
 
                 errorTitle.value = "Error";
-                errorDetail.value =
-                  "An issue occured, please try registering again.";
+                errorDetail.value = "An issue occured, please try registering again.";
               }
             } catch (e) {
               console.log(e);
               showError.value = true;
 
               errorTitle.value = "Error";
-              errorDetail.value =
-                "There was an issue connecting, please refresh your browser and try again.";
+              errorDetail.value = "There was an issue connecting, please refresh your browser and try again.";
             }
           };
 
           const passkeySubmit = async () => {
             try {
-              let optionsResponse = await fetch(
-                "/v1/auth/registration-options",
-                {
-                  method: "GET",
-                  headers: {
-                    "content-type": "application/json",
-                  },
+              let optionsResponse = await fetch("/v1/auth/registration-options", {
+                method: "GET",
+                headers: {
+                  "content-type": "application/json",
                 },
-              );
+              });
 
               if (optionsResponse.ok) {
                 const opts = await optionsResponse.json();
 
                 let attResp = await startRegistration(opts);
 
-                let verificationResponse = await fetch(
-                  "/v1/auth/registration-verification",
-                  {
-                    method: "POST",
-                    body: JSON.stringify(attResp),
-                    headers: {
-                      "content-type": "application/json",
-                      "x-authc-app-userid": opts.user.id,
-                    },
+                let verificationResponse = await fetch("/v1/auth/registration-verification", {
+                  method: "POST",
+                  body: JSON.stringify(attResp),
+                  headers: {
+                    "content-type": "application/json",
+                    "x-authc-app-userid": opts.user.id,
                   },
-                );
+                });
                 const reply = await verificationResponse.json();
-                const appOrigin =
-                  await verificationResponse.headers.get("x-authc-app-origin");
+                const appOrigin = await verificationResponse.headers.get("x-authc-app-origin");
 
-                window.localStorage.setItem(
-                  "ACCESS_TOKEN",
-                  reply.data.attributes.access_token,
-                );
+                window.localStorage.setItem("ACCESS_TOKEN", reply.data.attributes.access_token);
                 showError.value = false;
                 showError.value = false;
                 window.location.href = appOrigin;
@@ -388,16 +342,14 @@
                 showError.value = true;
 
                 errorTitle.value = "Error";
-                errorDetail.value =
-                  "Error occured, please try registering again";
+                errorDetail.value = "Error occured, please try registering again";
               }
             } catch (e) {
               console.log(e);
               showError.value = true;
 
               errorTitle.value = "Error";
-              errorDetail.value =
-                "There was an issue connecting, please refresh your browser and try again.";
+              errorDetail.value = "There was an issue connecting, please refresh your browser and try again.";
             }
           };
           // expose to template
diff --git a/client/dist/main.css b/client/dist/main.css
index eb6ab5e..d3b5749 100644
--- a/client/dist/main.css
+++ b/client/dist/main.css
@@ -143,8 +143,7 @@ code,
 kbd,
 samp,
 pre {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
-    "Liberation Mono", "Courier New", monospace;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
   font-size: 1em;
   /* 2 */
@@ -504,12 +503,9 @@ select:focus {
   --tw-ring-offset-width: 0px;
   --tw-ring-offset-color: #fff;
   --tw-ring-color: #2563eb;
-  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0
-    var(--tw-ring-offset-width) var(--tw-ring-offset-color);
-  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0
-    calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
-  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
-    var(--tw-shadow);
+  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
   border-color: #2563eb;
 }
 
@@ -612,12 +608,9 @@ select {
   --tw-ring-offset-width: 2px;
   --tw-ring-offset-color: #fff;
   --tw-ring-color: #2563eb;
-  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0
-    var(--tw-ring-offset-width) var(--tw-ring-offset-color);
-  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0
-    calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);
-  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
-    var(--tw-shadow);
+  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
 }
 
 [type="checkbox"]:checked,
@@ -1104,36 +1097,31 @@ select {
 
 .-translate-y-1\/2 {
   --tw-translate-y: -50%;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-    rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-    scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+    skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
 .translate-y-0 {
   --tw-translate-y: 0px;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-    rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-    scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+    skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
 .translate-y-2 {
   --tw-translate-y: 0.5rem;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-    rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-    scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+    skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
 .-rotate-90 {
   --tw-rotate: -90deg;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-    rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-    scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+    skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
 .transform {
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-    rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-    scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+    skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
 .cursor-pointer {
@@ -1630,44 +1618,32 @@ select {
 
 .shadow {
   --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
-  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color),
-    0 1px 2px -1px var(--tw-shadow-color);
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000),
-    var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
 .shadow-lg {
-  --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1),
-    0 4px 6px -4px rgb(0 0 0 / 0.1);
-  --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color),
-    0 4px 6px -4px var(--tw-shadow-color);
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000),
-    var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
 .shadow-sm {
   --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
   --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000),
-    var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
 .shadow-xl {
-  --tw-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1),
-    0 8px 10px -6px rgb(0 0 0 / 0.1);
-  --tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color),
-    0 8px 10px -6px var(--tw-shadow-color);
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000),
-    var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  --tw-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color), 0 8px 10px -6px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
 .ring-1 {
-  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0
-    var(--tw-ring-offset-width) var(--tw-ring-offset-color);
-  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0
-    calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
-  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
-    var(--tw-shadow, 0 0 #0000);
+  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 
 .ring-black {
@@ -1692,9 +1668,8 @@ select {
     transform,
     filter,
     -webkit-backdrop-filter;
-  transition-property: color, background-color, border-color,
-    text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter,
-    backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow,
+    transform, filter, backdrop-filter;
   transition-property:
     color,
     background-color,
@@ -1812,21 +1787,15 @@ select {
 }
 
 .focus\:ring:focus {
-  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0
-    var(--tw-ring-offset-width) var(--tw-ring-offset-color);
-  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0
-    calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);
-  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
-    var(--tw-shadow, 0 0 #0000);
+  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 
 .focus\:ring-2:focus {
-  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0
-    var(--tw-ring-offset-width) var(--tw-ring-offset-color);
-  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0
-    calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);
-  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow),
-    var(--tw-shadow, 0 0 #0000);
+  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 
 .focus\:ring-blue-500:focus {
@@ -1861,8 +1830,7 @@ select {
 .disabled\:shadow-none:disabled {
   --tw-shadow: 0 0 #0000;
   --tw-shadow-colored: 0 0 #0000;
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000),
-    var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
 .group:hover .group-hover\:text-indigo-400 {
@@ -1876,9 +1844,8 @@ select {
 
 :is([dir="rtl"] .rtl\:rotate-180) {
   --tw-rotate: 180deg;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-    rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-    scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+    skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
 @media (min-width: 640px) {
@@ -1897,23 +1864,20 @@ select {
 
   .sm\:translate-x-0 {
     --tw-translate-x: 0px;
-    transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-      rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-      scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+    transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+      skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
   }
 
   .sm\:translate-x-2 {
     --tw-translate-x: 0.5rem;
-    transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-      rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-      scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+    transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+      skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
   }
 
   .sm\:translate-y-0 {
     --tw-translate-y: 0px;
-    transform: translate(var(--tw-translate-x), var(--tw-translate-y))
-      rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
-      scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+    transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x))
+      skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
   }
 
   .sm\:flex-row {
diff --git a/config.js b/config.js
index 9903958..dc1a2f8 100644
--- a/config.js
+++ b/config.js
@@ -2,19 +2,19 @@ import * as dotenv from "dotenv";
 dotenv.config();
 
 const config = {
-  AUTHPORT: process.env.PORT || "3002",
+  AUTHPORT: parseInt(process.env.PORT, 10) || 3002,
   ORIGIN: process.env.ORIGIN || "http://localhost:3002",
-  APPLICATIONORIGIN:
-    process.env.APPLICATION_ORIGIN || "http://localhost:3002/v1/web/home",
-  ADMINORIGIN:
-    process.env.ADMIN_ORIGIN || "http://localhost:3002/v1/admin/dashboard",
+  APPLICATIONORIGIN: process.env.APPLICATION_ORIGIN || "http://localhost:3002/v1/web/home",
+  REGISTRATIONORIGIN:
+    process.env.REGISTRATION_ORIGIN || process.env.APPLICATION_ORIGIN || "http://localhost:3002/v1/web/home",
+  ADMINORIGIN: process.env.ADMIN_ORIGIN || "http://localhost:3002/v1/admin/dashboard",
   DBPATH: process.env.DB_PATH || "./authcompanion_users.db",
   KEYPATH: process.env.SERVER_KEY_PATH || "./serverkey",
   ADMINKEYPATH: process.env.ADMIN_KEY_PATH || "./adminkey",
-  RECOVERYURL:
-    process.env.RECOVERY_REDIRECT_URL || "http://localhost:3002/v1/web/profile",
+  SAMESITE: process.env.SAMESITE || "None",
+  RECOVERYURL: process.env.RECOVERY_REDIRECT_URL || "http://localhost:3002/v1/web/profile",
   SMTPHOSTNAME: process.env.SMTP_HOSTNAME || "",
-  SMTPPORT: process.env.SMTP_PORT || "2525",
+  SMTPPORT: parseInt(process.env.SMTP_PORT, 10) || 2525,
   SMTPUSER: process.env.SMTP_USERNAME || "",
   SMTPPASSWORD: process.env.SMTP_PASSWORD || "",
   FROMADDRESS: process.env.FROM_ADDRESS || "no_reply@example.com",
diff --git a/documentation/guide/integrate.md b/documentation/guide/integrate.md
index 141b882..9f38716 100644
--- a/documentation/guide/integrate.md
+++ b/documentation/guide/integrate.md
@@ -54,7 +54,7 @@ export async function importKey() {
         hash: "SHA-256",
       },
       true,
-      ["sign", "verify"],
+      ["sign", "verify"]
     );
     return key;
   } catch (error) {
@@ -193,10 +193,7 @@ async function refreshAccessToken() {
   const refreshBody = await refreshResponse.json();
 
   if (refreshResponse.ok) {
-    localStorage.setItem(
-      "ACCESS_TOKEN",
-      refreshBody.data.attributes.access_token,
-    );
+    localStorage.setItem("ACCESS_TOKEN", refreshBody.data.attributes.access_token);
   }
 
   return refreshResponse.ok;
diff --git a/documentation/reference/adminapi.md b/documentation/reference/adminapi.md
index c790d54..02f305a 100644
--- a/documentation/reference/adminapi.md
+++ b/documentation/reference/adminapi.md
@@ -251,6 +251,7 @@ Description: Your admin user's access token (JWTs) will expire according the exp
 If the request has a valid refresh token AuthCompanion will return a new access token and a new refresh token.
 
 Bearer Token Required: `Authorization: Bearer {admin access token}`
+
 **POST** Request Body:
 
 ```json
@@ -278,4 +279,20 @@ Response:
 }
 ```
 
+Description: This endpoint revokes/invalidates the user's Refresh token, preventing the token from being used to refresh a session.
+
+**DELETE** Request Body:
+
+```json
+{
+  "refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyaWQiOiJ3ejVkY3RvMmJqNW9lb2Q2N2VoajN0dmwiLCJuYW1lIjoiQWRtaW4iLCJlbWFpbCI6ImFkbWluQGxvY2FsaG9zdCIsInVzZXJGaW5nZXJwcmludCI6bnVsbCwic2NvcGUiOiJhZG1pbiIsImlhdCI6MTY5Nzk5MTYyNiwiZXhwIjoxNjk4NTk2NDI2LCJqdGkiOiI0YjVjNmU1Ni1jMzA1LTQ3ZjQtYjEyNC01YzgwMGFjY2Y2YTgifQ.q4U0smkirdBKdsUBQMcszuqg4IXIpM49lHzdE6WEeLE"
+}
+```
+
+Response:
+
+```
+204 (No Content)
+```
+
 ---
diff --git a/documentation/reference/authapi.md b/documentation/reference/authapi.md
index 4d6bec9..8937c4d 100644
--- a/documentation/reference/authapi.md
+++ b/documentation/reference/authapi.md
@@ -204,4 +204,18 @@ Response:
 }
 ```
 
+Description: This endpoint revokes/invalidates the user's Refresh token, preventing the token from being used to refresh a session.
+
+**DELETE** Request Body:
+
+```json
+{}
+```
+
+Response:
+
+```
+204 (No Content)
+```
+
 ---
diff --git a/env.example b/env.example
index 96ad8f2..29744a5 100644
--- a/env.example
+++ b/env.example
@@ -13,13 +13,17 @@ PORT=3002
 ORIGIN=http://localhost:3002
 
 #------------------- Redirects ---------------------#
-## After a successful login or register profile update, 
-## redirect the user to your main application UI using 
+## After a successful login or register profile update,
+## redirect the user to your main application UI using
 ## the supplied URL below.
 APPLICATION_ORIGIN=http://localhost:3002/v1/web/home
 
-## After a successful login or register profile update, 
-## redirect the user to your main application UI using 
+## After successful new registration redirects the user
+## to this URL. If not set uses APPLICATION_ORIGIN.
+#REGISTRATION_ORIGIN=http://localhost:3002/v1/web/home
+
+## After a successful login or register profile update,
+## redirect the user to your main application UI using
 ## the supplied URL below.
 ADMIN_ORIGIN=http://localhost:3002/v1/admin/dashboard
 
@@ -32,12 +36,15 @@ DB_PATH=./authcompanion_users.db
 ## and verify JWTs.
 SERVER_KEY_PATH=./serverkey
 
-## Path to the passwored used to authenticate into the Admin
+## Path to the password used to authenticate into the Admin
 ## API + credentials used for Admin UI login.
 ADMIN_KEY_PATH=./adminkey
 
+## Set the SameSite key for cookies, default to "none".
+#SAMESITE=None
+
 #------------------- Email Options --------------------#
-## URL used in the recovery email to redirect user back 
+## URL used in the recovery email to redirect user back
 ## to the UI for updating their password
 RECOVERY_REDIRECT_URL=http://localhost:3002/v1/web/profile
 
@@ -46,4 +53,4 @@ SMTP_HOSTNAME=
 SMTP_PORT=
 SMTP_USERNAME=
 SMTP_PASSWORD=
-FROM_ADDRESS=
\ No newline at end of file
+FROM_ADDRESS=
diff --git a/plugins/db/db.js b/plugins/db/db.js
index 046c75b..6acbbfa 100644
--- a/plugins/db/db.js
+++ b/plugins/db/db.js
@@ -61,9 +61,7 @@ const dbPlugin = async function (fastify) {
     fastify.log.info(`Using Sqlite3 Database: ${config.DBPATH}`);
   } catch (error) {
     console.log(error);
-    throw new Error(
-      "There was an error setting and connecting up the Database, please try again!",
-    );
+    throw new Error("There was an error setting and connecting up the Database, please try again!");
   }
   //make available the database across the server by calling "db"
   fastify.decorate("db", db);
diff --git a/plugins/key/admin.key.js b/plugins/key/admin.key.js
index 8a513a6..39bc148 100644
--- a/plugins/key/admin.key.js
+++ b/plugins/key/admin.key.js
@@ -18,9 +18,7 @@ const setupAdminKey = async function (fastify) {
     }
 
     //Check if the admin user already exists on server startup
-    const stmt = fastify.db.prepare(
-      "SELECT uuid, name, email, active, created_at, updated_at FROM admin LIMIT 1;",
-    );
+    const stmt = fastify.db.prepare("SELECT uuid, name, email, active, created_at, updated_at FROM admin LIMIT 1;");
     const adminUser = await stmt.get();
 
     if (adminUser) {
@@ -43,22 +41,12 @@ const setupAdminKey = async function (fastify) {
     };
 
     const registerStmt = fastify.db.prepare(
-      "INSERT INTO admin (uuid, name, email, password, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, active, created_at, updated_at;",
-    );
-    const user = registerStmt.get(
-      uuid,
-      userObj.name,
-      userObj.email,
-      hashPwd,
-      1,
-      "",
+      "INSERT INTO admin (uuid, name, email, password, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, active, created_at, updated_at;"
     );
+    const user = registerStmt.get(uuid, userObj.name, userObj.email, hashPwd, 1, "");
 
     //export admin password to a file. Admin password is only exported once on server startup and can be traded for an access token
-    writeFileSync(
-      config.ADMINKEYPATH,
-      `admin email: ${userObj.email} \nadmin password: ${adminPwd}`,
-    );
+    writeFileSync(config.ADMINKEYPATH, `admin email: ${userObj.email} \nadmin password: ${adminPwd}`);
     fastify.log.info(`Generating Admin API Key: ${config.ADMINKEYPATH}...`);
     fastify.log.info(`Admin Email: ${userObj.email} & Password: ${adminPwd}`);
 
diff --git a/plugins/key/server.key.js b/plugins/key/server.key.js
index 6e75585..d08febd 100644
--- a/plugins/key/server.key.js
+++ b/plugins/key/server.key.js
@@ -20,7 +20,7 @@ export async function importKey() {
         hash: "SHA-256",
       },
       true,
-      ["sign", "verify"],
+      ["sign", "verify"]
     );
     return key;
   } catch (error) {
@@ -37,7 +37,7 @@ async function generateAndExportKey() {
         length: 512,
       },
       true,
-      ["sign", "verify"],
+      ["sign", "verify"]
     );
 
     const rawKey = await subtle.exportKey("jwk", key);
diff --git a/routes/admin.routes.js b/routes/admin.routes.js
index 69da1a6..f3ba84a 100644
--- a/routes/admin.routes.js
+++ b/routes/admin.routes.js
@@ -14,58 +14,29 @@ import { updateSchema } from "../services/admin/users/schema/updateSchema.js";
 import { loginHandler } from "../services/admin/users/login.js";
 import { loginSchema } from "../services/admin/users/schema/loginSchema.js";
 
-import { logoutHandler } from "../services/admin/users/logout.js";
-
-import { tokenRefreshHandler } from "../services/admin/users/refresh.js";
+import { tokenRefreshHandler, tokenRefreshDeleteHandler } from "../services/admin/users/refresh.js";
 import { refreshSchema } from "../services/admin/users/schema/refreshSchema.js";
 
-import {
-  authenticateAdminRequest,
-  authenticateWebAdminRequest,
-} from "../utils/authenticate.js";
+import { authenticateAdminRequest, authenticateWebAdminRequest } from "../utils/authenticate.js";
 
 const adminRoutes = async function (fastify, options) {
   //admin API routes
-  fastify.post(
-    "/users",
-    { onRequest: [authenticateAdminRequest], ...createSchema },
-    createUserHandler,
-  );
-  fastify.get(
-    "/users",
-    { onRequest: [authenticateAdminRequest], ...listUsersSchema },
-    listUsersHandler,
-  );
-  fastify.delete(
-    "/users/:uuid",
-    { onRequest: [authenticateAdminRequest] },
-    deleteUserHandler,
-  );
-  fastify.patch(
-    "/users/:uuid",
-    { onRequest: [authenticateAdminRequest], ...updateSchema },
-    updateUserHandler,
-  );
+  fastify.post("/users", { onRequest: [authenticateAdminRequest], ...createSchema }, createUserHandler);
+  fastify.get("/users", { onRequest: [authenticateAdminRequest], ...listUsersSchema }, listUsersHandler);
+  fastify.delete("/users/:uuid", { onRequest: [authenticateAdminRequest] }, deleteUserHandler);
+  fastify.patch("/users/:uuid", { onRequest: [authenticateAdminRequest], ...updateSchema }, updateUserHandler);
   fastify.post("/login", loginSchema, loginHandler);
-  fastify.get(
-    "/logout",
-    { onRequest: [authenticateAdminRequest] },
-    logoutHandler,
-  );
   fastify.post("/refresh", refreshSchema, tokenRefreshHandler);
+  fastify.delete("/refresh", refreshSchema, tokenRefreshDeleteHandler);
 
   //admin web user interface routes
-  fastify.get(
-    "/dashboard",
-    { onRequest: [authenticateWebAdminRequest] },
-    (request, reply) => {
-      const adminPage = readFileSync("./client/admin/dashboardPage.html");
-      reply.headers({
-        "Content-Type": `text/html`,
-      });
-      return adminPage;
-    },
-  );
+  fastify.get("/dashboard", { onRequest: [authenticateWebAdminRequest] }, (request, reply) => {
+    const adminPage = readFileSync("./client/admin/dashboardPage.html");
+    reply.headers({
+      "Content-Type": `text/html`,
+    });
+    return adminPage;
+  });
 
   //login page for the admin web user interface
   fastify.get("/login", (request, reply) => {
diff --git a/routes/auth.routes.js b/routes/auth.routes.js
index 0574514..b8d321a 100644
--- a/routes/auth.routes.js
+++ b/routes/auth.routes.js
@@ -10,7 +10,7 @@ import { userProfileHandler } from "../services/auth/profile.js";
 import { profileRecoverySchema } from "../services/auth/schemas/profileRecoverySchema.js";
 import { profileRecoveryHandler } from "../services/auth/recovery.js";
 
-import { tokenRefreshHandler } from "../services/auth/refresh.js";
+import { tokenRefreshDeleteHandler, tokenRefreshHandler } from "../services/auth/refresh.js";
 import { refreshSchema } from "../services/auth/schemas/refreshSchema.js";
 
 import { registrationOptionsHandler } from "../services/webAuthn/registrationOptions.js";
@@ -27,27 +27,16 @@ const authRoutes = async function (fastify, options) {
   //authentication API routes
   fastify.post("/register", registrationSchema, registrationHandler);
   fastify.post("/login", loginSchema, loginHandler);
-  fastify.post(
-    "/users/me",
-    { onRequest: [authenticateAuthRequest], ...userProfileSchema },
-    userProfileHandler,
-  );
+  fastify.post("/users/me", { onRequest: [authenticateAuthRequest], ...userProfileSchema }, userProfileHandler);
   fastify.post("/recovery", profileRecoverySchema, profileRecoveryHandler);
   fastify.post("/refresh", refreshSchema, tokenRefreshHandler);
+  fastify.delete("/refresh", refreshSchema, tokenRefreshDeleteHandler);
 
   //webAuthn API routes
   fastify.get("/registration-options", registrationOptionsHandler);
-  fastify.post(
-    "/registration-verification",
-    registerVerificationSchema,
-    registrationVerificationHandler,
-  );
+  fastify.post("/registration-verification", registerVerificationSchema, registrationVerificationHandler);
   fastify.get("/login-options", loginOptionsHandler);
-  fastify.post(
-    "/login-verification",
-    loginVerificationSchema,
-    loginVerificationHandler,
-  );
+  fastify.post("/login-verification", loginVerificationSchema, loginVerificationHandler);
 };
 
 export default authRoutes;
diff --git a/routes/ui.routes.js b/routes/ui.routes.js
index 49ec861..49b0e0a 100644
--- a/routes/ui.routes.js
+++ b/routes/ui.routes.js
@@ -14,9 +14,7 @@ const webRoutes = async function (fastify, options) {
   });
   fastify.get("/register", (request, reply) => {
     //create session id for tracking webauthn challenges used for verification. Send session id as cookie
-    const registrationPage = readFileSync(
-      "./client/auth/registrationPage.html",
-    );
+    const registrationPage = readFileSync("./client/auth/registrationPage.html");
     reply.headers({
       "Content-Type": `text/html`,
     });
diff --git a/services/admin/users/create.js b/services/admin/users/create.js
index 2ac4988..bd9b37c 100644
--- a/services/admin/users/create.js
+++ b/services/admin/users/create.js
@@ -6,9 +6,7 @@ export const createUserHandler = async function (request, reply) {
   try {
     //Check the request's type attibute is set to users
     if (request.body.data.type !== "users") {
-      request.log.info(
-        "Admin API: The request's type is not set to Users, creation failed",
-      );
+      request.log.info("Admin API: The request's type is not set to Users, creation failed");
       throw { statusCode: 400, message: "Invalid Type Attribute" };
     }
 
@@ -17,34 +15,24 @@ export const createUserHandler = async function (request, reply) {
     const duplicateAccount = await stmt.get(request.body.data.attributes.email);
 
     if (duplicateAccount) {
-      request.log.info(
-        "Admin API: User's email already exists in database, creation failed",
-      );
+      request.log.info("Admin API: User's email already exists in database, creation failed");
       throw { statusCode: 400, message: "Duplicate Email Address Exists" };
     }
 
     //If the user's active status is a string, convert it to a number
     if (request.body.data.attributes.active) {
       if (typeof request.body.data.attributes.active === "string") {
-        request.body.data.attributes.active = Number(
-          request.body.data.attributes.active,
-        );
+        request.body.data.attributes.active = Number(request.body.data.attributes.active);
       }
     }
 
     //Check if the user's active status is being updated and if it is, check if the new status is a valid 1 or 0
     if (request.body.data.attributes.active) {
-      if (
-        request.body.data.attributes.active !== 0 &&
-        request.body.data.attributes.active !== 1
-      ) {
-        request.log.info(
-          "Admin API: User's active status is not valid, update failed",
-        );
+      if (request.body.data.attributes.active !== 0 && request.body.data.attributes.active !== 1) {
+        request.log.info("Admin API: User's active status is not valid, update failed");
         throw {
           statusCode: 400,
-          message:
-            "Invalid Active Status, Please use 1 for true and 0 for false",
+          message: "Invalid Active Status, Please use 1 for true and 0 for false",
         };
       }
     }
@@ -55,7 +43,7 @@ export const createUserHandler = async function (request, reply) {
     const jwtid = randomUUID();
 
     const registerStmt = this.db.prepare(
-      "INSERT INTO users (uuid, name, email, password, metadata, appdata, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, metadata, appdata, active, created_at, updated_at;",
+      "INSERT INTO users (uuid, name, email, password, metadata, appdata, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, metadata, appdata, active, created_at, updated_at;"
     );
     const user = registerStmt.get(
       uuid,
@@ -65,7 +53,7 @@ export const createUserHandler = async function (request, reply) {
       JSON.stringify(request.body.data.attributes.metadata),
       JSON.stringify(request.body.data.attributes.app),
       request.body.data.attributes.active,
-      jwtid,
+      jwtid
     );
     //Prepare the server response
     const userAttributes = {
diff --git a/services/admin/users/delete.js b/services/admin/users/delete.js
index fd2dcbc..df86582 100644
--- a/services/admin/users/delete.js
+++ b/services/admin/users/delete.js
@@ -5,17 +5,13 @@ export const deleteUserHandler = async function (request, reply) {
     const user = await userstmt.get(request.params.uuid);
 
     if (!user) {
-      request.log.info(
-        "Admin API: User does not exist in database, delete failed",
-      );
+      request.log.info("Admin API: User does not exist in database, delete failed");
       throw { statusCode: 404, message: "User Not Found" };
     }
 
     //check if the user's uuid is equal to the admin this.registeredAdminUser.uuid (the admin user cannot be deleted)
     if (user.uuid === this.registeredAdminUser.uuid) {
-      request.log.info(
-        "Admin API: Admin user cannot be deleted, delete failed",
-      );
+      request.log.info("Admin API: Admin user cannot be deleted, delete failed");
       throw { statusCode: 400, message: "Admin User Cannot Be Deleted" };
     }
 
diff --git a/services/admin/users/list.js b/services/admin/users/list.js
index c9962eb..41902da 100644
--- a/services/admin/users/list.js
+++ b/services/admin/users/list.js
@@ -1,10 +1,6 @@
 export const listUsersHandler = async function (request, reply) {
   try {
-    const {
-      "page[number]": pageNumber = 1,
-      "page[size]": pageSize = 10,
-      "search[email]": searchEmail,
-    } = request.query;
+    const { "page[number]": pageNumber = 1, "page[size]": pageSize = 10, "search[email]": searchEmail } = request.query;
 
     // Convert the page number and size to integers
     const page = parseInt(pageNumber);
@@ -14,8 +10,7 @@ export const listUsersHandler = async function (request, reply) {
     const offset = (page - 1) * size;
 
     // Prepare the SQL query and parameters
-    let query =
-      "SELECT uuid, name, email, metadata, appdata, active, created_at, updated_at FROM users";
+    let query = "SELECT uuid, name, email, metadata, appdata, active, created_at, updated_at FROM users";
     let params = [];
 
     if (searchEmail) {
@@ -55,9 +50,7 @@ export const listUsersHandler = async function (request, reply) {
     }
 
     const countStmt = this.db.prepare(countQuery);
-    const totalCount = await countStmt.get(
-      ...(searchEmail ? [`%${searchEmail}%`] : []),
-    ); // Spread the searchEmail param if provided
+    const totalCount = await countStmt.get(...(searchEmail ? [`%${searchEmail}%`] : [])); // Spread the searchEmail param if provided
 
     // Calculate pagination metadata
     const totalPages = Math.ceil(totalCount.count / size);
@@ -68,24 +61,16 @@ export const listUsersHandler = async function (request, reply) {
     const paginationLinks = {};
 
     if (hasNextPage) {
-      paginationLinks.next = `${request.raw.url.split("?")[0]}?page[number]=${
-        page + 1
-      }&page[size]=${size}`;
+      paginationLinks.next = `${request.raw.url.split("?")[0]}?page[number]=${page + 1}&page[size]=${size}`;
     }
 
     if (hasPreviousPage) {
-      paginationLinks.prev = `${request.raw.url.split("?")[0]}?page[number]=${
-        page - 1
-      }&page[size]=${size}`;
+      paginationLinks.prev = `${request.raw.url.split("?")[0]}?page[number]=${page - 1}&page[size]=${size}`;
     }
 
     if (totalPages > 0) {
-      paginationLinks.first = `${
-        request.raw.url.split("?")[0]
-      }?page[number]=1&page[size]=${size}`;
-      paginationLinks.last = `${
-        request.raw.url.split("?")[0]
-      }?page[number]=${totalPages}&page[size]=${size}`;
+      paginationLinks.first = `${request.raw.url.split("?")[0]}?page[number]=1&page[size]=${size}`;
+      paginationLinks.last = `${request.raw.url.split("?")[0]}?page[number]=${totalPages}&page[size]=${size}`;
     }
 
     // Send the server reply
diff --git a/services/admin/users/login.js b/services/admin/users/login.js
index 97ddaf4..267c875 100644
--- a/services/admin/users/login.js
+++ b/services/admin/users/login.js
@@ -6,23 +6,19 @@ export const loginHandler = async function (request, reply) {
   try {
     // Check the request's type attibute is set to users
     if (request.body.data.type !== "users") {
-      request.log.info(
-        "Auth API: The request's type is not set to Users, creation failed",
-      );
+      request.log.info("Auth API: The request's type is not set to Users, creation failed");
       throw { statusCode: 400, message: "Invalid Type Attribute" };
     }
 
     // Fetch the registered admin user from the database
     const stmt = this.db.prepare(
-      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at FROM admin WHERE email = ?;",
+      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at FROM admin WHERE email = ?;"
     );
     const userObj = await stmt.get(request.body.data.attributes.email);
 
     // Check if admin user does not exist in the database
     if (!userObj) {
-      request.log.info(
-        "Auth API: User does not exist in database, login failed",
-      );
+      request.log.info("Auth API: User does not exist in database, login failed");
       throw { statusCode: 400, message: "Login Failed" };
     }
 
@@ -32,10 +28,7 @@ export const loginHandler = async function (request, reply) {
       throw { statusCode: 400, message: "Login Failed" };
     }
 
-    const passwordCheckResult = await verifyValueWithHash(
-      request.body.data.attributes.password,
-      userObj.password,
-    );
+    const passwordCheckResult = await verifyValueWithHash(request.body.data.attributes.password, userObj.password);
 
     // Check if user has the correct password
     if (!passwordCheckResult) {
diff --git a/services/admin/users/logout.js b/services/admin/users/logout.js
deleted file mode 100644
index d3c44d2..0000000
--- a/services/admin/users/logout.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import config from "../../../config.js";
-
-export const logoutHandler = async function (request, reply) {
-  try {
-    const jwtPayload = request.jwtRequestPayload;
-    const userId = jwtPayload.userid;
-
-    //Check if the user exists in the database
-    const stmt = this.db.prepare("UPDATE admin SET jwt_id = 0 WHERE uuid = ?;");
-    const result = await stmt.run(userId);
-
-    reply.headers({
-      "x-authc-app-origin": config.ADMINORIGIN,
-    });
-
-    return {
-      logout: true,
-    };
-  } catch (err) {
-    throw { statusCode: err.statusCode, message: "Server Error" };
-  }
-};
diff --git a/services/admin/users/refresh.js b/services/admin/users/refresh.js
index 531bc95..36b0cfb 100644
--- a/services/admin/users/refresh.js
+++ b/services/admin/users/refresh.js
@@ -1,8 +1,4 @@
-import {
-  makeAdminToken,
-  makeAdminRefreshtoken,
-  validateJWT,
-} from "../../../utils/jwt.js";
+import { makeAdminToken, makeAdminRefreshtoken, validateJWT } from "../../../utils/jwt.js";
 import config from "../../../config.js";
 
 export const tokenRefreshHandler = async function (request, reply) {
@@ -13,12 +9,11 @@ export const tokenRefreshHandler = async function (request, reply) {
       refreshToken = request.body.refreshToken;
     } else {
       request.log.info(
-        "Admin API: The request does not include a refresh token in the request body, refresh token failed",
+        "Admin API: The request does not include a refresh token in the request body, refresh token failed"
       );
       throw {
         statusCode: 400,
-        message:
-          "The request does not include a refresh token in the request body.",
+        message: "The request does not include a refresh token in the request body.",
       };
     }
 
@@ -27,15 +22,13 @@ export const tokenRefreshHandler = async function (request, reply) {
 
     // Fetch the registered admin user from the database
     const stmt = this.db.prepare(
-      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at FROM admin WHERE uuid = ?;",
+      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at FROM admin WHERE uuid = ?;"
     );
     const userObj = await stmt.get(jwtClaims.userid);
 
     // Check if the "jiti" value in the JWT payload matches the admin's "jwt_id"
     if (jwtClaims.jti !== userObj.jwt_id) {
-      request.log.info(
-        "Admin API: JWT jiti value does not match the admin's jwt_id",
-      );
+      request.log.info("Admin API: JWT jiti value does not match the admin's jwt_id");
       throw {
         statusCode: 401,
         message: "Server Error",
@@ -72,3 +65,44 @@ export const tokenRefreshHandler = async function (request, reply) {
     throw { statusCode: err.statusCode, message: err.message };
   }
 };
+
+export const tokenRefreshDeleteHandler = async function (request, reply) {
+  try {
+    let refreshToken = "";
+    // Check if the request body contains a refresh token
+    if (request.body && request.body.refreshToken) {
+      refreshToken = request.body.refreshToken;
+    } else {
+      request.log.info(
+        "Admin API: The request does not include a refresh token in the request body, refresh token failed"
+      );
+      throw {
+        statusCode: 400,
+        message: "The request does not include a refresh token in the request body.",
+      };
+    }
+
+    //Validate the refresh token
+    const jwtClaims = await validateJWT(refreshToken, this.key);
+    //Fetch user from Database
+    const stmt = this.db.prepare(
+      "SELECT uuid, name, email, jwt_id, created_at, updated_at FROM admin WHERE jwt_id = ?;"
+    );
+    const userObj = await stmt.get(jwtClaims.jti);
+    if (userObj === undefined) {
+      request.log.info("Admin API: User not found");
+      throw { statusCode: 400, message: "Refresh Token Failed" };
+    }
+
+    const delStmt = this.db.prepare("UPDATE admin SET jwt_id = 0 WHERE jwt_id = ?");
+    const resp = await delStmt.run(jwtClaims.jti);
+    if (resp.changes !== 1) {
+      request.log.info("Error deleting token id");
+      throw { statusCode: 500, message: "Internal Error" };
+    }
+
+    reply.code(204);
+  } catch (err) {
+    throw { statusCode: err.statusCode, message: err.message };
+  }
+};
diff --git a/services/admin/users/update.js b/services/admin/users/update.js
index 3056506..64eb56e 100644
--- a/services/admin/users/update.js
+++ b/services/admin/users/update.js
@@ -4,9 +4,7 @@ export const updateUserHandler = async function (request, reply) {
   try {
     //Check the request's type attibute is set to users
     if (request.body.data.type !== "users") {
-      request.log.info(
-        "Admin API: The request's type is not set to Users, update failed",
-      );
+      request.log.info("Admin API: The request's type is not set to Users, update failed");
       throw { statusCode: 400, message: "Invalid Type Attribute" };
     }
 
@@ -15,24 +13,17 @@ export const updateUserHandler = async function (request, reply) {
     const user = await userStmt.get(request.params.uuid);
 
     if (!user) {
-      request.log.info(
-        "Admin API: User does not exist in database, update failed",
-      );
+      request.log.info("Admin API: User does not exist in database, update failed");
       throw { statusCode: 404, message: "User Not Found" };
     }
 
     //Check if the user's email is being updated and if its not the same email as the user's current email, check if the new email is already in use
-    if (
-      request.body.data.attributes.email &&
-      request.body.data.attributes.email !== user.email
-    ) {
+    if (request.body.data.attributes.email && request.body.data.attributes.email !== user.email) {
       const emailStmt = this.db.prepare("SELECT * FROM users WHERE email = ?;");
       const email = await emailStmt.get(request.body.data.attributes.email);
 
       if (email) {
-        request.log.info(
-          "Admin API: User's email is already in use, update failed",
-        );
+        request.log.info("Admin API: User's email is already in use, update failed");
         throw { statusCode: 400, message: "Email Already In Use" };
       }
     }
@@ -46,32 +37,24 @@ export const updateUserHandler = async function (request, reply) {
     //If the user's active status is a string, convert it to a number
     if (request.body.data.attributes.active) {
       if (typeof request.body.data.attributes.active === "string") {
-        request.body.data.attributes.active = Number(
-          request.body.data.attributes.active,
-        );
+        request.body.data.attributes.active = Number(request.body.data.attributes.active);
       }
     }
 
     //Check if the user's active status is being updated and if it is, check if the new status is a valid 1 or 0
     if (request.body.data.attributes.active) {
-      if (
-        request.body.data.attributes.active !== 0 &&
-        request.body.data.attributes.active !== 1
-      ) {
-        request.log.info(
-          "Admin API: User's active status is not valid, update failed",
-        );
+      if (request.body.data.attributes.active !== 0 && request.body.data.attributes.active !== 1) {
+        request.log.info("Admin API: User's active status is not valid, update failed");
         throw {
           statusCode: 400,
-          message:
-            "Invalid Active Status, Please use 1 for true and 0 for false",
+          message: "Invalid Active Status, Please use 1 for true and 0 for false",
         };
       }
     }
 
     //Per json-api spec: If a request does not include all of the attributes for a resource, the server MUST interpret the missing attributes as if they were included with their current values. The server MUST NOT interpret missing attributes as null values.
     const updateStmt = this.db.prepare(
-      "UPDATE users SET name = coalesce(?, name), email = coalesce(?, email), password = coalesce(?, password), metadata = coalesce(?, metadata), appdata = coalesce(?, appdata), active = coalesce(?, active), updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ? RETURNING uuid, name, email, metadata, appdata, active, created_at, updated_at;",
+      "UPDATE users SET name = coalesce(?, name), email = coalesce(?, email), password = coalesce(?, password), metadata = coalesce(?, metadata), appdata = coalesce(?, appdata), active = coalesce(?, active), updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ? RETURNING uuid, name, email, metadata, appdata, active, created_at, updated_at;"
     );
     const updatedUser = updateStmt.get(
       request.body.data.attributes.name,
@@ -80,7 +63,7 @@ export const updateUserHandler = async function (request, reply) {
       JSON.stringify(request.body.data.attributes.metadata),
       JSON.stringify(request.body.data.attributes.app),
       request.body.data.attributes.active,
-      request.params.uuid,
+      request.params.uuid
     );
 
     //Prepare the server response
diff --git a/services/auth/login.js b/services/auth/login.js
index b7c82df..d4ea516 100644
--- a/services/auth/login.js
+++ b/services/auth/login.js
@@ -1,4 +1,4 @@
-import { verifyValueWithHash } from "../../utils/credential.js";
+import { verifyValueWithHash, secureCookie } from "../../utils/credential.js";
 import { makeAccesstoken, makeRefreshtoken } from "../../utils/jwt.js";
 import config from "../../config.js";
 
@@ -6,23 +6,19 @@ export const loginHandler = async function (request, reply) {
   try {
     // Check the request's type attibute is set to users
     if (request.body.data.type !== "users") {
-      request.log.info(
-        "Auth API: The request's type is not set to Users, creation failed",
-      );
+      request.log.info("Auth API: The request's type is not set to Users, creation failed");
       throw { statusCode: 400, message: "Invalid Type Attribute" };
     }
 
     // Fetch user from database
     const stmt = this.db.prepare(
-      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at, metadata, appdata FROM users WHERE email = ?;",
+      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at, metadata, appdata FROM users WHERE email = ?;"
     );
     const userObj = await stmt.get(request.body.data.attributes.email);
 
     // Check if user does not exist in the database
     if (!userObj) {
-      request.log.info(
-        "Auth API: User does not exist in database, login failed",
-      );
+      request.log.info("Auth API: User does not exist in database, login failed");
       throw { statusCode: 400, message: "Login Failed" };
     }
 
@@ -32,10 +28,7 @@ export const loginHandler = async function (request, reply) {
       throw { statusCode: 400, message: "Login Failed" };
     }
 
-    const passwordCheckResult = await verifyValueWithHash(
-      request.body.data.attributes.password,
-      userObj.password,
-    );
+    const passwordCheckResult = await verifyValueWithHash(request.body.data.attributes.password, userObj.password);
 
     // Check if user has the correct password
     if (!passwordCheckResult) {
@@ -59,8 +52,12 @@ export const loginHandler = async function (request, reply) {
 
     reply.headers({
       "set-cookie": [
-        `userRefreshToken=${userRefreshToken.token}; Path=/; Expires=${expireDate}; SameSite=None; Secure; HttpOnly`,
-        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=None; Secure; HttpOnly`,
+        `userRefreshToken=${userRefreshToken.token}; Path=/; Expires=${expireDate}; SameSite=${
+          config.SAMESITE
+        }; HttpOnly; ${secureCookie()}`,
+        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=${
+          config.SAMESITE
+        }; HttpOnly; ${secureCookie()}`,
       ],
       "x-authc-app-origin": config.APPLICATIONORIGIN,
     });
diff --git a/services/auth/profile.js b/services/auth/profile.js
index 74aec84..3918d45 100644
--- a/services/auth/profile.js
+++ b/services/auth/profile.js
@@ -1,4 +1,4 @@
-import { createHash } from "../../utils/credential.js";
+import { createHash, secureCookie } from "../../utils/credential.js";
 import { makeAccesstoken, makeRefreshtoken } from "../../utils/jwt.js";
 import config from "../../config.js";
 
@@ -6,9 +6,7 @@ export const userProfileHandler = async function (request, reply) {
   try {
     //Check the request's type attibute is set to users
     if (request.body.data.type !== "users") {
-      request.log.info(
-        "Auth API: The request's type is not set to Users, update failed",
-      );
+      request.log.info("Auth API: The request's type is not set to Users, update failed");
       throw { statusCode: 400, message: "Invalid Type Attribute" };
     }
 
@@ -18,9 +16,7 @@ export const userProfileHandler = async function (request, reply) {
 
     //Check if the user exists already
     if (!user) {
-      request.log.info(
-        "Auth API: User does not exist in database, update failed",
-      );
+      request.log.info("Auth API: User does not exist in database, update failed");
       throw { statusCode: 400, message: "Profile Update Failed" };
     }
 
@@ -32,14 +28,14 @@ export const userProfileHandler = async function (request, reply) {
 
     //Per json-api spec: If a request does not include all of the attributes for a resource, the server MUST interpret the missing attributes as if they were included with their current values. The server MUST NOT interpret missing attributes as null values.
     const updateStmt = this.db.prepare(
-      "UPDATE users SET name = coalesce(?, name), email = coalesce(?, email), password = coalesce(?, password), metadata = coalesce(?, metadata), updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ? RETURNING uuid, name, email, metadata, appdata, jwt_id, active, created_at, updated_at;",
+      "UPDATE users SET name = coalesce(?, name), email = coalesce(?, email), password = coalesce(?, password), metadata = coalesce(?, metadata), updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ? RETURNING uuid, name, email, metadata, appdata, jwt_id, active, created_at, updated_at;"
     );
     const userObj = updateStmt.get(
       request.body.data.attributes.name,
       request.body.data.attributes.email,
       request.body.data.attributes.password,
       JSON.stringify(request.body.data.attributes.metadata),
-      request.jwtRequestPayload.userid,
+      request.jwtRequestPayload.userid
     );
 
     //Prepare the reply
@@ -59,8 +55,12 @@ export const userProfileHandler = async function (request, reply) {
 
     reply.headers({
       "set-cookie": [
-        `userRefreshToken=${userRefreshToken.token}; Path=/; Expires=${expireDate}; SameSite=None; Secure; HttpOnly`,
-        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=None; Secure; HttpOnly`,
+        `userRefreshToken=${userRefreshToken.token}; Path=/; Expires=${expireDate}; SameSite=${
+          config.SAMESITE
+        }; HttpOnly; ${secureCookie()}`,
+        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=${
+          config.SAMESITE
+        }; HttpOnly; ${secureCookie()}`,
       ],
       "x-authc-app-origin": config.APPLICATIONORIGIN,
     });
diff --git a/services/auth/recovery.js b/services/auth/recovery.js
index d9ba9ef..69dfd8e 100644
--- a/services/auth/recovery.js
+++ b/services/auth/recovery.js
@@ -19,13 +19,9 @@ export const profileRecoveryHandler = async function (request, reply) {
 
     //Check if the user exists in the database, before issuing recovery token
     if (!userObj) {
-      request.log.info(
-        "User was not found in the Database - Profile Recovery failed",
-      );
+      request.log.info("User was not found in the Database - Profile Recovery failed");
       // send a request to the client
-      reply
-        .code(200)
-        .send({ statusCode: 200, message: "Recovery email issued" });
+      reply.code(200).send({ statusCode: 200, message: "Recovery email issued" });
     }
 
     //Prepare & send the recovery email
diff --git a/services/auth/refresh.js b/services/auth/refresh.js
index bc0eb1d..f7d4054 100644
--- a/services/auth/refresh.js
+++ b/services/auth/refresh.js
@@ -1,10 +1,7 @@
-import {
-  makeAccesstoken,
-  makeRefreshtoken,
-  validateJWT,
-} from "../../utils/jwt.js";
+import { makeAccesstoken, makeRefreshtoken, validateJWT } from "../../utils/jwt.js";
 import config from "../../config.js";
 import { parse } from "cookie";
+import { secureCookie } from "../../utils/credential.js";
 
 export const tokenRefreshHandler = async function (request, reply) {
   try {
@@ -13,20 +10,21 @@ export const tokenRefreshHandler = async function (request, reply) {
       const cookies = parse(request.headers.cookie);
       request.refreshToken = cookies.userRefreshToken;
     } else {
-      request.log.info(
-        "Auth API: The request does not include a refresh token as cookie, refresh failed",
-      );
+      request.log.info("Auth API: The request does not include a refresh token as cookie, refresh failed");
       throw { statusCode: 400, message: "Refresh Token Failed" };
     }
 
     //Validate the refresh token
     const jwtClaims = await validateJWT(request.refreshToken, this.key);
-
     //Fetch user from Database
     const stmt = this.db.prepare(
-      "SELECT uuid, name, email, jwt_id, created_at, updated_at FROM users WHERE jwt_id = ?;",
+      "SELECT uuid, name, email, jwt_id, created_at, updated_at, metadata, appdata FROM users WHERE jwt_id = ?;"
     );
     const userObj = await stmt.get(jwtClaims.jti);
+    if (userObj === undefined) {
+      request.log.info("Auth API: User not found");
+      throw { statusCode: 400, message: "Refresh Token Failed" };
+    }
 
     //Prepare the reply
     const userAccessToken = await makeAccesstoken(userObj, this.key);
@@ -44,8 +42,12 @@ export const tokenRefreshHandler = async function (request, reply) {
 
     reply.headers({
       "set-cookie": [
-        `userRefreshToken=${userRefreshToken.token}; Path=/; Expires=${expireDate}; SameSite=None; Secure; HttpOnly`,
-        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=None; Secure; HttpOnly`,
+        `userRefreshToken=${userRefreshToken.token}; Path=/; Expires=${expireDate}; SameSite=${
+          config.SAMESITE
+        }; HttpOnly; ${secureCookie()}`,
+        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=${
+          config.SAMESITE
+        }; HttpOnly; ${secureCookie()}`,
       ],
       "x-authc-app-origin": config.APPLICATIONORIGIN,
     });
@@ -61,3 +63,39 @@ export const tokenRefreshHandler = async function (request, reply) {
     throw { statusCode: err.statusCode, message: err.message };
   }
 };
+
+export const tokenRefreshDeleteHandler = async function (request, reply) {
+  try {
+    //Check if the request includes a refresh token in request cookie
+    if (request.headers.cookie) {
+      const cookies = parse(request.headers.cookie);
+      request.refreshToken = cookies.userRefreshToken;
+    } else {
+      request.log.info("Auth API: The request does not include a refresh token as cookie, refresh failed");
+      throw { statusCode: 400, message: "Refresh Token Failed" };
+    }
+
+    //Validate the refresh token
+    const jwtClaims = await validateJWT(request.refreshToken, this.key);
+    //Fetch user from Database
+    const stmt = this.db.prepare(
+      "SELECT uuid, name, email, jwt_id, created_at, updated_at, metadata, appdata FROM users WHERE jwt_id = ?;"
+    );
+    const userObj = await stmt.get(jwtClaims.jti);
+    if (userObj === undefined) {
+      request.log.info("Auth API: User not found");
+      throw { statusCode: 400, message: "Refresh Token Failed" };
+    }
+
+    const delStmt = this.db.prepare("UPDATE users SET jwt_id = 0 WHERE jwt_id = ?");
+    const resp = await delStmt.run(jwtClaims.jti);
+    if (resp.changes !== 1) {
+      request.log.info("Error deleting token id");
+      throw { statusCode: 500, message: "Internal Error" };
+    }
+
+    reply.code(204);
+  } catch (err) {
+    throw { statusCode: err.statusCode, message: err.message };
+  }
+};
diff --git a/services/auth/registration.js b/services/auth/registration.js
index cf6f406..013a819 100644
--- a/services/auth/registration.js
+++ b/services/auth/registration.js
@@ -1,4 +1,4 @@
-import { createHash } from "../../utils/credential.js";
+import { createHash, secureCookie } from "../../utils/credential.js";
 import { randomUUID } from "crypto";
 import { createId } from "@paralleldrive/cuid2";
 import { makeAccesstoken, makeRefreshtoken } from "../../utils/jwt.js";
@@ -8,9 +8,7 @@ export const registrationHandler = async function (request, reply) {
   try {
     //Check the request's type attibute is set to users
     if (request.body.data.type !== "users") {
-      request.log.info(
-        "Auth API: The request's type is not set to Users, registration failed",
-      );
+      request.log.info("Auth API: The request's type is not set to Users, registration failed");
       throw { statusCode: 400, message: "Invalid Type Attribute" };
     }
 
@@ -19,9 +17,7 @@ export const registrationHandler = async function (request, reply) {
     const requestedAccount = await stmt.get(request.body.data.attributes.email);
 
     if (requestedAccount) {
-      request.log.info(
-        "Auth API: User already exists in database, registration failed",
-      );
+      request.log.info("Auth API: User already exists in database, registration failed");
 
       throw { statusCode: 400, message: "Registration Failed" };
     }
@@ -31,7 +27,7 @@ export const registrationHandler = async function (request, reply) {
     const jwtid = randomUUID();
 
     const registerStmt = this.db.prepare(
-      "INSERT INTO users (uuid, name, email, password, metadata, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, metadata, appdata, jwt_id, created_at, updated_at;",
+      "INSERT INTO users (uuid, name, email, password, metadata, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, metadata, appdata, jwt_id, created_at, updated_at;"
     );
     const userObj = registerStmt.get(
       uuid,
@@ -40,7 +36,7 @@ export const registrationHandler = async function (request, reply) {
       hashpwd,
       JSON.stringify(request.body.data.attributes.metadata),
       "1",
-      jwtid,
+      jwtid
     );
     //Prepare the reply
     const userAccessToken = await makeAccesstoken(userObj, this.key);
@@ -58,10 +54,14 @@ export const registrationHandler = async function (request, reply) {
 
     reply.headers({
       "set-cookie": [
-        `userRefreshToken=${userRefreshToken.token}; Path=/; Expires=${expireDate}; SameSite=None; Secure; HttpOnly`,
-        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=None; Secure; HttpOnly`,
+        `userRefreshToken=${
+          userRefreshToken.token
+        }; Path=/; Expires=${expireDate}; SameSite=None; HttpOnly; ${secureCookie()}`,
+        `Fgp=${userAccessToken.userFingerprint}; Path=/; Max-Age=3600; SameSite=${
+          config.SAMESITE
+        }; HttpOnly; ${secureCookie()}`,
       ],
-      "x-authc-app-origin": config.APPLICATIONORIGIN,
+      "x-authc-app-origin": config.REGISTRATIONORIGIN,
     });
 
     reply.statusCode = 201;
diff --git a/services/webAuthn/loginOptions.js b/services/webAuthn/loginOptions.js
index a654420..4e5a3eb 100644
--- a/services/webAuthn/loginOptions.js
+++ b/services/webAuthn/loginOptions.js
@@ -22,9 +22,7 @@ export const loginOptionsHandler = async function (request, reply) {
     const cookies = parse(request.headers.cookie);
 
     //persist the challenge with the associated session id for the verification step in loginVerification.js
-    const stmt = this.db.prepare(
-      "INSERT INTO storage (sessionID, data) VALUES (?, ?);",
-    );
+    const stmt = this.db.prepare("INSERT INTO storage (sessionID, data) VALUES (?, ?);");
     await stmt.run(cookies.sessionID, generatedOptions.challenge);
 
     //send the reply
diff --git a/services/webAuthn/loginVerification.js b/services/webAuthn/loginVerification.js
index b7cb6ca..ad964a9 100644
--- a/services/webAuthn/loginVerification.js
+++ b/services/webAuthn/loginVerification.js
@@ -16,9 +16,7 @@ export const loginVerificationHandler = async function (request, reply) {
     const cookies = parse(request.headers.cookie);
 
     //retrieve the session's challenge from storage
-    const storageStmt = this.db.prepare(
-      "SELECT data FROM storage WHERE sessionID = ?;",
-    );
+    const storageStmt = this.db.prepare("SELECT data FROM storage WHERE sessionID = ?;");
     const sessionChallenge = await storageStmt.get(cookies.sessionID);
 
     //set userID from response
@@ -26,7 +24,7 @@ export const loginVerificationHandler = async function (request, reply) {
 
     //retrieve the user's authenticator
     const stmt = this.db.prepare(
-      "SELECT credentialPublicKey, credentialID, counter, transports FROM authenticator INNER JOIN users ON users.authenticator_id = authenticator.id WHERE users.uuid = ?;",
+      "SELECT credentialPublicKey, credentialID, counter, transports FROM authenticator INNER JOIN users ON users.authenticator_id = authenticator.id WHERE users.uuid = ?;"
     );
     const userAuthenticator = await stmt.get(userID);
 
@@ -47,16 +45,14 @@ export const loginVerificationHandler = async function (request, reply) {
     }
 
     //session clean up in the storage
-    const deleteStmt = this.db.prepare(
-      "DELETE FROM storage WHERE sessionID = ?;",
-    );
+    const deleteStmt = this.db.prepare("DELETE FROM storage WHERE sessionID = ?;");
     await deleteStmt.run(cookies.sessionID);
 
     // All looks good! Let's prepare the reply
 
     // Fetch user from database
     const userStmt = this.db.prepare(
-      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at FROM users WHERE uuid = ?;",
+      "SELECT uuid, name, email, jwt_id, password, active, created_at, updated_at FROM users WHERE uuid = ?;"
     );
     const userObj = await userStmt.get(userID);
 
diff --git a/services/webAuthn/registrationOptions.js b/services/webAuthn/registrationOptions.js
index d3a36ed..88a700a 100644
--- a/services/webAuthn/registrationOptions.js
+++ b/services/webAuthn/registrationOptions.js
@@ -51,13 +51,11 @@ export const registrationOptionsHandler = async function (request, reply) {
     const hashpwd = await createHash(fingerprint);
 
     //build email
-    const generatedUniqueEmail = `placeholder+${Math.random()
-      .toString(36)
-      .substring(8)}@example.com`;
+    const generatedUniqueEmail = `placeholder+${Math.random().toString(36).substring(8)}@example.com`;
 
     //create user
     const registerStmt = this.db.prepare(
-      "INSERT INTO users (uuid, name, email, password, challenge, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, jwt_id, created_at, updated_at;",
+      "INSERT INTO users (uuid, name, email, password, challenge, active, jwt_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), strftime('%Y-%m-%dT%H:%M:%fZ','now')) RETURNING uuid, name, email, jwt_id, created_at, updated_at;"
     );
     const userObj = registerStmt.get(
       userUUID,
@@ -66,7 +64,7 @@ export const registrationOptionsHandler = async function (request, reply) {
       hashpwd,
       generatedOptions.challenge,
       "0",
-      jwtid,
+      jwtid
     );
     //send the reply
     return generatedOptions;
diff --git a/services/webAuthn/registrationVerification.js b/services/webAuthn/registrationVerification.js
index 8d4a228..5b5d4f0 100644
--- a/services/webAuthn/registrationVerification.js
+++ b/services/webAuthn/registrationVerification.js
@@ -32,21 +32,16 @@ export const registrationVerificationHandler = async function (request, reply) {
     }
 
     //create the returned authenticator
-    const { credentialPublicKey, credentialID, counter } =
-      verification.registrationInfo;
+    const { credentialPublicKey, credentialID, counter } = verification.registrationInfo;
 
     const authenticatorStmt = this.db.prepare(
-      "INSERT INTO Authenticator (credentialID, credentialPublicKey, counter) VALUES (?,?,?) RETURNING *;",
-    );
-    const authenticatorObj = authenticatorStmt.get(
-      credentialID,
-      credentialPublicKey,
-      counter,
+      "INSERT INTO Authenticator (credentialID, credentialPublicKey, counter) VALUES (?,?,?) RETURNING *;"
     );
+    const authenticatorObj = authenticatorStmt.get(credentialID, credentialPublicKey, counter);
 
     //associate the authenticator to the user and activate the account
     const userStmt = this.db.prepare(
-      "UPDATE users SET authenticator_id = ?, active = ? WHERE uuid = ? RETURNING uuid, name, email, jwt_id, created_at, updated_at;",
+      "UPDATE users SET authenticator_id = ?, active = ? WHERE uuid = ? RETURNING uuid, name, email, jwt_id, created_at, updated_at;"
     );
 
     const userObj = userStmt.get(authenticatorObj.id, "1", requestedAccount);
diff --git a/tests/app.test.js b/tests/app.test.js
index a3170a1..5c5f195 100644
--- a/tests/app.test.js
+++ b/tests/app.test.js
@@ -3,11 +3,7 @@ import buildApp from "../app.js";
 import { unlink } from "node:fs/promises";
 import { parse } from "cookie";
 import { readFile } from "node:fs/promises";
-import {
-  makeAccesstoken,
-  makeRefreshtoken,
-  makeAdminToken,
-} from "../utils/jwt.js";
+import { makeAccesstoken, makeRefreshtoken, makeAdminToken } from "../utils/jwt.js";
 import * as jose from "jose";
 
 // Setup Test
@@ -58,9 +54,7 @@ test.before(async (t) => {
   const data = await response.json();
   t.context.uuid = data.data.id;
   t.context.jwt = data.data.attributes.access_token;
-  t.context.refreshToken = parse(response.headers["set-cookie"][0])[
-    "userRefreshToken"
-  ];
+  t.context.refreshToken = parse(response.headers["set-cookie"][0])["userRefreshToken"];
   t.context.fgp = parse(response.headers["set-cookie"][1])["fgp"];
 
   //create a user to test admin api endpoints with
@@ -100,7 +94,9 @@ test.after.always("cleanup tests", async (t) => {
 
 // Start Tests
 
-test.serial.todo("API Endpoint Test: /auth/recovery");
+test.serial.todo("Auth Endpoint Test: POST /auth/recovery");
+test.serial.todo("Auth Endpoint Test: DELETE /auth/refresh");
+test.serial.todo("Admin Endpoint Test: DELETE /auth/refresh");
 
 test.serial("Auth Endpoint Test: GET /auth/refresh", async (t) => {
   try {
@@ -326,10 +322,7 @@ test("JWT Test: makeAccesstoken generates a valid JWT token", async (t) => {
   };
   const secretKey = t.context.app.key;
 
-  const { token, expiration, userFingerprint } = await makeAccesstoken(
-    userObj,
-    secretKey
-  );
+  const { token, expiration, userFingerprint } = await makeAccesstoken(userObj, secretKey);
 
   // Fetch the payload
   const { payload } = await jose.jwtVerify(token, secretKey);
@@ -413,10 +406,7 @@ test("JWT Test: makeAdminToken generates a valid admin JWT token", async (t) =>
   const secretKey = t.context.app.key;
 
   // Generate an admin token using the function
-  const { token, expiration, userFingerprint } = await makeAdminToken(
-    userObj,
-    secretKey
-  );
+  const { token, expiration, userFingerprint } = await makeAdminToken(userObj, secretKey);
 
   // Fetch the payload
   const { payload } = await jose.jwtVerify(token, secretKey);
diff --git a/utils/authenticate.js b/utils/authenticate.js
index 4022f12..1b1d33a 100644
--- a/utils/authenticate.js
+++ b/utils/authenticate.js
@@ -63,11 +63,7 @@ export const authenticateWebAdminRequest = async function (request, reply) {
 
     // Validate the adminAccessToken token and get its payload
     const fingerPrint = cookies["Fgp"];
-    const payload = await validateJWT(
-      cookies.adminAccessToken,
-      this.key,
-      fingerPrint,
-    );
+    const payload = await validateJWT(cookies.adminAccessToken, this.key, fingerPrint);
 
     // Check if the payload contains the admin scope
     if (!payload.scope.includes("admin")) {
diff --git a/utils/credential.js b/utils/credential.js
index 814d22d..4d534d6 100644
--- a/utils/credential.js
+++ b/utils/credential.js
@@ -1,4 +1,5 @@
 import * as argon2 from "argon2";
+import config from "../config.js";
 
 const hashingConfig = {
   // based on OWASP cheat sheet recommendations (as of March, 2022)
@@ -16,3 +17,10 @@ export async function createHash(value) {
 export async function verifyValueWithHash(value, hash) {
   return await argon2.verify(hash, value, hashingConfig);
 }
+
+export function secureCookie() {
+  if (process.env.NODE_ENV === "production" || config.SAMESITE === "None") {
+    return "Secure";
+  }
+  return "";
+}
diff --git a/utils/jwt.js b/utils/jwt.js
index 1724a29..007d786 100644
--- a/utils/jwt.js
+++ b/utils/jwt.js
@@ -21,8 +21,7 @@ export async function makeAccesstoken(userObj, secretKey) {
     let expirationTime = "1h";
 
     //generate the client context for storing the hash in the jwt claims
-    const { userFingerprint, userFingerprintHash } =
-      await generateClientContext();
+    const { userFingerprint, userFingerprintHash } = await generateClientContext();
 
     // build the token claims
     const claims = {
@@ -33,19 +32,11 @@ export async function makeAccesstoken(userObj, secretKey) {
       scope: "user",
     };
 
-    if (
-      userObj.metadata !== undefined &&
-      userObj.metadata !== null &&
-      userObj.metadata !== "{}"
-    ) {
+    if (userObj.metadata !== undefined && userObj.metadata !== null && userObj.metadata !== "{}") {
       claims.metadata = JSON.parse(userObj.metadata);
     }
 
-    if (
-      userObj.appdata !== undefined &&
-      userObj.appdata !== null &&
-      userObj.appdata !== "{}"
-    ) {
+    if (userObj.appdata !== undefined && userObj.appdata !== null && userObj.appdata !== "{}") {
       claims.app = JSON.parse(userObj.appdata);
     }
 
@@ -63,16 +54,13 @@ export async function makeAccesstoken(userObj, secretKey) {
       userFingerprint: userFingerprint,
     };
   } catch (error) {
+    fastify.log.info(error);
     throw { statusCode: 500, message: "Server Error" };
   }
 }
 
 //https://datatracker.ietf.org/doc/html/draft-ietf-oauth-browser-based-apps-05#section-8
-export async function makeRefreshtoken(
-  userObj,
-  secretKey,
-  { recoveryToken = false } = {},
-) {
+export async function makeRefreshtoken(userObj, secretKey, { recoveryToken = false } = {}) {
   try {
     // set default expiration time of the jwt token
     let expirationTime = "7d";
@@ -87,19 +75,11 @@ export async function makeRefreshtoken(
       email: userObj.email,
     };
 
-    if (
-      userObj.metadata !== undefined &&
-      userObj.metadata !== null &&
-      userObj.metadata !== "{}"
-    ) {
+    if (userObj.metadata !== undefined && userObj.metadata !== null && userObj.metadata !== "{}") {
       claims.metadata = JSON.parse(userObj.metadata);
     }
 
-    if (
-      userObj.appdata !== undefined &&
-      userObj.appdata !== null &&
-      userObj.appdata !== "{}"
-    ) {
+    if (userObj.appdata !== undefined && userObj.appdata !== null && userObj.appdata !== "{}") {
       claims.app = JSON.parse(userObj.appdata);
     }
 
@@ -108,7 +88,7 @@ export async function makeRefreshtoken(
     const jwtid = randomUUID();
 
     const stmt = db.prepare(
-      "UPDATE users SET jwt_id = ?, updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ?;",
+      "UPDATE users SET jwt_id = ?, updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ?;"
     );
     stmt.run(jwtid, userObj.uuid);
 
@@ -123,6 +103,7 @@ export async function makeRefreshtoken(
 
     return { token: jwt, expiration: payload.exp };
   } catch (error) {
+    fastify.log.info(error);
     throw { statusCode: 500, message: "Server Error" };
   }
 }
@@ -134,8 +115,7 @@ export async function makeAdminToken(userObj, secretKey) {
     let expirationTime = "1h";
 
     //generate the client context for storing the hash in the jwt claims
-    const { userFingerprint, userFingerprintHash } =
-      await generateClientContext();
+    const { userFingerprint, userFingerprintHash } = await generateClientContext();
 
     const claims = {
       userid: userObj.uuid,
@@ -159,6 +139,7 @@ export async function makeAdminToken(userObj, secretKey) {
       userFingerprint: userFingerprint,
     };
   } catch (error) {
+    fastify.log.info(error);
     throw { statusCode: 500, message: "Server Error" };
   }
 }
@@ -186,7 +167,7 @@ export async function makeAdminRefreshtoken(adminObj, secretKey) {
 
     // Update the admin table with the new JWT ID and update timestamp
     const stmt = db.prepare(
-      "UPDATE admin SET jwt_id = ?, updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ?;",
+      "UPDATE admin SET jwt_id = ?, updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now') WHERE uuid = ?;"
     );
     stmt.run(jwtid, adminObj.uuid);
 
@@ -218,10 +199,7 @@ export async function validateJWT(jwt, secretKey, fingerprint = null) {
       return payload;
     }
 
-    const validUserContext = await verifyValueWithHash(
-      fingerprint,
-      payload.userFingerprint,
-    );
+    const validUserContext = await verifyValueWithHash(fingerprint, payload.userFingerprint);
 
     if (!validUserContext) {
       throw { statusCode: 500, message: "Server Error" };
@@ -229,6 +207,7 @@ export async function validateJWT(jwt, secretKey, fingerprint = null) {
 
     return payload;
   } catch (error) {
+    fastify.log.info(error);
     throw { statusCode: 500, message: "Server Error" };
   }
 }