github-starred/better-auth
2
0
Fork 0
mirror of https://github.com/better-auth/better-auth.git synced 2026-05-23 23:52:05 -05:00
Code Issues 2.5k Packages Projects Releases 112 Wiki Activity

fix(expo): improve cookie expiration handling (#3705)

Browse Source 
* fix: cookie expiration in expo

* changesets
This commit is contained in:
KinfeMichael Tariku
2025-08-01 02:32:54 +03:00
committed by GitHub
parent 685f70ae3d
commit 67f84d5d94
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/olive-toys-pump.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@better-auth/expo": patch
---
fix(expo): improve cookie expiration handling

14
packages/expo/src/client.ts
View File

@@ -50,7 +50,7 @@ interface ExpoClientOptions {
interface StoredCookie { interface StoredCookie {
value: string; value: string;
expires: Date | null; expires: string | null;
} }
export function getSetCookie(header: string, prevCookie?: string) { export function getSetCookie(header: string, prevCookie?: string) {
@@ -59,14 +59,14 @@ export function getSetCookie(header: string, prevCookie?: string) {
parsed.forEach((cookie, key) => { parsed.forEach((cookie, key) => {
const expiresAt = cookie["expires"]; const expiresAt = cookie["expires"];
const maxAge = cookie["max-age"]; const maxAge = cookie["max-age"];
const expires = expiresAt const expires = maxAge
? new Date(String(expiresAt)) ? new Date(Date.now() + Number(maxAge) * 1000)
: maxAge : expiresAt
? new Date(Date.now() + Number(maxAge)) ? new Date(String(expiresAt))
: null; : null;
toSetCookie[key] = { toSetCookie[key] = {
value: cookie["value"], value: cookie["value"],
expires, expires: expires ? expires.toISOString() : null,
}; };
}); });
if (prevCookie) { if (prevCookie) {
@@ -89,7 +89,7 @@ export function getCookie(cookie: string) {
parsed = JSON.parse(cookie) as Record<string, StoredCookie>; parsed = JSON.parse(cookie) as Record<string, StoredCookie>;
} catch (e) {} } catch (e) {}
const toSend = Object.entries(parsed).reduce((acc, [key, value]) => { const toSend = Object.entries(parsed).reduce((acc, [key, value]) => {
if (value.expires && value.expires < new Date()) { if (value.expires && new Date(value.expires) < new Date()) {
return acc; return acc;
} }
return `${acc}; ${key}=${value.value}`; return `${acc}; ${key}=${value.value}`;

8
packages/expo/src/expo.test.ts
View File

@@ -199,11 +199,11 @@ describe("expo with cookieCache", async () => {
expect(storedCookie).toBeDefined(); expect(storedCookie).toBeDefined();
const parsedCookie = JSON.parse(storedCookie || ""); const parsedCookie = JSON.parse(storedCookie || "");
expect(parsedCookie["better-auth.session_token"]).toMatchObject({ expect(parsedCookie["better-auth.session_token"]).toMatchObject({
value: expect.stringMatching(/.+/), value: expect.any(String),
expires: expect.any(String), expires: expect.any(String),
}); });
expect(parsedCookie["better-auth.session_data"]).toMatchObject({ expect(parsedCookie["better-auth.session_data"]).toMatchObject({
value: expect.stringMatching(/.+/), value: expect.any(String),
expires: expect.any(String), expires: expect.any(String),
}); });
}); });
@@ -216,11 +216,11 @@ describe("expo with cookieCache", async () => {
expect(storedCookie).toBeDefined(); expect(storedCookie).toBeDefined();
const parsedCookie = JSON.parse(storedCookie || ""); const parsedCookie = JSON.parse(storedCookie || "");
expect(parsedCookie["better-auth.session_token"]).toMatchObject({ expect(parsedCookie["better-auth.session_token"]).toMatchObject({
value: expect.stringMatching(/^$/), value: expect.any(String),
expires: expect.any(String), expires: expect.any(String),
}); });
expect(parsedCookie["better-auth.session_data"]).toMatchObject({ expect(parsedCookie["better-auth.session_data"]).toMatchObject({
value: expect.stringMatching(/^$/), value: expect.any(String),
expires: expect.any(String), expires: expect.any(String),
}); });
}); });