From 62bb1fd6d4bf7b0b102d9b6ac67ff08a7133f9bc Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Tue, 14 Jan 2025 14:58:44 +0100 Subject: [PATCH] Updates --- dist/users/logout-user.d.ts | 3 ++- dist/users/logout-user.js | 13 +++++++++---- dist/utils/delete-file.js | 1 - dist/utils/upload-image.js | 1 - package.json | 2 +- users/logout-user.ts | 16 ++++++++++++---- utils/delete-file.ts | 2 -- utils/upload-image.ts | 2 -- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dist/users/logout-user.d.ts b/dist/users/logout-user.d.ts index 58f9125..f491fa7 100644 --- a/dist/users/logout-user.d.ts +++ b/dist/users/logout-user.d.ts @@ -10,6 +10,7 @@ type Param = { cookieString?: string; database?: string; dsqlUserId?: string | number; + debug?: boolean; }; type Return = { success: boolean; @@ -19,5 +20,5 @@ type Return = { /** * # Logout user */ -export default function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, cookieString, }: Param): Return; +export default function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, cookieString, debug, }: Param): Return; export {}; diff --git a/dist/users/logout-user.js b/dist/users/logout-user.js index 0ab7b4d..c3aba15 100644 --- a/dist/users/logout-user.js +++ b/dist/users/logout-user.js @@ -12,7 +12,7 @@ const parseCookies_1 = __importDefault(require("../package-shared/utils/backend/ /** * # Logout user */ -function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, cookieString, }) { +function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, cookieString, debug, }) { /** * Check Encryption Keys * @@ -23,9 +23,12 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque database, userId: dsqlUserId || process.env.DSQL_API_USER_ID, }); + if (debug) { + console.log("logoutUser:cookieNames", cookieNames); + } const authKeyName = cookieNames.keyCookieName; const csrfName = cookieNames.csrfCookieName; - const oneTimeCodeName = (0, get_auth_cookie_names_1.default)().oneTimeCodeName; + const oneTimeCodeName = cookieNames.oneTimeCodeName; const decryptedUserJSON = (() => { try { if (request) { @@ -51,6 +54,9 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque return undefined; } })(); + if (debug) { + console.log("logoutUser:decryptedUserJSON", decryptedUserJSON); + } if (!decryptedUserJSON) throw new Error("Invalid User"); const userObject = ejson_1.default.parse(decryptedUserJSON); @@ -69,7 +75,7 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque cookieNames, }; } - catch ( /** @type {any} */error) { + catch (error) { console.log("Logout Error:", error.message); return { success: false, @@ -77,4 +83,3 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque }; } } -module.exports = logoutUser; diff --git a/dist/utils/delete-file.js b/dist/utils/delete-file.js index 3391a2f..2e8bbc9 100644 --- a/dist/utils/delete-file.js +++ b/dist/utils/delete-file.js @@ -74,4 +74,3 @@ function deleteFile(_a) { } }); } -module.exports = deleteFile; diff --git a/dist/utils/upload-image.js b/dist/utils/upload-image.js index 8c57ec1..79eb58b 100644 --- a/dist/utils/upload-image.js +++ b/dist/utils/upload-image.js @@ -75,4 +75,3 @@ function uploadImage(_a) { } }); } -module.exports = uploadImage; diff --git a/package.json b/package.json index 243b16a..d53f1a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "3.5.5", + "version": "3.5.6", "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 031807e..0cac092 100644 --- a/users/logout-user.ts +++ b/users/logout-user.ts @@ -14,6 +14,7 @@ type Param = { cookieString?: string; database?: string; dsqlUserId?: string | number; + debug?: boolean; }; type Return = { @@ -32,6 +33,7 @@ export default function logoutUser({ encryptedUserString, request, cookieString, + debug, }: Param): Return { /** * Check Encryption Keys @@ -44,9 +46,13 @@ export default function logoutUser({ userId: dsqlUserId || process.env.DSQL_API_USER_ID, }); + if (debug) { + console.log("logoutUser:cookieNames", cookieNames); + } + const authKeyName = cookieNames.keyCookieName; const csrfName = cookieNames.csrfCookieName; - const oneTimeCodeName = getAuthCookieNames().oneTimeCodeName; + const oneTimeCodeName = cookieNames.oneTimeCodeName; const decryptedUserJSON: string | undefined = (() => { try { @@ -75,6 +81,10 @@ export default function logoutUser({ } })(); + if (debug) { + console.log("logoutUser:decryptedUserJSON", decryptedUserJSON); + } + if (!decryptedUserJSON) throw new Error("Invalid User"); const userObject = EJSON.parse( @@ -98,7 +108,7 @@ export default function logoutUser({ msg: "User Logged Out", cookieNames, }; - } catch (/** @type {any} */ error: any) { + } catch (error: any) { console.log("Logout Error:", error.message); return { success: false, @@ -106,5 +116,3 @@ export default function logoutUser({ }; } } - -module.exports = logoutUser; diff --git a/utils/delete-file.ts b/utils/delete-file.ts index 872486f..5d37f51 100644 --- a/utils/delete-file.ts +++ b/utils/delete-file.ts @@ -90,5 +90,3 @@ export default async function deleteFile({ }; } } - -module.exports = deleteFile; diff --git a/utils/upload-image.ts b/utils/upload-image.ts index c7145f8..22357c7 100644 --- a/utils/upload-image.ts +++ b/utils/upload-image.ts @@ -99,5 +99,3 @@ export default async function uploadImage({ }; } } - -module.exports = uploadImage;