Updates
This commit is contained in:
parent
caa26217a0
commit
c7e02a3061
@ -118,7 +118,6 @@ function loginUser(_a) {
|
|||||||
}
|
}
|
||||||
const cookieNames = (0, get_auth_cookie_names_1.default)({
|
const cookieNames = (0, get_auth_cookie_names_1.default)({
|
||||||
database,
|
database,
|
||||||
userId: apiUserID || process.env.DSQL_API_USER_ID,
|
|
||||||
});
|
});
|
||||||
if (httpResponse.csrf && !skipWriteAuthFile) {
|
if (httpResponse.csrf && !skipWriteAuthFile) {
|
||||||
(0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.payload), cleanupTokens && ((_b = httpResponse.payload) === null || _b === void 0 ? void 0 : _b.id)
|
(0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.payload), cleanupTokens && ((_b = httpResponse.payload) === null || _b === void 0 ? void 0 : _b.id)
|
||||||
|
@ -9,7 +9,6 @@ const get_auth_cookie_names_1 = __importDefault(require("../../functions/backend
|
|||||||
const write_auth_files_1 = require("../../functions/backend/auth/write-auth-files");
|
const write_auth_files_1 = require("../../functions/backend/auth/write-auth-files");
|
||||||
const parseCookies_1 = __importDefault(require("../../utils/backend/parseCookies"));
|
const parseCookies_1 = __importDefault(require("../../utils/backend/parseCookies"));
|
||||||
const get_csrf_header_name_1 = __importDefault(require("../../actions/get-csrf-header-name"));
|
const get_csrf_header_name_1 = __importDefault(require("../../actions/get-csrf-header-name"));
|
||||||
const grab_host_names_1 = __importDefault(require("../../utils/grab-host-names"));
|
|
||||||
const debug_log_1 = __importDefault(require("../../utils/logging/debug-log"));
|
const debug_log_1 = __importDefault(require("../../utils/logging/debug-log"));
|
||||||
const minuteInMilliseconds = 60000;
|
const minuteInMilliseconds = 60000;
|
||||||
const hourInMilliseconds = minuteInMilliseconds * 60;
|
const hourInMilliseconds = minuteInMilliseconds * 60;
|
||||||
@ -26,7 +25,6 @@ const yearInMilliseconds = dayInMilliseconds * 365;
|
|||||||
function userAuth({ request, req, encryptionKey, encryptionSalt, level, database, dsqlUserId, encryptedUserString, expiry = weekInMilliseconds, cookieString, csrfHeaderName, debug, skipFileCheck, }) {
|
function userAuth({ request, req, encryptionKey, encryptionSalt, level, database, dsqlUserId, encryptedUserString, expiry = weekInMilliseconds, cookieString, csrfHeaderName, debug, skipFileCheck, }) {
|
||||||
try {
|
try {
|
||||||
const finalRequest = req || request;
|
const finalRequest = req || request;
|
||||||
const { user_id } = (0, grab_host_names_1.default)({ userId: dsqlUserId });
|
|
||||||
const cookies = (0, parseCookies_1.default)({
|
const cookies = (0, parseCookies_1.default)({
|
||||||
request: finalRequest,
|
request: finalRequest,
|
||||||
cookieString,
|
cookieString,
|
||||||
@ -39,7 +37,6 @@ function userAuth({ request, req, encryptionKey, encryptionSalt, level, database
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
const keyNames = (0, get_auth_cookie_names_1.default)({
|
const keyNames = (0, get_auth_cookie_names_1.default)({
|
||||||
userId: user_id,
|
|
||||||
database: database || process.env.DSQL_DB_NAME,
|
database: database || process.env.DSQL_DB_NAME,
|
||||||
});
|
});
|
||||||
if (debug) {
|
if (debug) {
|
||||||
|
@ -145,7 +145,6 @@ export default async function loginUser<
|
|||||||
|
|
||||||
const cookieNames = getAuthCookieNames({
|
const cookieNames = getAuthCookieNames({
|
||||||
database,
|
database,
|
||||||
userId: apiUserID || process.env.DSQL_API_USER_ID,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (httpResponse.csrf && !skipWriteAuthFile) {
|
if (httpResponse.csrf && !skipWriteAuthFile) {
|
||||||
|
@ -55,8 +55,6 @@ export default function userAuth({
|
|||||||
try {
|
try {
|
||||||
const finalRequest = req || request;
|
const finalRequest = req || request;
|
||||||
|
|
||||||
const { user_id } = grabHostNames({ userId: dsqlUserId });
|
|
||||||
|
|
||||||
const cookies = parseCookies({
|
const cookies = parseCookies({
|
||||||
request: finalRequest,
|
request: finalRequest,
|
||||||
cookieString,
|
cookieString,
|
||||||
@ -71,7 +69,6 @@ export default function userAuth({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const keyNames = getAuthCookieNames({
|
const keyNames = getAuthCookieNames({
|
||||||
userId: user_id,
|
|
||||||
database: database || process.env.DSQL_DB_NAME,
|
database: database || process.env.DSQL_DB_NAME,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@moduletrace/datasquirel",
|
"name": "@moduletrace/datasquirel",
|
||||||
"version": "5.0.1",
|
"version": "5.0.2",
|
||||||
"description": "Cloud-based SQL data management tool",
|
"description": "Cloud-based SQL data management tool",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
Loading…
Reference in New Issue
Block a user