Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2024-12-10 19:05:05 +01:00
parent 5eef6628a4
commit 3b236b2ced
3 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@moduletrace/datasquirel",
"version": "2.8.6",
"version": "2.8.7",
"description": "Cloud-based SQL data management tool",
"main": "index.js",
"bin": {

10
users/logout-user.d.ts vendored
View File

@ -3,15 +3,19 @@ export = logoutUser;
* Logout user
* ==============================================================================
* @param {object} params - Single Param object containing params
* @param {string} params.encryptedUserString - Encrypted User String
* @param {string} [params.encryptedUserString] - Encrypted User String
* @param {http.IncomingMessage & Object<string, any>} [params.request] - Request Object
* @param {http.ServerResponse & Object<string, any>} [params.response] - Http response object
* @param {string} [params.database] - Target database name(slug): optional
* @param {string | number} [params.dsqlUserId]
*
* @returns {{success: boolean, payload: string, cookieNames?: any}}
*/
declare function logoutUser({ response, database, dsqlUserId, encryptedUserString }: {
encryptedUserString: string;
declare function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, }: {
encryptedUserString?: string;
request?: http.IncomingMessage & {
[x: string]: any;
};
response?: http.ServerResponse & {
[x: string]: any;
};

62
users/logout-user.js
View File

@ -7,28 +7,67 @@ const EJSON = require("../package-shared/utils/ejson");
const {
deleteAuthFile,
} = require("../package-shared/functions/backend/auth/write-auth-files");
const parseCookies = require("../package-shared/utils/backend/parseCookies");
/**
* Logout user
* ==============================================================================
* @param {object} params - Single Param object containing params
* @param {string} params.encryptedUserString - Encrypted User String
* @param {string} [params.encryptedUserString] - Encrypted User String
* @param {http.IncomingMessage & Object<string, any>} [params.request] - Request Object
* @param {http.ServerResponse & Object<string, any>} [params.response] - Http response object
* @param {string} [params.database] - Target database name(slug): optional
* @param {string | number} [params.dsqlUserId]
*
* @returns {{success: boolean, payload: string, cookieNames?: any}}
*/
function logoutUser({ response, database, dsqlUserId, encryptedUserString }) {
function logoutUser({
response,
database,
dsqlUserId,
encryptedUserString,
request,
}) {
/**
* Check Encryption Keys
*
* @description Check Encryption Keys
*/
try {
const decryptedUserJSON = decrypt({
encryptedString: encryptedUserString,
const cookieNames = getAuthCookieNames({
database,
userId: dsqlUserId || process.env.DSQL_API_USER_ID,
});
const authKeyName = cookieNames.keyCookieName;
const csrfName = cookieNames.csrfCookieName;
/** @type {string | undefined} */
const decryptedUserJSON = (() => {
try {
if (request) {
const cookiesObject = parseCookies({ request });
return decrypt({
encryptedString: cookiesObject[authKeyName],
});
} else if (encryptedUserString) {
return decrypt({
encryptedString: encryptedUserString,
});
} else {
return undefined;
}
} catch (/** @type {any} */ error) {
console.log(
"Error getting decrypted User JSON to logout:",
error.message
);
return undefined;
}
})();
if (!decryptedUserJSON) throw new Error("Invalid User");
const userObject =
/** @type {import("../package-shared/types").DATASQUIREL_LoggedInUser | undefined} */ (
EJSON.parse(decryptedUserJSON)
@ -37,13 +76,6 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString }) {
if (!userObject?.csrf_k)
throw new Error("Invalid User. Please check key");
const cookieNames = getAuthCookieNames({
database,
userId: dsqlUserId || process.env.DSQL_API_USER_ID,
});
const authKeyName = cookieNames.keyCookieName;
const csrfName = cookieNames.csrfCookieName;
response?.setHeader("Set-Cookie", [
`${authKeyName}=null;max-age=0`,
`${csrfName}=null;max-age=0`,
@ -65,14 +97,6 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString }) {
payload: "Logout Failed",
};
}
/** ********************************************** */
/** ********************************************** */
/** ********************************************** */
}
/** ********************************************** */
/** ********************************************** */
/** ********************************************** */
module.exports = logoutUser;