Updates

users/user-auth.ts

@@ -1,11 +1,10 @@
-// @ts-check
-
 import http from "http";
 import decrypt from "../package-shared/functions/dsql/decrypt";
 import getAuthCookieNames from "../package-shared/functions/backend/cookies/get-auth-cookie-names";
 import { checkAuthFile } from "../package-shared/functions/backend/auth/write-auth-files";
 import parseCookies from "../package-shared/utils/backend/parseCookies";
 import { AuthenticatedUser } from "../package-shared/types";
+import getCsrfHeaderName from "../utils/get-csrf-header-name";
 
 const minuteInMilliseconds = 60000;
 const hourInMilliseconds = minuteInMilliseconds * 60;
@@ -26,7 +25,6 @@ type Param = {
     dsqlUserId?: string | number;
     expiry?: number;
     csrfHeaderName?: string;
-    csrfHeaderIsValue?: boolean;
 };
 
 /**
@@ -46,7 +44,6 @@ export default function userAuth({
     encryptedUserString,
     expiry = weekInMilliseconds,
     cookieString,
-    csrfHeaderIsValue,
     csrfHeaderName,
 }: Param): AuthenticatedUser {
     try {
@@ -73,7 +70,6 @@ export default function userAuth({
         const key = encryptedUserString
             ? encryptedUserString
             : cookies[authKeyName];
-        const csrf = cookies[csrfName];
 
         /**
          * Grab the payload
@@ -131,9 +127,9 @@ export default function userAuth({
          * @description Grab the payload
          */
         if (level?.match(/deep/i) && finalRequest) {
+            const finalCsrfHeaderName = csrfHeaderName || getCsrfHeaderName();
             if (
-                csrfHeaderName &&
-                finalRequest.headers[csrfHeaderName] !== userObject.csrf_k
+                finalRequest.headers[finalCsrfHeaderName] !== userObject.csrf_k
             ) {
                 return {
                     success: false,
@@ -142,17 +138,17 @@ export default function userAuth({
                 };
             }
 
-            const targetCsrfHeaderKey = Object.keys(finalRequest.headers)
-                .map((k) => k.replace(/[^a-zA-Z0-9\-]/g, ""))
-                .find((k) => k == userObject.csrf_k);
+            // const targetCsrfHeaderKey = Object.keys(finalRequest.headers)
+            //     .map((k) => k.replace(/[^a-zA-Z0-9\-]/g, ""))
+            //     .find((k) => k == userObject.csrf_k);
 
-            if (csrfHeaderIsValue && !targetCsrfHeaderKey) {
-                return {
-                    success: false,
-                    payload: null,
-                    msg: "CSRF_K Header Key mismatch",
-                };
-            }
+            // if (csrfHeaderIsValue && !targetCsrfHeaderKey) {
+            //     return {
+            //         success: false,
+            //         payload: null,
+            //         msg: "CSRF_K Header Key mismatch",
+            //     };
+            // }
         }
 
         const payloadCreationDate = Number(userObject.date);
@@ -191,7 +187,7 @@ export default function userAuth({
             success: true,
             payload: userObject,
         };
-    } catch (/** @type {any} */ error: any) {
+    } catch (error: any) {
         /**
          * Return User Object
          *