Skip to content

fix: improve cookie options handling and expiration logic #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: improve cookie options handling and expiration logic #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/runtime/composables/useCookieConsent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,19 @@ import { computed } from '#imports'
export function useCookieConsent() {
const config = useRuntimeConfig().public.cookieConsent as ModuleOptions
const cookieName = config.cookieName || 'cookie_consent'
const expiresInDays = config.expiresInDays ?? 180
const maxAgeInSeconds = expiresInDays * 24 * 60 * 60
const expiresInMs = expiresInDays * 24 * 60 * 60 * 1000
const expiresDate = new Date(Date.now() + expiresInMs)

const cookieOptions = {
sameSite: 'lax' as const,
maxAge: maxAgeInSeconds,
expires: expiresDate,
path: '/'
}

const consentTimestamp = useCookie<number | null>('cookie_consent_timestamp')
const expiresInMs = (config.expiresInDays ?? 180) * 24 * 60 * 60 * 1000
const consentTimestamp = useCookie<number | null>('cookie_consent_timestamp', cookieOptions)

const isConsentExpired = computed(() => {
return consentTimestamp.value
Expand All @@ -23,7 +33,7 @@ export function useCookieConsent() {
})

const state = useState<Record<string, boolean>>('cookieConsent', () => {
return useCookie<Record<string, boolean>>(cookieName).value || {}
return useCookie<Record<string, boolean>>(cookieName, cookieOptions).value || {}
})

const hasUserMadeChoice = computed(() => {
Expand Down Expand Up @@ -71,9 +81,9 @@ export function useCookieConsent() {
}

state.value = updated
useCookie(cookieName).value = JSON.stringify(updated)
useCookie('cookie_consent_timestamp').value = Date.now().toString()
useCookie('cookie_consent_version').value = config.consentVersion || '1'
useCookie(cookieName, cookieOptions).value = JSON.stringify(updated)
useCookie('cookie_consent_timestamp', cookieOptions).value = Date.now().toString()
useCookie('cookie_consent_version', cookieOptions).value = config.consentVersion || '1'

if (import.meta.client && Array.isArray(config.scripts)) {
removeScripts(updated)
Expand Down
13 changes: 12 additions & 1 deletion src/runtime/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,30 @@ import { defineNuxtPlugin, useCookie, useRuntimeConfig, useState } from '#app'
export default defineNuxtPlugin(() => {
const config = useRuntimeConfig().public.cookieConsent as ModuleOptions
const cookieName = config.cookieName || 'cookie_consent'
const expiresInDays = config.expiresInDays ?? 180
const maxAgeInSeconds = expiresInDays * 24 * 60 * 60
const expiresDate = new Date(Date.now() + maxAgeInSeconds * 1000)

const stored = useCookie<Record<string, boolean> | null>(cookieName, {
sameSite: 'lax',
path: '/',
maxAge: maxAgeInSeconds,
expires: expiresDate,
path: '/'
}, {
watch: true
})

const versionCookie = useCookie<string | null>('cookie_consent_version', {
sameSite: 'lax',
maxAge: maxAgeInSeconds,
expires: expiresDate,
path: '/',
})

const timestampCookie = useCookie<number | null>('cookie_consent_timestamp', {
sameSite: 'lax',
maxAge: maxAgeInSeconds,
expires: expiresDate,
path: '/',
})

Expand Down