From c7e02a3061ae24b406951a33634726c1d79b66dc Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Thu, 10 Jul 2025 18:13:29 +0100 Subject: [PATCH] Updates --- dist/package-shared/actions/users/login-user.js | 1 - dist/package-shared/actions/users/user-auth.js | 3 --- package-shared/actions/users/login-user.ts | 1 - package-shared/actions/users/user-auth.ts | 3 --- package.json | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dist/package-shared/actions/users/login-user.js b/dist/package-shared/actions/users/login-user.js index f6b54f3..5f263ea 100644 --- a/dist/package-shared/actions/users/login-user.js +++ b/dist/package-shared/actions/users/login-user.js @@ -118,7 +118,6 @@ function loginUser(_a) { } const cookieNames = (0, get_auth_cookie_names_1.default)({ database, - userId: apiUserID || process.env.DSQL_API_USER_ID, }); if (httpResponse.csrf && !skipWriteAuthFile) { (0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.payload), cleanupTokens && ((_b = httpResponse.payload) === null || _b === void 0 ? void 0 : _b.id) diff --git a/dist/package-shared/actions/users/user-auth.js b/dist/package-shared/actions/users/user-auth.js index 09121b6..d61020c 100644 --- a/dist/package-shared/actions/users/user-auth.js +++ b/dist/package-shared/actions/users/user-auth.js @@ -9,7 +9,6 @@ const get_auth_cookie_names_1 = __importDefault(require("../../functions/backend const write_auth_files_1 = require("../../functions/backend/auth/write-auth-files"); const parseCookies_1 = __importDefault(require("../../utils/backend/parseCookies")); const get_csrf_header_name_1 = __importDefault(require("../../actions/get-csrf-header-name")); -const grab_host_names_1 = __importDefault(require("../../utils/grab-host-names")); const debug_log_1 = __importDefault(require("../../utils/logging/debug-log")); const minuteInMilliseconds = 60000; const hourInMilliseconds = minuteInMilliseconds * 60; @@ -26,7 +25,6 @@ const yearInMilliseconds = dayInMilliseconds * 365; function userAuth({ request, req, encryptionKey, encryptionSalt, level, database, dsqlUserId, encryptedUserString, expiry = weekInMilliseconds, cookieString, csrfHeaderName, debug, skipFileCheck, }) { try { const finalRequest = req || request; - const { user_id } = (0, grab_host_names_1.default)({ userId: dsqlUserId }); const cookies = (0, parseCookies_1.default)({ request: finalRequest, cookieString, @@ -39,7 +37,6 @@ function userAuth({ request, req, encryptionKey, encryptionSalt, level, database }); } const keyNames = (0, get_auth_cookie_names_1.default)({ - userId: user_id, database: database || process.env.DSQL_DB_NAME, }); if (debug) { diff --git a/package-shared/actions/users/login-user.ts b/package-shared/actions/users/login-user.ts index fb57c55..d2aed38 100644 --- a/package-shared/actions/users/login-user.ts +++ b/package-shared/actions/users/login-user.ts @@ -145,7 +145,6 @@ export default async function loginUser< const cookieNames = getAuthCookieNames({ database, - userId: apiUserID || process.env.DSQL_API_USER_ID, }); if (httpResponse.csrf && !skipWriteAuthFile) { diff --git a/package-shared/actions/users/user-auth.ts b/package-shared/actions/users/user-auth.ts index 178c625..51ce958 100644 --- a/package-shared/actions/users/user-auth.ts +++ b/package-shared/actions/users/user-auth.ts @@ -55,8 +55,6 @@ export default function userAuth({ try { const finalRequest = req || request; - const { user_id } = grabHostNames({ userId: dsqlUserId }); - const cookies = parseCookies({ request: finalRequest, cookieString, @@ -71,7 +69,6 @@ export default function userAuth({ } const keyNames = getAuthCookieNames({ - userId: user_id, database: database || process.env.DSQL_DB_NAME, }); diff --git a/package.json b/package.json index 935928d..84b46d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.0.1", + "version": "5.0.2", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {