auth-vir 1.1.0 → 1.2.1

package/dist/auth.d.ts

@@ -14,7 +14,7 @@ export type HeaderContainer = Record<string, string[] | undefined | string | num
  * @category Auth : Host
  * @returns The extracted user id or `undefined` if no valid auth headers exist.
  */
-export declare function extractUserIdFromRequestHeaders(headers: HeaderContainer, jwtParams: Readonly<ParseJwtParams>): Promise<string | undefined>;
+export declare function extractUserIdFromRequestHeaders(headers: HeaderContainer, jwtParams: Readonly<ParseJwtParams>, cookieName?: string | undefined): Promise<string | undefined>;
 /**
  * Used by host (backend) code to set headers on a response object.
  *

package/dist/auth.js

@@ -25,14 +25,14 @@ function readHeader(headers, headerName) {
  * @category Auth : Host
  * @returns The extracted user id or `undefined` if no valid auth headers exist.
  */
-export async function extractUserIdFromRequestHeaders(headers, jwtParams) {
+export async function extractUserIdFromRequestHeaders(headers, jwtParams, cookieName) {
     try {
         const csrfToken = readHeader(headers, csrfTokenHeaderName);
         const cookie = readHeader(headers, 'cookie');
         if (!cookie || !csrfToken) {
             return undefined;
         }
-        const jwt = await extractCookieJwt(cookie, jwtParams);
+        const jwt = await extractCookieJwt(cookie, jwtParams, cookieName);
         if (!jwt || jwt.csrfToken !== csrfToken) {
             return undefined;
         }

package/dist/cookie.d.ts

@@ -61,4 +61,4 @@ export declare function generateCookie(params: Readonly<Record<string, Exclude<P
  * @category Internal
  * @returns The extracted auth Cookie JWT data or `undefined` if no valid auth JWT data was found.
  */
-export declare function extractCookieJwt(rawCookie: string, jwtParams: Readonly<ParseJwtParams>): Promise<undefined | UserJwtData>;
+export declare function extractCookieJwt(rawCookie: string, jwtParams: Readonly<ParseJwtParams>, cookieName?: string): Promise<undefined | UserJwtData>;

package/dist/cookie.js

@@ -65,12 +65,13 @@ export function generateCookie(params) {
  * @category Internal
  * @returns The extracted auth Cookie JWT data or `undefined` if no valid auth JWT data was found.
  */
-export async function extractCookieJwt(rawCookie, jwtParams) {
-    const [auth] = safeMatch(rawCookie, /auth=[^;]+(?:;|$)/);
+export async function extractCookieJwt(rawCookie, jwtParams, cookieName = 'auth') {
+    const cookieRegExp = new RegExp(`${cookieName}=[^;]+(?:;|$)`);
+    const [auth] = safeMatch(rawCookie, cookieRegExp);
     if (!auth) {
         return undefined;
     }
-    const rawJwt = auth.replace('auth=', '').replace(';', '');
+    const rawJwt = auth.replace(`${cookieName}=`, '').replace(';', '');
     const jwt = await parseUserJwt(rawJwt, jwtParams);
     return jwt;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "auth-vir",
-    "version": "1.1.0",
+    "version": "1.2.1",
     "description": "Auth made easy and secure via JWT cookies, CSRF tokens, and password hashing helpers.",
     "keywords": [
         "auth",

package/src/auth.ts

@@ -41,6 +41,7 @@ function readHeader(headers: HeaderContainer, headerName: string): string | unde
 export async function extractUserIdFromRequestHeaders(
     headers: HeaderContainer,
     jwtParams: Readonly<ParseJwtParams>,
+    cookieName?: string | undefined,
 ): Promise<string | undefined> {
     try {
         const csrfToken = readHeader(headers, csrfTokenHeaderName);
@@ -50,7 +51,7 @@ export async function extractUserIdFromRequestHeaders(
             return undefined;
         }
 
-        const jwt = await extractCookieJwt(cookie, jwtParams);
+        const jwt = await extractCookieJwt(cookie, jwtParams, cookieName);
 
         if (!jwt || jwt.csrfToken !== csrfToken) {
             return undefined;

package/src/cookie.ts

@@ -122,14 +122,17 @@ export function generateCookie(
 export async function extractCookieJwt(
     rawCookie: string,
     jwtParams: Readonly<ParseJwtParams>,
+    cookieName: string = 'auth',
 ): Promise<undefined | UserJwtData> {
-    const [auth] = safeMatch(rawCookie, /auth=[^;]+(?:;|$)/);
+    const cookieRegExp = new RegExp(`${cookieName}=[^;]+(?:;|$)`);
+
+    const [auth] = safeMatch(rawCookie, cookieRegExp);
 
     if (!auth) {
         return undefined;
     }
 
-    const rawJwt = auth.replace('auth=', '').replace(';', '');
+    const rawJwt = auth.replace(`${cookieName}=`, '').replace(';', '');
 
     const jwt = await parseUserJwt(rawJwt, jwtParams);