Bugfixes
This commit is contained in:
parent
9ce8bf2c90
commit
a53b6e6974
@ -9,7 +9,6 @@ const decrypt_1 = __importDefault(require("../../functions/dsql/decrypt"));
|
||||
const ejson_1 = __importDefault(require("../../utils/ejson"));
|
||||
const write_auth_files_1 = require("../../functions/backend/auth/write-auth-files");
|
||||
const parseCookies_1 = __importDefault(require("../../utils/backend/parseCookies"));
|
||||
const grab_host_names_1 = __importDefault(require("../../utils/grab-host-names"));
|
||||
const debug_log_1 = __importDefault(require("../../utils/logging/debug-log"));
|
||||
/**
|
||||
* # Logout user
|
||||
@ -21,10 +20,8 @@ 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: user_id,
|
||||
});
|
||||
function debugFn(log, label) {
|
||||
(0, debug_log_1.default)({ log, addTime: true, title: "logoutUser", label });
|
||||
|
@ -104,7 +104,6 @@ function googleAuth(_a) {
|
||||
});
|
||||
const cookieNames = (0, get_auth_cookie_names_1.default)({
|
||||
database,
|
||||
userId: apiUserID || process.env.DSQL_API_USER_ID,
|
||||
});
|
||||
if (httpResponse.csrf) {
|
||||
(0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.payload));
|
||||
|
@ -19,7 +19,7 @@ const decrypt_1 = __importDefault(require("../dsql/decrypt"));
|
||||
const get_auth_cookie_names_1 = __importDefault(require("./cookies/get-auth-cookie-names"));
|
||||
function default_1(req) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const { keyCookieName, csrfCookieName } = (0, get_auth_cookie_names_1.default)();
|
||||
const { keyCookieName } = (0, get_auth_cookie_names_1.default)();
|
||||
const suKeyName = `${keyCookieName}_su`;
|
||||
const cookies = (0, parseCookies_1.default)({ request: req });
|
||||
if (!(cookies === null || cookies === void 0 ? void 0 : cookies[suKeyName])) {
|
||||
|
@ -42,11 +42,8 @@ export default function logoutUser({
|
||||
* @description Check Encryption Keys
|
||||
*/
|
||||
try {
|
||||
const { user_id } = grabHostNames({ userId: dsqlUserId });
|
||||
|
||||
const cookieNames = getAuthCookieNames({
|
||||
database,
|
||||
userId: user_id,
|
||||
});
|
||||
|
||||
function debugFn(log: any, label?: string) {
|
||||
|
@ -120,7 +120,6 @@ export default async function googleAuth({
|
||||
|
||||
const cookieNames = getAuthCookieNames({
|
||||
database,
|
||||
userId: apiUserID || process.env.DSQL_API_USER_ID,
|
||||
});
|
||||
|
||||
if (httpResponse.csrf) {
|
||||
|
@ -12,7 +12,7 @@ export default async function (req: IncomingMessage): Promise<{
|
||||
logged_in_status: boolean;
|
||||
date: number;
|
||||
} | null> {
|
||||
const { keyCookieName, csrfCookieName } = getAuthCookieNames();
|
||||
const { keyCookieName } = getAuthCookieNames();
|
||||
const suKeyName = `${keyCookieName}_su`;
|
||||
|
||||
const cookies = parseCookies({ request: req });
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@moduletrace/datasquirel",
|
||||
"version": "5.0.3",
|
||||
"version": "5.0.4",
|
||||
"description": "Cloud-based SQL data management tool",
|
||||
"main": "dist/index.js",
|
||||
"bin": {
|
||||
|
Loading…
Reference in New Issue
Block a user