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 15:59:48 +01:00
parent 49716e8c5c
commit fc9839fd0c
8 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/users/login-user.js
Vendored
+2 -2
View File
@@ -26,7 +26,7 @@ const write_auth_files_1 = require("../package-shared/functions/backend/auth/wri
function loginUser(_a) {
return __awaiter(this, arguments, void 0, function* ({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, useLocal, apiUserID, skipWriteAuthFile, dbUserId, debug, }) {
var _b;
const grabedHostNames = (0, grab_host_names_1.default)();
const grabedHostNames = (0, grab_host_names_1.default)({ userId: user_id || apiUserID });
const { host, port, scheme } = grabedHostNames;
const defaultTempLoginFieldName = "temp_login_code";
const emailLoginTempCodeFieldName = email_login
@@ -164,7 +164,7 @@ function loginUser(_a) {
catch (error) { }
const cookieNames = (0, get_auth_cookie_names_1.default)({
database,
userId: apiUserID || user_id || grabedHostNames.user_id,
userId: grabedHostNames.user_id,
});
if (httpResponse.csrf && !skipWriteAuthFile) {
(0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.payload));
dist/users/user-auth.js
Vendored
+3 -1
View File
@@ -9,6 +9,7 @@ const get_auth_cookie_names_1 = __importDefault(require("../package-shared/funct
const write_auth_files_1 = require("../package-shared/functions/backend/auth/write-auth-files");
const parseCookies_1 = __importDefault(require("../package-shared/utils/backend/parseCookies"));
const get_csrf_header_name_1 = __importDefault(require("../utils/get-csrf-header-name"));
const grab_host_names_1 = __importDefault(require("../package-shared/utils/grab-host-names"));
const minuteInMilliseconds = 60000;
const hourInMilliseconds = minuteInMilliseconds * 60;
const dayInMilliseconds = hourInMilliseconds * 24;
@@ -24,6 +25,7 @@ const yearInMilliseconds = dayInMilliseconds * 365;
function userAuth({ request, req, encryptionKey, encryptionSalt, level, database, dsqlUserId, encryptedUserString, expiry = weekInMilliseconds, cookieString, csrfHeaderName, debug, }) {
try {
const finalRequest = req || request;
const { user_id } = (0, grab_host_names_1.default)({ userId: dsqlUserId });
const cookies = (0, parseCookies_1.default)({
request: finalRequest,
cookieString,
@@ -32,7 +34,7 @@ function userAuth({ request, req, encryptionKey, encryptionSalt, level, database
console.log("userAuth:cookies:", cookies);
}
const keyNames = (0, get_auth_cookie_names_1.default)({
userId: dsqlUserId || process.env.DSQL_API_USER_ID,
userId: user_id,
database: database || process.env.DSQL_DB_NAME,
});
if (debug) {