From c4c355f58cb8ef2953c652fbcdf9a9fa59889ea2 Mon Sep 17 00:00:00 2001
From: Tben <52448020+BenjaminToby@users.noreply.github.com>
Date: Sat, 24 Jun 2023 16:21:31 +0100
Subject: [PATCH] updates

---
 package.json         |  2 +-
 users/logout-user.js | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index fc19038..76ec7e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "datasquirel",
-    "version": "1.1.53",
+    "version": "1.1.54",
     "description": "Cloud-based SQL data management tool",
     "main": "index.js",
     "scripts": {
diff --git a/users/logout-user.js b/users/logout-user.js
index 50483d5..f8a9ec2 100644
--- a/users/logout-user.js
+++ b/users/logout-user.js
@@ -6,7 +6,9 @@ const parseCookies = require("../utils/functions/parseCookies");
  * @param {object} params - Single Param object containing params
  * @param {object} params.request - Http request object
  * @param {object} params.response - Http response object
- * @param {string} params.database - Target database name(slug)
+ * @param {string} [params.database] - Target database name(slug): optional => If you don't
+ * include this you will be logged out of all datasquirel websites instead of just the target
+ * database
  *
  * @returns {{success: boolean, payload: string}}
  */
@@ -27,7 +29,14 @@ module.exports = function ({ request, response, database }) {
         const authKeyName = cookiesKeys.filter((cookieKey) => cookieKey.match(keyRegexp))[0];
         const csrfName = cookiesKeys.filter((cookieKey) => cookieKey.match(csrfRegexp))[0];
 
-        response.setHeader("Set-Cookie", [`${authKeyName}=null;samesite=strict;path=/;HttpOnly=true;Secure=true`, `${csrfName}=null;samesite=strict;path=/;HttpOnly=true`, `dsqluid=null;samesite=strict;path=/;HttpOnly=true`]);
+        if (authKeyName && csrfName) {
+            response.setHeader("Set-Cookie", [`${authKeyName}=null;samesite=strict;path=/;HttpOnly=true;Secure=true`, `${csrfName}=null;samesite=strict;path=/;HttpOnly=true`, `dsqluid=null;samesite=strict;path=/;HttpOnly=true`]);
+        } else {
+            const allKeys = cookiesKeys.filter((cookieKey) => cookieKey.match(/datasquirel_.*_auth_key/));
+            const allCsrfs = cookiesKeys.filter((cookieKey) => cookieKey.match(/datasquirel_.*_csrf/));
+
+            response.setHeader("Set-Cookie", [...allKeys.map((key) => `${key}=null;samesite=strict;path=/;HttpOnly=true;Secure=true`), ...allCsrfs.map((csrf) => `${csrf}=null;samesite=strict;path=/;HttpOnly=true`), `dsqluid=null;samesite=strict;path=/;HttpOnly=true`]);
+        }
 
         /** ********************************************** */
         /** ********************************************** */