From a53b6e6974463754060f8b9f018ed4efb502e7d9 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Fri, 11 Jul 2025 06:37:39 +0100 Subject: [PATCH] Bugfixes --- dist/package-shared/actions/users/logout-user.js | 3 --- dist/package-shared/actions/users/social/google-auth.js | 1 - dist/package-shared/functions/backend/suSocketAuth.js | 2 +- package-shared/actions/users/logout-user.ts | 3 --- package-shared/actions/users/social/google-auth.ts | 1 - package-shared/functions/backend/suSocketAuth.ts | 2 +- package.json | 2 +- 7 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dist/package-shared/actions/users/logout-user.js b/dist/package-shared/actions/users/logout-user.js index bb474da..f0e20e5 100644 --- a/dist/package-shared/actions/users/logout-user.js +++ b/dist/package-shared/actions/users/logout-user.js @@ -9,7 +9,6 @@ const decrypt_1 = __importDefault(require("../../functions/dsql/decrypt")); const ejson_1 = __importDefault(require("../../utils/ejson")); const write_auth_files_1 = require("../../functions/backend/auth/write-auth-files"); const parseCookies_1 = __importDefault(require("../../utils/backend/parseCookies")); -const grab_host_names_1 = __importDefault(require("../../utils/grab-host-names")); const debug_log_1 = __importDefault(require("../../utils/logging/debug-log")); /** * # Logout user @@ -21,10 +20,8 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque * @description Check Encryption Keys */ try { - const { user_id } = (0, grab_host_names_1.default)({ userId: dsqlUserId }); const cookieNames = (0, get_auth_cookie_names_1.default)({ database, - userId: user_id, }); function debugFn(log, label) { (0, debug_log_1.default)({ log, addTime: true, title: "logoutUser", label }); diff --git a/dist/package-shared/actions/users/social/google-auth.js b/dist/package-shared/actions/users/social/google-auth.js index 05f209a..7fb2b20 100644 --- a/dist/package-shared/actions/users/social/google-auth.js +++ b/dist/package-shared/actions/users/social/google-auth.js @@ -104,7 +104,6 @@ function googleAuth(_a) { }); const cookieNames = (0, get_auth_cookie_names_1.default)({ database, - userId: apiUserID || process.env.DSQL_API_USER_ID, }); if (httpResponse.csrf) { (0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.payload)); diff --git a/dist/package-shared/functions/backend/suSocketAuth.js b/dist/package-shared/functions/backend/suSocketAuth.js index 00b8001..7372b33 100644 --- a/dist/package-shared/functions/backend/suSocketAuth.js +++ b/dist/package-shared/functions/backend/suSocketAuth.js @@ -19,7 +19,7 @@ const decrypt_1 = __importDefault(require("../dsql/decrypt")); const get_auth_cookie_names_1 = __importDefault(require("./cookies/get-auth-cookie-names")); function default_1(req) { return __awaiter(this, void 0, void 0, function* () { - const { keyCookieName, csrfCookieName } = (0, get_auth_cookie_names_1.default)(); + const { keyCookieName } = (0, get_auth_cookie_names_1.default)(); const suKeyName = `${keyCookieName}_su`; const cookies = (0, parseCookies_1.default)({ request: req }); if (!(cookies === null || cookies === void 0 ? void 0 : cookies[suKeyName])) { diff --git a/package-shared/actions/users/logout-user.ts b/package-shared/actions/users/logout-user.ts index c760eb7..c00759b 100644 --- a/package-shared/actions/users/logout-user.ts +++ b/package-shared/actions/users/logout-user.ts @@ -42,11 +42,8 @@ export default function logoutUser({ * @description Check Encryption Keys */ try { - const { user_id } = grabHostNames({ userId: dsqlUserId }); - const cookieNames = getAuthCookieNames({ database, - userId: user_id, }); function debugFn(log: any, label?: string) { diff --git a/package-shared/actions/users/social/google-auth.ts b/package-shared/actions/users/social/google-auth.ts index 69e1f5e..0813e77 100644 --- a/package-shared/actions/users/social/google-auth.ts +++ b/package-shared/actions/users/social/google-auth.ts @@ -120,7 +120,6 @@ export default async function googleAuth({ const cookieNames = getAuthCookieNames({ database, - userId: apiUserID || process.env.DSQL_API_USER_ID, }); if (httpResponse.csrf) { diff --git a/package-shared/functions/backend/suSocketAuth.ts b/package-shared/functions/backend/suSocketAuth.ts index d162b24..065007c 100644 --- a/package-shared/functions/backend/suSocketAuth.ts +++ b/package-shared/functions/backend/suSocketAuth.ts @@ -12,7 +12,7 @@ export default async function (req: IncomingMessage): Promise<{ logged_in_status: boolean; date: number; } | null> { - const { keyCookieName, csrfCookieName } = getAuthCookieNames(); + const { keyCookieName } = getAuthCookieNames(); const suKeyName = `${keyCookieName}_su`; const cookies = parseCookies({ request: req }); diff --git a/package.json b/package.json index 983782d..8810813 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.0.3", + "version": "5.0.4", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {