Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 05:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): account for delay ≤ 0 in useCookie (#24043)

Browse Source
This commit is contained in:
Damian Głowala 2023-11-03 17:20:15 +01:00 committed by GitHub
parent a1e7bf9710
commit 6c48f8b8e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/nuxt/src/app/composables/cookie.ts
View File

@ -32,16 +32,25 @@ export function useCookie<T = string | null | undefined> (name: string, _opts?:
const cookies = readRawCookies(opts) || {} const cookies = readRawCookies(opts) || {}
let delay: number | undefined let delay: number | undefined
if (opts.maxAge) {
if (opts.maxAge !== undefined) {
delay = opts.maxAge * 1000 // convert to ms for setTimeout delay = opts.maxAge * 1000 // convert to ms for setTimeout
} else if (opts.expires) { } else if (opts.expires) {
// getTime() already return time in ms // getTime() already returns time in ms
delay = opts.expires.getTime() - Date.now() delay = opts.expires.getTime() - Date.now()
} }
// use customRef if on client side otherwise use basic ref
const cookie = import.meta.client && delay const hasExpired = delay !== undefined && delay <= 0
? cookieRef<T | undefined>((cookies[name] as any) ?? opts.default?.(), delay) const cookieValue = hasExpired ? undefined : (cookies[name] as any) ?? opts.default?.()
: ref<T | undefined>((cookies[name] as any) ?? opts.default?.())
// use a custom ref to expire the cookie on client side otherwise use basic ref
const cookie = import.meta.client && delay && !hasExpired
? cookieRef<T | undefined>(cookieValue, delay)
: ref<T | undefined>(cookieValue)
if (import.meta.dev && hasExpired) {
console.warn(`[nuxt] not setting cookie \`${name}\` as it has already expired.`)
}
if (import.meta.client) { if (import.meta.client) {
const channel = typeof BroadcastChannel === 'undefined' ? null : new BroadcastChannel(`nuxt:cookies:${name}`) const channel = typeof BroadcastChannel === 'undefined' ? null : new BroadcastChannel(`nuxt:cookies:${name}`)
@ -131,7 +140,7 @@ function writeServerCookie (event: H3Event, name: string, value: any, opts: Cook
} }
} }
// custom ref that will update the value to undefined if the cookie expire // custom ref that will update the value to undefined if the cookie expires
function cookieRef<T> (value: T | undefined, delay: number) { function cookieRef<T> (value: T | undefined, delay: number) {
let timeout: NodeJS.Timeout let timeout: NodeJS.Timeout
onScopeDispose(() => { clearTimeout(timeout) }) onScopeDispose(() => { clearTimeout(timeout) })