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 2025-01-14 14:58:44 +01:00
parent f181b79ef7
commit 62bb1fd6d4
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/users/logout-user.d.ts vendored
View File

@ -10,6 +10,7 @@ type Param = {
cookieString?: string; cookieString?: string;
database?: string; database?: string;
dsqlUserId?: string | number; dsqlUserId?: string | number;
debug?: boolean;
}; };
type Return = { type Return = {
success: boolean; success: boolean;
@ -19,5 +20,5 @@ type Return = {
/** /**
* # Logout user * # 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 {}; export {};

13
dist/users/logout-user.js vendored
View File

@ -12,7 +12,7 @@ const parseCookies_1 = __importDefault(require("../package-shared/utils/backend/
/** /**
* # Logout user * # Logout user
*/ */
function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, cookieString, }) { function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, cookieString, debug, }) {
/** /**
* Check Encryption Keys * Check Encryption Keys
* *
@ -23,9 +23,12 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque
database, database,
userId: dsqlUserId || process.env.DSQL_API_USER_ID, userId: dsqlUserId || process.env.DSQL_API_USER_ID,
}); });
if (debug) {
console.log("logoutUser:cookieNames", cookieNames);
}
const authKeyName = cookieNames.keyCookieName; const authKeyName = cookieNames.keyCookieName;
const csrfName = cookieNames.csrfCookieName; const csrfName = cookieNames.csrfCookieName;
const oneTimeCodeName = (0, get_auth_cookie_names_1.default)().oneTimeCodeName; const oneTimeCodeName = cookieNames.oneTimeCodeName;
const decryptedUserJSON = (() => { const decryptedUserJSON = (() => {
try { try {
if (request) { if (request) {
@ -51,6 +54,9 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque
return undefined; return undefined;
} }
})(); })();
if (debug) {
console.log("logoutUser:decryptedUserJSON", decryptedUserJSON);
}
if (!decryptedUserJSON) if (!decryptedUserJSON)
throw new Error("Invalid User"); throw new Error("Invalid User");
const userObject = ejson_1.default.parse(decryptedUserJSON); const userObject = ejson_1.default.parse(decryptedUserJSON);
@ -69,7 +75,7 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque
cookieNames, cookieNames,
}; };
} }
catch ( /** @type {any} */error) { catch (error) {
console.log("Logout Error:", error.message); console.log("Logout Error:", error.message);
return { return {
success: false, success: false,
@ -77,4 +83,3 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque
}; };
} }
} }
module.exports = logoutUser;

1
dist/utils/delete-file.js vendored
View File

@ -74,4 +74,3 @@ function deleteFile(_a) {
} }
}); });
} }
module.exports = deleteFile;

1
dist/utils/upload-image.js vendored
View File

@ -75,4 +75,3 @@ function uploadImage(_a) {
} }
}); });
} }
module.exports = uploadImage;

2
package.json
View File

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

16
users/logout-user.ts
View File

@ -14,6 +14,7 @@ type Param = {
cookieString?: string; cookieString?: string;
database?: string; database?: string;
dsqlUserId?: string | number; dsqlUserId?: string | number;
debug?: boolean;
}; };
type Return = { type Return = {
@ -32,6 +33,7 @@ export default function logoutUser({
encryptedUserString, encryptedUserString,
request, request,
cookieString, cookieString,
debug,
}: Param): Return { }: Param): Return {
/** /**
* Check Encryption Keys * Check Encryption Keys
@ -44,9 +46,13 @@ export default function logoutUser({
userId: dsqlUserId || process.env.DSQL_API_USER_ID, userId: dsqlUserId || process.env.DSQL_API_USER_ID,
}); });
if (debug) {
console.log("logoutUser:cookieNames", cookieNames);
}
const authKeyName = cookieNames.keyCookieName; const authKeyName = cookieNames.keyCookieName;
const csrfName = cookieNames.csrfCookieName; const csrfName = cookieNames.csrfCookieName;
const oneTimeCodeName = getAuthCookieNames().oneTimeCodeName; const oneTimeCodeName = cookieNames.oneTimeCodeName;
const decryptedUserJSON: string | undefined = (() => { const decryptedUserJSON: string | undefined = (() => {
try { try {
@ -75,6 +81,10 @@ export default function logoutUser({
} }
})(); })();
if (debug) {
console.log("logoutUser:decryptedUserJSON", decryptedUserJSON);
}
if (!decryptedUserJSON) throw new Error("Invalid User"); if (!decryptedUserJSON) throw new Error("Invalid User");
const userObject = EJSON.parse( const userObject = EJSON.parse(
@ -98,7 +108,7 @@ export default function logoutUser({
msg: "User Logged Out", msg: "User Logged Out",
cookieNames, cookieNames,
}; };
} catch (/** @type {any} */ error: any) { } catch (error: any) {
console.log("Logout Error:", error.message); console.log("Logout Error:", error.message);
return { return {
success: false, success: false,
@ -106,5 +116,3 @@ export default function logoutUser({
}; };
} }
} }
module.exports = logoutUser;

2
utils/delete-file.ts
View File

@ -90,5 +90,3 @@ export default async function deleteFile({
}; };
} }
} }
module.exports = deleteFile;

2
utils/upload-image.ts
View File

@ -99,5 +99,3 @@ export default async function uploadImage({
}; };
} }
} }
module.exports = uploadImage;