auth-vir 3.1.2 → 5.0.0

package/README.md

@@ -73,6 +73,7 @@ Here's a full example of how to use all host / server / backend side auth functi
 ```TypeScript
 import {type ClientRequest, type ServerResponse} from 'node:http';
 import {
+    AuthCookie,
     doesPasswordMatchHash,
     extractUserIdFromRequestHeaders,
     generateNewJwtKeys,
@@ -114,8 +115,15 @@ export async function handleLogin(
         throw new Error('Credentials mismatch.');
     }
 
-    const authHeaders = await generateSuccessfulLoginHeaders(user.id, cookieParams, csrfOption);
-    response.setHeaders(new Headers(authHeaders));
+    const authHeaders = await generateSuccessfulLoginHeaders(user.id, cookieParams);
+    Object.entries(authHeaders).forEach(
+        ([
+            key,
+            value,
+        ]) => {
+            response.setHeader(key, value);
+        },
+    );
 }
 
 /**
@@ -130,8 +138,15 @@ export async function createUser(
 ) {
     const newUser = await createUserInDatabase(userRequestData);
 
-    const authHeaders = await generateSuccessfulLoginHeaders(newUser.id, cookieParams, csrfOption);
-    response.setHeaders(new Headers(authHeaders));
+    const authHeaders = await generateSuccessfulLoginHeaders(newUser.id, cookieParams);
+    Object.entries(authHeaders).forEach(
+        ([
+            key,
+            value,
+        ]) => {
+            response.setHeader(key, value);
+        },
+    );
 }
 
 /**
@@ -141,7 +156,12 @@ export async function createUser(
  */
 export async function getAuthenticatedUser(request: ClientRequest) {
     const userId = (
-        await extractUserIdFromRequestHeaders<MyUserId>(request.getHeaders(), jwtParams, csrfOption)
+        await extractUserIdFromRequestHeaders<MyUserId>(
+            request.getHeaders(),
+            jwtParams,
+            csrfOption,
+            AuthCookie.Auth,
+        )
     )?.userId;
     const user = userId ? findUserInDatabaseById(userId) : undefined;
 
@@ -260,13 +280,7 @@ Here's a full example of how to use all the client / frontend side auth function
 
 ```TypeScript
 import {HttpStatus} from '@augment-vir/common';
-import {
-    type CsrfHeaderNameOption,
-    getCurrentCsrfToken,
-    handleAuthResponse,
-    resolveCsrfHeaderName,
-    wipeCurrentCsrfToken,
-} from 'auth-vir';
+import {type CsrfHeaderNameOption, getCurrentCsrfToken, resolveCsrfHeaderName} from 'auth-vir';
 
 /**
  * The CSRF header prefix for this app. Either `csrfHeaderPrefix` or `csrfHeaderName` must be
@@ -281,7 +295,7 @@ export async function sendLoginRequest(
     userLoginData: {username: string; password: string},
     loginUrl: string,
 ) {
-    if ((await getCurrentCsrfToken(csrfOption)).csrfToken) {
+    if (getCurrentCsrfToken()) {
         throw new Error('Already logged in.');
     }
 
@@ -291,7 +305,7 @@ export async function sendLoginRequest(
         credentials: 'include',
     });
 
-    await handleAuthResponse(response, csrfOption);
+    /** The CSRF token cookie is automatically stored by the browser from the Set-Cookie header. */
 
     return response;
 }
@@ -302,7 +316,7 @@ export async function sendAuthenticatedRequest(
     requestInit: Omit<RequestInit, 'headers'> = {},
     headers: Record<string, string> = {},
 ) {
-    const {csrfToken} = await getCurrentCsrfToken(csrfOption);
+    const csrfToken = getCurrentCsrfToken();
 
     if (!csrfToken) {
         throw new Error('Not authenticated.');
@@ -313,26 +327,25 @@ export async function sendAuthenticatedRequest(
         credentials: 'include',
         headers: {
             ...headers,
-            [resolveCsrfHeaderName(csrfOption)]: csrfToken.token,
+            [resolveCsrfHeaderName(csrfOption)]: csrfToken,
         },
     });
 
-    /**
-     * This indicates the user is no longer authorized and thus needs to login again. (This likely
-     * means that their session timed out or they clicked a "log out" button onr your website in
-     * another tab.)
-     */
     if (response.status === HttpStatus.Unauthorized) {
-        await wipeCurrentCsrfToken(csrfOption);
         throw new Error(`User no longer logged in.`);
     } else {
         return response;
     }
 }
 
-/** Call this when the user explicitly clicks a "log out" button. */
-export async function logout() {
-    await wipeCurrentCsrfToken(csrfOption);
+/**
+ * Call this when the user explicitly clicks a "log out" button. The backend clears the auth and
+ * CSRF cookies via Set-Cookie headers.
+ */
+export async function logout(logoutUrl: string) {
+    await sendAuthenticatedRequest(logoutUrl, {
+        method: 'post',
+    });
 }
 ```
 

package/dist/auth-client/backend-auth.client.d.ts

@@ -217,7 +217,7 @@ export declare class BackendAuthClient<DatabaseUser extends AnyObject, UserId ex
         userId: UserId;
         cookieParams: Readonly<CookieParams>;
         existingUserIdResult: Readonly<UserIdResult<UserId>>;
-    }): Promise<Record<string, string>>;
+    }): Promise<Record<string, string | string[]>>;
     /** Use these headers to log a user in. */
     createLoginHeaders({ userId, requestHeaders, isSignUpCookie, }: {
         userId: UserId;

package/dist/auth-client/backend-auth.client.js

@@ -1,10 +1,10 @@
 import { ensureArray, } from '@augment-vir/common';
 import { calculateRelativeDate, createUtcFullDate, getNowInUtcTimezone, isDateAfter, } from 'date-vir';
 import { extractUserIdFromRequestHeaders, generateLogoutHeaders, generateSuccessfulLoginHeaders, insecureExtractUserIdFromCookieAlone, } from '../auth.js';
-import { AuthCookieName, generateAuthCookie } from '../cookie.js';
-import { defaultAllowedClockSkew, resolveCsrfHeaderName, } from '../csrf-token.js';
+import { AuthCookie, generateAuthCookie, generateCsrfCookie } from '../cookie.js';
 import { AuthHeaderName, mergeHeaderValues } from '../headers.js';
 import { parseJwtKeys } from '../jwt/jwt-keys.js';
+import { defaultAllowedClockSkew } from '../jwt/jwt.js';
 import { isSessionRefreshReady } from './is-session-refresh-ready.js';
 const defaultSessionIdleTimeout = {
     minutes: 20,
@@ -55,7 +55,7 @@ export class BackendAuthClient {
             hostOrigin: serviceOrigin || this.config.serviceOrigin,
             jwtParams: await this.getJwtParams(),
             isDev: this.config.isDev,
-            cookieName: isSignUpCookie ? AuthCookieName.SignUp : AuthCookieName.Auth,
+            authCookie: isSignUpCookie ? AuthCookie.SignUp : AuthCookie.Auth,
         };
     }
     /** Calls the provided `getUserFromDatabase` config. */
@@ -133,23 +133,22 @@ export class BackendAuthClient {
             sessionRefreshStartTime,
         });
         if (isRefreshReady) {
-            const isSignUpCookie = userIdResult.cookieName === AuthCookieName.SignUp;
+            const isSignUpCookie = userIdResult.cookieName === AuthCookie.SignUp;
             const cookieParams = await this.getCookieParams({
                 isSignUpCookie,
                 requestHeaders,
             });
-            const csrfHeaderName = resolveCsrfHeaderName(this.config.csrf);
-            const { cookie, expiration } = await generateAuthCookie({
+            const authCookie = await generateAuthCookie({
                 csrfToken: userIdResult.csrfToken,
                 userId: userIdResult.userId,
                 sessionStartedAt: userIdResult.sessionStartedAt || Date.now(),
             }, cookieParams);
+            const csrfCookie = generateCsrfCookie(userIdResult.csrfToken, cookieParams);
             return {
-                'set-cookie': cookie,
-                [csrfHeaderName]: JSON.stringify({
-                    token: userIdResult.csrfToken,
-                    expiration,
-                }),
+                'set-cookie': [
+                    authCookie,
+                    csrfCookie,
+                ],
             };
         }
         else {
@@ -187,7 +186,7 @@ export class BackendAuthClient {
     }
     /** Securely extract a user from their request headers. */
     async getSecureUser({ requestHeaders, isSignUpCookie, allowUserAuthRefresh, }) {
-        const userIdResult = await extractUserIdFromRequestHeaders(requestHeaders, await this.getJwtParams(), this.config.csrf, isSignUpCookie ? AuthCookieName.SignUp : AuthCookieName.Auth);
+        const userIdResult = await extractUserIdFromRequestHeaders(requestHeaders, await this.getJwtParams(), this.config.csrf, isSignUpCookie ? AuthCookie.SignUp : AuthCookie.Auth);
         if (!userIdResult) {
             this.logForUser({
                 user: undefined,
@@ -218,14 +217,28 @@ export class BackendAuthClient {
             requestHeaders,
             user,
         });
-        const cookieRefreshHeaders = (await this.createCookieRefreshHeaders({
-            userIdResult,
-            requestHeaders,
-        })) || {};
+        const cookieRefreshHeaders = allowUserAuthRefresh
+            ? await this.createCookieRefreshHeaders({
+                userIdResult,
+                requestHeaders,
+            })
+            : undefined;
+        /**
+         * Always include the CSRF cookie so it gets re-established if the browser clears it. When
+         * session refresh fires, its headers already include a CSRF cookie.
+         */
+        const csrfCookie = generateCsrfCookie(userIdResult.csrfToken, {
+            hostOrigin: (await this.config.generateServiceOrigin?.({
+                requestHeaders,
+            })) || this.config.serviceOrigin,
+            isDev: this.config.isDev,
+        });
         return {
             user: assumedUser || user,
             isAssumed: !!assumedUser,
-            responseHeaders: allowUserAuthRefresh ? cookieRefreshHeaders : {},
+            responseHeaders: {
+                'set-cookie': mergeHeaderValues(cookieRefreshHeaders?.['set-cookie'], csrfCookie),
+            },
         };
     }
     /**
@@ -273,18 +286,22 @@ export class BackendAuthClient {
      * generating a new one.
      */
     async refreshLoginHeaders({ userId, cookieParams, existingUserIdResult, }) {
-        const { cookie } = await generateAuthCookie({
+        const authCookie = await generateAuthCookie({
             csrfToken: existingUserIdResult.csrfToken,
             userId,
             sessionStartedAt: existingUserIdResult.sessionStartedAt,
         }, cookieParams);
+        const csrfCookie = generateCsrfCookie(existingUserIdResult.csrfToken, cookieParams);
         return {
-            'set-cookie': cookie,
+            'set-cookie': [
+                authCookie,
+                csrfCookie,
+            ],
         };
     }
     /** Use these headers to log a user in. */
     async createLoginHeaders({ userId, requestHeaders, isSignUpCookie, }) {
-        const oppositeCookieName = isSignUpCookie ? AuthCookieName.Auth : AuthCookieName.SignUp;
+        const oppositeCookieName = isSignUpCookie ? AuthCookie.Auth : AuthCookie.SignUp;
         const hasExistingOppositeCookie = requestHeaders.cookie?.includes(`${oppositeCookieName}=`);
         const discardOppositeCookieHeaders = hasExistingOppositeCookie
             ? generateLogoutHeaders(await this.getCookieParams({
@@ -292,7 +309,7 @@ export class BackendAuthClient {
                 requestHeaders,
             }))
             : undefined;
-        const existingUserIdResult = await extractUserIdFromRequestHeaders(requestHeaders, await this.getJwtParams(), this.config.csrf, isSignUpCookie ? AuthCookieName.SignUp : AuthCookieName.Auth);
+        const existingUserIdResult = await extractUserIdFromRequestHeaders(requestHeaders, await this.getJwtParams(), this.config.csrf, isSignUpCookie ? AuthCookie.SignUp : AuthCookie.Auth);
         const cookieParams = await this.getCookieParams({
             isSignUpCookie,
             requestHeaders,
@@ -303,7 +320,7 @@ export class BackendAuthClient {
                 cookieParams,
                 existingUserIdResult,
             })
-            : await generateSuccessfulLoginHeaders(userId, cookieParams, this.config.csrf);
+            : await generateSuccessfulLoginHeaders(userId, cookieParams);
         return {
             ...newCookieHeaders,
             'set-cookie': mergeHeaderValues(newCookieHeaders['set-cookie'], discardOppositeCookieHeaders?.['set-cookie']),
@@ -337,7 +354,7 @@ export class BackendAuthClient {
      */
     async getInsecureUser({ requestHeaders, allowUserAuthRefresh, }) {
         // eslint-disable-next-line @typescript-eslint/no-deprecated
-        const userIdResult = await insecureExtractUserIdFromCookieAlone(requestHeaders, await this.getJwtParams(), AuthCookieName.Auth);
+        const userIdResult = await insecureExtractUserIdFromCookieAlone(requestHeaders, await this.getJwtParams(), AuthCookie.Auth);
         if (!userIdResult) {
             this.logForUser({
                 user: undefined,

package/dist/auth-client/frontend-auth.client.d.ts

@@ -1,7 +1,6 @@
 import { type createBlockingInterval, type JsonCompatibleObject, type MaybePromise, type PartialWithUndefined, type SelectFrom } from '@augment-vir/common';
 import { type AnyDuration } from 'date-vir';
 import { type EmptyObject } from 'type-fest';
-import { type CsrfTokenStore } from '../csrf-token-store.js';
 import { type CsrfHeaderNameOption } from '../csrf-token.js';
 /**
  * Config for {@link FrontendAuthClient}.
@@ -49,16 +48,12 @@ export type FrontendAuthClientConfig = Readonly<{
      * another user.
      */
     assumedUserHeaderName: string;
-    /**
-     * Allowed clock skew tolerance for CSRF token expiration checks. Accounts for differences
-     * between server and client clocks.
-     *
-     * @default {minutes: 5}
-     */
-    allowedClockSkew: Readonly<AnyDuration>;
     overrides: PartialWithUndefined<{
-        localStorage: Pick<Storage, 'setItem' | 'removeItem' | 'getItem'>;
-        csrfTokenStore: CsrfTokenStore;
+        localStorage: SelectFrom<Storage, {
+            setItem: true;
+            removeItem: true;
+            getItem: true;
+        }>;
     }>;
 }>;
 /**
@@ -79,8 +74,6 @@ export declare class FrontendAuthClient<AssumedUserParams extends JsonCompatible
      * interval).
      */
     destroy(): void;
-    /** Wraps {@link getCurrentCsrfToken} to automatically handle wiping an invalid CSRF token. */
-    getCurrentCsrfToken(): Promise<string | undefined>;
     /**
      * Assume the given user. Pass `undefined` to wipe the currently assumed user.
      *
@@ -95,17 +88,16 @@ export declare class FrontendAuthClient<AssumedUserParams extends JsonCompatible
      * `@augment-vir/common`](https://electrovir.github.io/augment-vir/functions/mergeDeep.html) to
      * combine them with these.
      */
-    createAuthenticatedRequestInit(): Promise<RequestInit>;
+    createAuthenticatedRequestInit(): RequestInit;
     /** Wipes the current user auth. */
     logout(): Promise<void>;
     /**
-     * Use to handle a login response. Automatically stores the CSRF token.
+     * Use to handle a login response. The CSRF token cookie is automatically stored by the browser
+     * from the `Set-Cookie` response header.
      *
      * @throws Error if the login response failed.
-     * @throws Error if the login response has an invalid CSRF token.
      */
     handleLoginResponse(response: Readonly<SelectFrom<Response, {
-        headers: true;
         ok: true;
     }>>): Promise<void>;
     /**

package/dist/auth-client/frontend-auth.client.js

@@ -1,6 +1,6 @@
 import { HttpStatus, } from '@augment-vir/common';
 import { listenToActivity } from 'detect-activity';
-import { defaultAllowedClockSkew, extractCsrfTokenHeader, getCurrentCsrfToken, resolveCsrfHeaderName, storeCsrfToken, } from '../csrf-token.js';
+import { getCurrentCsrfToken, resolveCsrfHeaderName, } from '../csrf-token.js';
 import { AuthHeaderName } from '../headers.js';
 /**
  * An auth client for sending and validating client requests to a backend. This should only be used
@@ -41,18 +41,6 @@ export class FrontendAuthClient {
         this.userCheckInterval?.clearInterval();
         this.removeActivityListener?.();
     }
-    /** Wraps {@link getCurrentCsrfToken} to automatically handle wiping an invalid CSRF token. */
-    async getCurrentCsrfToken() {
-        const csrfTokenResult = await getCurrentCsrfToken({
-            ...this.config.csrf,
-            csrfTokenStore: this.config.overrides?.csrfTokenStore,
-            allowedClockSkew: this.config.allowedClockSkew || defaultAllowedClockSkew,
-        });
-        if (csrfTokenResult.failure) {
-            return undefined;
-        }
-        return csrfTokenResult.csrfToken.token;
-    }
     /**
      * Assume the given user. Pass `undefined` to wipe the currently assumed user.
      *
@@ -90,8 +78,8 @@ export class FrontendAuthClient {
      * `@augment-vir/common`](https://electrovir.github.io/augment-vir/functions/mergeDeep.html) to
      * combine them with these.
      */
-    async createAuthenticatedRequestInit() {
-        const csrfToken = await this.getCurrentCsrfToken();
+    createAuthenticatedRequestInit() {
+        const csrfToken = getCurrentCsrfToken();
         const assumedUser = this.getAssumedUser();
         const headers = {
             ...(csrfToken
@@ -115,27 +103,16 @@ export class FrontendAuthClient {
         await this.config.authClearedCallback?.();
     }
     /**
-     * Use to handle a login response. Automatically stores the CSRF token.
+     * Use to handle a login response. The CSRF token cookie is automatically stored by the browser
+     * from the `Set-Cookie` response header.
      *
      * @throws Error if the login response failed.
-     * @throws Error if the login response has an invalid CSRF token.
      */
     async handleLoginResponse(response) {
         if (!response.ok) {
             await this.logout();
             throw new Error('Login response failed.');
         }
-        const { csrfToken } = extractCsrfTokenHeader(response, this.config.csrf, {
-            allowedClockSkew: this.config.allowedClockSkew || defaultAllowedClockSkew,
-        });
-        if (!csrfToken) {
-            await this.logout();
-            throw new Error('Did not receive any CSRF token.');
-        }
-        await storeCsrfToken(csrfToken, {
-            ...this.config.csrf,
-            csrfTokenStore: this.config.overrides?.csrfTokenStore,
-        });
     }
     /**
      * Use to verify _all_ responses received from the backend. Immediately logs the user out once

package/dist/auth.d.ts

@@ -1,7 +1,6 @@
-import { type PartialWithUndefined } from '@augment-vir/common';
+import { type SelectFrom } from '@augment-vir/common';
 import { type FullDate, type UtcTimezone } from 'date-vir';
-import { type CookieParams } from './cookie.js';
-import { type CsrfTokenStore } from './csrf-token-store.js';
+import { AuthCookie, type CookieParams } from './cookie.js';
 import { type CsrfHeaderNameOption } from './csrf-token.js';
 import { type ParseJwtParams } from './jwt/jwt.js';
 import { type JwtUserData } from './jwt/user-jwt.js';
@@ -21,7 +20,7 @@ export type UserIdResult<UserId extends string | number> = {
     jwtExpiration: FullDate<UtcTimezone>;
     /** When the JWT was issued (`iat` claim). */
     jwtIssuedAt: FullDate<UtcTimezone>;
-    cookieName: string;
+    cookieName: AuthCookie;
     /** The CSRF token embedded in the JWT. */
     csrfToken: string;
     /**
@@ -38,7 +37,7 @@ export type UserIdResult<UserId extends string | number> = {
  * @category Auth : Host
  * @returns The extracted user id or `undefined` if no valid auth headers exist.
  */
-export declare function extractUserIdFromRequestHeaders<UserId extends string | number>(headers: HeaderContainer, jwtParams: Readonly<ParseJwtParams>, csrfHeaderNameOption: Readonly<CsrfHeaderNameOption>, cookieName?: string): Promise<Readonly<UserIdResult<UserId>> | undefined>;
+export declare function extractUserIdFromRequestHeaders<UserId extends string | number>(headers: HeaderContainer, jwtParams: Readonly<ParseJwtParams>, csrfHeaderNameOption: Readonly<CsrfHeaderNameOption>, cookieName?: AuthCookie): Promise<Readonly<UserIdResult<UserId>> | undefined>;
 /**
  * Extract a user id from just the cookie, without CSRF token validation. This is _less secure_ than
  * {@link extractUserIdFromRequestHeaders} as a result. This should only be used in rare
@@ -47,41 +46,29 @@ export declare function extractUserIdFromRequestHeaders<UserId extends string |
  * @deprecated Prefer {@link extractUserIdFromRequestHeaders} instead: it is more secure.
  * @category Auth : Host
  */
-export declare function insecureExtractUserIdFromCookieAlone<UserId extends string | number>(headers: HeaderContainer, jwtParams: Readonly<ParseJwtParams>, cookieName?: string): Promise<Readonly<UserIdResult<UserId>> | undefined>;
+export declare function insecureExtractUserIdFromCookieAlone<UserId extends string | number>(headers: HeaderContainer, jwtParams: Readonly<ParseJwtParams>, cookieName: AuthCookie): Promise<Readonly<UserIdResult<UserId>> | undefined>;
 /**
- * Used by host (backend) code to set headers on a response object.
+ * Used by host (backend) code to set headers on a response object. Sets both the auth JWT cookie
+ * and the CSRF token cookie. The CSRF cookie is not `HttpOnly` so that frontend JavaScript can read
+ * it and inject the value as a request header.
  *
  * @category Auth : Host
  */
 export declare function generateSuccessfulLoginHeaders(
 /** The id from your database of the user you're authenticating. */
-userId: string | number, cookieConfig: Readonly<CookieParams>, csrfHeaderNameOption: Readonly<CsrfHeaderNameOption>, 
+userId: string | number, cookieConfig: Readonly<CookieParams>, 
 /**
  * The timestamp (in seconds) when the session originally started. If not provided, the current
  * time will be used (for new sessions).
  */
-sessionStartedAt?: number | undefined): Promise<Record<string, string>>;
+sessionStartedAt?: number | undefined): Promise<Record<string, string[]>>;
 /**
  * Used by host (backend) code to set headers on a response object when the user has logged out or
  * failed to authorize.
  *
  * @category Auth : Host
  */
-export declare function generateLogoutHeaders(cookieConfig: Readonly<Pick<CookieParams, 'cookieName' | 'hostOrigin' | 'isDev'>>): Record<string, string>;
-/**
- * Store auth data on a client (frontend) after receiving an auth response from the host (backend).
- * Specifically, this stores the CSRF token into IndexedDB (which doesn't need to be a secret).
- * Alternatively, if the given response failed, this will wipe the existing (if any) stored CSRF
- * token.
- *
- * @category Auth : Client
- * @throws Error if no CSRF token header is found.
- */
-export declare function handleAuthResponse(response: Readonly<Pick<Response, 'ok' | 'headers'>>, options: Readonly<CsrfHeaderNameOption> & PartialWithUndefined<{
-    /**
-     * Allows mocking or overriding the default CSRF token store.
-     *
-     * @default getDefaultCsrfTokenStore()
-     */
-    csrfTokenStore: CsrfTokenStore;
-}>): Promise<void>;
+export declare function generateLogoutHeaders(cookieConfig: Readonly<SelectFrom<CookieParams, {
+    hostOrigin: true;
+    isDev: true;
+}>>): Record<string, string[]>;

package/dist/auth.js

@@ -1,5 +1,5 @@
-import { AuthCookieName, clearAuthCookie, extractCookieJwt, generateAuthCookie, } from './cookie.js';
-import { extractCsrfTokenHeader, generateCsrfToken, parseCsrfToken, resolveCsrfHeaderName, storeCsrfToken, } from './csrf-token.js';
+import { AuthCookie, clearAuthCookie, clearCsrfCookie, extractCookieJwt, generateAuthCookie, generateCsrfCookie, } from './cookie.js';
+import { generateCsrfToken, resolveCsrfHeaderName } from './csrf-token.js';
 function readHeader(headers, headerName) {
     if (headers instanceof Headers) {
         return headers.get(headerName) || undefined;
@@ -18,12 +18,7 @@ function readHeader(headers, headerName) {
     }
 }
 function readCsrfTokenHeader(headers, csrfHeaderNameOption) {
-    const rawCsrfToken = readHeader(headers, resolveCsrfHeaderName(csrfHeaderNameOption));
-    if (!rawCsrfToken) {
-        return undefined;
-    }
-    const token = parseCsrfToken(rawCsrfToken).csrfToken?.token || rawCsrfToken;
-    return token;
+    return readHeader(headers, resolveCsrfHeaderName(csrfHeaderNameOption));
 }
 /**
  * Extract the user id from a request by checking both the request cookie and CSRF token. This is
@@ -33,7 +28,7 @@ function readCsrfTokenHeader(headers, csrfHeaderNameOption) {
  * @category Auth : Host
  * @returns The extracted user id or `undefined` if no valid auth headers exist.
  */
-export async function extractUserIdFromRequestHeaders(headers, jwtParams, csrfHeaderNameOption, cookieName = AuthCookieName.Auth) {
+export async function extractUserIdFromRequestHeaders(headers, jwtParams, csrfHeaderNameOption, cookieName = AuthCookie.Auth) {
     try {
         const csrfToken = readCsrfTokenHeader(headers, csrfHeaderNameOption);
         const cookie = readHeader(headers, 'cookie');
@@ -65,7 +60,7 @@ export async function extractUserIdFromRequestHeaders(headers, jwtParams, csrfHe
  * @deprecated Prefer {@link extractUserIdFromRequestHeaders} instead: it is more secure.
  * @category Auth : Host
  */
-export async function insecureExtractUserIdFromCookieAlone(headers, jwtParams, cookieName = AuthCookieName.Auth) {
+export async function insecureExtractUserIdFromCookieAlone(headers, jwtParams, cookieName) {
     try {
         const cookie = readHeader(headers, 'cookie');
         if (!cookie) {
@@ -89,31 +84,32 @@ export async function insecureExtractUserIdFromCookieAlone(headers, jwtParams, c
     }
 }
 /**
- * Used by host (backend) code to set headers on a response object.
+ * Used by host (backend) code to set headers on a response object. Sets both the auth JWT cookie
+ * and the CSRF token cookie. The CSRF cookie is not `HttpOnly` so that frontend JavaScript can read
+ * it and inject the value as a request header.
  *
  * @category Auth : Host
  */
 export async function generateSuccessfulLoginHeaders(
 /** The id from your database of the user you're authenticating. */
-userId, cookieConfig, csrfHeaderNameOption, 
+userId, cookieConfig, 
 /**
  * The timestamp (in seconds) when the session originally started. If not provided, the current
  * time will be used (for new sessions).
  */
 sessionStartedAt) {
-    const csrfToken = generateCsrfToken(cookieConfig.cookieDuration);
-    const csrfHeaderName = resolveCsrfHeaderName(csrfHeaderNameOption);
-    const { cookie, expiration } = await generateAuthCookie({
-        csrfToken: csrfToken.token,
+    const csrfToken = generateCsrfToken();
+    const authCookie = await generateAuthCookie({
+        csrfToken,
         userId,
         sessionStartedAt: sessionStartedAt ?? Date.now(),
     }, cookieConfig);
+    const csrfCookie = generateCsrfCookie(csrfToken, cookieConfig);
     return {
-        'set-cookie': cookie,
-        [csrfHeaderName]: JSON.stringify({
-            token: csrfToken.token,
-            expiration,
-        }),
+        'set-cookie': [
+            authCookie,
+            csrfCookie,
+        ],
     };
 }
 /**
@@ -124,25 +120,9 @@ sessionStartedAt) {
  */
 export function generateLogoutHeaders(cookieConfig) {
     return {
-        'set-cookie': clearAuthCookie(cookieConfig),
+        'set-cookie': [
+            clearAuthCookie(cookieConfig),
+            clearCsrfCookie(cookieConfig),
+        ],
     };
 }
-/**
- * Store auth data on a client (frontend) after receiving an auth response from the host (backend).
- * Specifically, this stores the CSRF token into IndexedDB (which doesn't need to be a secret).
- * Alternatively, if the given response failed, this will wipe the existing (if any) stored CSRF
- * token.
- *
- * @category Auth : Client
- * @throws Error if no CSRF token header is found.
- */
-export async function handleAuthResponse(response, options) {
-    if (!response.ok) {
-        return;
-    }
-    const { csrfToken } = extractCsrfTokenHeader(response, options);
-    if (!csrfToken) {
-        throw new Error('Did not receive any CSRF token.');
-    }
-    await storeCsrfToken(csrfToken, options);
-}