diff --git a/dist/users/logout-user.js b/dist/users/logout-user.js index c3aba15..76f0065 100644 --- a/dist/users/logout-user.js +++ b/dist/users/logout-user.js @@ -9,6 +9,7 @@ const decrypt_1 = __importDefault(require("../package-shared/functions/dsql/decr const ejson_1 = __importDefault(require("../package-shared/utils/ejson")); const write_auth_files_1 = require("../package-shared/functions/backend/auth/write-auth-files"); const parseCookies_1 = __importDefault(require("../package-shared/utils/backend/parseCookies")); +const grab_host_names_1 = __importDefault(require("../package-shared/utils/grab-host-names")); /** * # Logout user */ @@ -19,9 +20,10 @@ 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: dsqlUserId || process.env.DSQL_API_USER_ID, + userId: user_id, }); if (debug) { console.log("logoutUser:cookieNames", cookieNames); diff --git a/package.json b/package.json index c63ab86..0e70d5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "3.5.8", + "version": "3.5.9", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": { diff --git a/users/logout-user.ts b/users/logout-user.ts index 0cac092..8d81f9e 100644 --- a/users/logout-user.ts +++ b/users/logout-user.ts @@ -5,7 +5,7 @@ import EJSON from "../package-shared/utils/ejson"; import { deleteAuthFile } from "../package-shared/functions/backend/auth/write-auth-files"; import parseCookies from "../package-shared/utils/backend/parseCookies"; import { DATASQUIREL_LoggedInUser } from "../package-shared/types"; -import grabKeys from "../package-shared/utils/grab-keys"; +import grabHostNames from "../package-shared/utils/grab-host-names"; type Param = { encryptedUserString?: string; @@ -41,9 +41,11 @@ export default function logoutUser({ * @description Check Encryption Keys */ try { + const { user_id } = grabHostNames({ userId: dsqlUserId }); + const cookieNames = getAuthCookieNames({ database, - userId: dsqlUserId || process.env.DSQL_API_USER_ID, + userId: user_id, }); if (debug) {