Updates
This commit is contained in:
@@ -6,6 +6,7 @@ import parseCookies from "../../utils/backend/parseCookies";
|
||||
import { AuthenticatedUser } from "../../types";
|
||||
import getCsrfHeaderName from "../../actions/get-csrf-header-name";
|
||||
import grabHostNames from "../../utils/grab-host-names";
|
||||
import debugLog from "@/package-shared/utils/logging/debug-log";
|
||||
|
||||
const minuteInMilliseconds = 60000;
|
||||
const hourInMilliseconds = minuteInMilliseconds * 60;
|
||||
@@ -60,7 +61,11 @@ export default function userAuth({
|
||||
});
|
||||
|
||||
if (debug) {
|
||||
console.log("userAuth:cookies:", cookies);
|
||||
debugLog({
|
||||
log: cookies,
|
||||
addTime: true,
|
||||
label: "userAuth:cookies",
|
||||
});
|
||||
}
|
||||
|
||||
const keyNames = getAuthCookieNames({
|
||||
@@ -69,7 +74,11 @@ export default function userAuth({
|
||||
});
|
||||
|
||||
if (debug) {
|
||||
console.log("userAuth:keyNames:", keyNames);
|
||||
debugLog({
|
||||
log: keyNames,
|
||||
addTime: true,
|
||||
label: "userAuth:keyNames",
|
||||
});
|
||||
}
|
||||
|
||||
const key = encryptedUserString
|
||||
@@ -77,7 +86,11 @@ export default function userAuth({
|
||||
: cookies[keyNames.keyCookieName];
|
||||
|
||||
if (debug) {
|
||||
console.log("userAuth:key:", key);
|
||||
debugLog({
|
||||
log: key,
|
||||
addTime: true,
|
||||
label: "userAuth:key",
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -92,7 +105,11 @@ export default function userAuth({
|
||||
});
|
||||
|
||||
if (debug) {
|
||||
console.log("userAuth:userPayloadJSON:", userPayloadJSON);
|
||||
debugLog({
|
||||
log: userPayloadJSON,
|
||||
addTime: true,
|
||||
label: "userAuth:userPayloadJSON",
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -109,18 +126,15 @@ export default function userAuth({
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Grab the payload
|
||||
*
|
||||
* @description Grab the payload
|
||||
*/
|
||||
|
||||
/** @type {import("../../types").DATASQUIREL_LoggedInUser} */
|
||||
let userObject: import("../../types").DATASQUIREL_LoggedInUser =
|
||||
JSON.parse(userPayloadJSON);
|
||||
|
||||
if (debug) {
|
||||
console.log("userAuth:userObject:", userObject);
|
||||
debugLog({
|
||||
log: userObject,
|
||||
addTime: true,
|
||||
label: "userAuth:userObject",
|
||||
});
|
||||
}
|
||||
|
||||
if (!userObject.csrf_k) {
|
||||
@@ -148,9 +162,26 @@ export default function userAuth({
|
||||
*/
|
||||
if (level?.match(/deep/i) && finalRequest) {
|
||||
const finalCsrfHeaderName = csrfHeaderName || getCsrfHeaderName();
|
||||
|
||||
if (
|
||||
finalRequest.headers[finalCsrfHeaderName] !== userObject.csrf_k
|
||||
) {
|
||||
debugLog({
|
||||
log: finalCsrfHeaderName,
|
||||
addTime: true,
|
||||
label: "userAuth:finalCsrfHeaderName",
|
||||
});
|
||||
debugLog({
|
||||
log: finalRequest.headers[finalCsrfHeaderName],
|
||||
addTime: true,
|
||||
label: "userAuth:finalRequest.headers[finalCsrfHeaderName]",
|
||||
});
|
||||
debugLog({
|
||||
log: userObject,
|
||||
addTime: true,
|
||||
label: "userAuth:userObject",
|
||||
});
|
||||
|
||||
return {
|
||||
success: false,
|
||||
payload: null,
|
||||
|
||||
Reference in New Issue
Block a user