@dargmuesli/nuxt-vio 14.0.1 → 14.0.2

package/.config/lint.js

@@ -6,11 +6,12 @@ import eslintPluginCompat from 'eslint-plugin-compat'
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
 import eslintPluginYml from 'eslint-plugin-yml'
 import globals from 'globals'
-import jiti from 'jiti'
+import { createJiti } from 'jiti'
 
-const moduleFileUrl = new URL(import.meta.url)
-const JITI = jiti(moduleFileUrl.pathname)
-const POLYFILLS = JITI('../utils/constants.ts').POLYFILLS
+const jiti = createJiti(import.meta.url)
+const constants = await jiti.import('../utils/constants.ts')
+// @ts-ignore
+const POLYFILLS = constants.POLYFILLS
 
 const vueI18nConfiguration = vueI18n.configs['flat/recommended']
 const compatConfiguration = eslintPluginCompat.configs['flat/recommended']

package/composables/useVioGtag.ts

@@ -1,5 +1,3 @@
-import { GTAG_COOKIE_ID } from '../utils/constants'
-
 export const useVioGtag = () => {
   const {
     gtag,
@@ -8,9 +6,27 @@ export const useVioGtag = () => {
     enableAnalytics,
   } = useGtag()
   const cookieControl = useCookieControl()
+  const updateConsent = ({ isGranted }: { isGranted: boolean }) => {
+    gtag('consent', 'update', {
+      // // the following are denied per default in the gtag module configuration
+      // ad_user_data: 'denied',
+      // ad_personalization: 'denied',
+      // ad_storage: 'denied',
+      analytics_storage: isGranted ? 'granted' : 'denied',
+    })
+  }
+  const enableGtag = () => {
+    updateConsent({ isGranted: true })
+    initializeGtag()
+    enableAnalytics()
+  }
+  const disableGtag = () => {
+    updateConsent({ isGranted: false })
+    disableAnalytics()
+  }
 
   if (cookieControl.cookiesEnabledIds.value?.includes(GTAG_COOKIE_ID)) {
-    initializeGtag()
+    enableGtag()
   }
 
   watch(cookieControl.cookiesEnabledIds, (current, previous) => {
@@ -18,21 +34,14 @@ export const useVioGtag = () => {
       !previous?.includes(GTAG_COOKIE_ID) &&
       current?.includes(GTAG_COOKIE_ID)
     ) {
-      gtag('consent', 'update', {
-        ad_user_data: 'denied',
-        ad_personalization: 'denied',
-        ad_storage: 'denied',
-        analytics_storage: 'granted',
-      })
-      initializeGtag()
-      enableAnalytics()
+      enableGtag()
     }
 
     if (
       previous?.includes(GTAG_COOKIE_ID) &&
       !current?.includes(GTAG_COOKIE_ID)
     ) {
-      disableAnalytics()
+      disableGtag()
     }
   })
 }

package/nuxt.config.ts

@@ -224,7 +224,6 @@ export default defineNuxtConfig(
             'frame-src': false as const,
             'img-src': false as const,
             'media-src': false as const,
-            'navigate-to': false as const,
             'object-src': false as const,
             'prefetch-src': false as const,
             'report-to': undefined,

package/package.json

@@ -43,7 +43,7 @@
     "cookie-es": "1.2.2",
     "defu": "6.1.4",
     "h3": "1.12.0",
-    "jiti": "1.21.6",
+    "jiti": "2.0.0",
     "lodash-es": "4.17.21",
     "nuxt": "3.13.2",
     "pinia": "2.2.2",
@@ -117,5 +117,5 @@
     "start:static": "serve .playground/.output/public --ssl-cert ./.config/certificates/ssl.crt --ssl-key ./.config/certificates/ssl.key"
   },
   "type": "module",
-  "version": "14.0.1"
+  "version": "14.0.2"
 }

package/utils/auth.ts

@@ -1,70 +1,65 @@
-import type { IncomingMessage, ServerResponse } from 'node:http'
-
+import type { Client } from '@urql/vue'
 import { consola } from 'consola'
-import { parse, serialize } from 'cookie-es'
+import { type H3Event, setCookie } from 'h3'
 import { decodeJwt } from 'jose'
-import type { Store } from 'pinia'
 
 import { useVioAuthStore } from '../store/auth'
 import { JWT_NAME } from './constants'
 
-export const getJwtFromCookie = ({ req }: { req: IncomingMessage }) => {
-  if (req.headers.cookie) {
-    const cookies = parse(req.headers.cookie)
+export const getJwtFromCookie = () => {
+  const cookie = useCookie(JWT_NAME())
 
-    if (cookies[JWT_NAME()]) {
-      const cookie = decodeJwt(cookies[JWT_NAME()])
+  if (!cookie.value) {
+    consola.debug('No token cookie.')
+    return
+  }
 
-      if (cookie.exp !== undefined && cookie.exp > Date.now() / 1000) {
-        return {
-          jwt: cookies[JWT_NAME()],
-          jwtDecoded: cookie,
-        }
-      } else {
-        consola.info('Token expired.')
-      }
-    } else {
-      consola.debug('No token cookie.')
-    }
-  } else {
-    consola.debug('No cookie header.')
+  const jwt = decodeJwt(cookie.value)
+
+  if (jwt.exp === undefined || jwt.exp <= Date.now() / 1000) {
+    consola.info('Token expired.')
+    return
+  }
+
+  return {
+    jwt: cookie.value,
+    jwtDecoded: jwt,
   }
 }
 
 export const jwtStore = async ({
   $urqlReset,
-  store,
-  res,
+  event,
+  isInProduction,
   jwt,
+  store,
 }: {
-  $urqlReset: () => void
-  store: Store
-  res?: ServerResponse
+  $urqlReset: () => Client
+  event?: H3Event
+  isInProduction: boolean
   jwt?: string
+  store: ReturnType<typeof useVioAuthStore>
 }) => {
   $urqlReset()
 
   consola.trace('Storing the following JWT: ' + jwt)
-  ;(store as unknown as { jwtSet: (jwtNew?: string) => void }).jwtSet(jwt)
+  store.jwtSet(jwt)
 
-  if (import.meta.server) {
-    res?.setHeader(
-      'Set-Cookie',
-      serialize(JWT_NAME(), jwt || '', {
-        expires: jwt ? new Date(Date.now() + 86400 * 1000 * 31) : new Date(0),
-        httpOnly: true,
-        path: '/',
-        sameSite: 'lax', // Cannot be 'strict' to allow authentications after clicking on links within webmailers.
-        secure: true,
-      }),
-    )
+  if (event) {
+    setCookie(event, JWT_NAME(), jwt || '', {
+      expires: jwt ? new Date(Date.now() + 86400 * 1000 * 31) : new Date(0),
+      httpOnly: true,
+      path: '/',
+      sameSite: 'lax', // Cannot be 'strict' to allow authentications after clicking on links within webmailers.
+      secure: isInProduction,
+    })
   } else {
     try {
       await $fetch('/api/auth', {
         method: 'POST',
         ...(jwt ? { headers: { Authorization: `Bearer ${jwt}` } } : {}),
       })
-    } catch (error: unknown) {
+    } catch (error) {
       console.error(error)
       return Promise.reject(Error('Authentication api call failed.'))
     }
@@ -74,14 +69,16 @@ export const jwtStore = async ({
 export const useJwtStore = () => {
   const { $urqlReset, ssrContext } = useNuxtApp()
   const store = useVioAuthStore()
+  const runtimeConfig = useRuntimeConfig()
 
   return {
     async jwtStore(jwt?: string) {
       await jwtStore({
-        $urqlReset: $urqlReset as () => void,
-        store,
-        res: ssrContext ? ssrContext.event.node.res : undefined,
+        $urqlReset: $urqlReset as () => Client,
+        event: ssrContext?.event,
+        isInProduction: runtimeConfig.public.vio.isInProduction,
         jwt,
+        store,
       })
     },
   }
@@ -89,27 +86,40 @@ export const useJwtStore = () => {
 
 export const signOut = async ({
   $urqlReset,
+  // client,
+  event,
+  isInProduction,
   store,
-  res,
 }: {
-  $urqlReset: () => void
-  store: Store
-  res?: ServerResponse
-}) => await jwtStore({ $urqlReset, store, res })
+  $urqlReset: () => Client
+  client: Client
+  event?: H3Event
+  isInProduction: boolean
+  store: ReturnType<typeof useVioAuthStore>
+}) => {
+  await jwtStore({ $urqlReset, event, isInProduction, store })
+  // await authenticationAnonymous({
+  //   $urqlReset,
+  //   client,
+  //   event,
+  //   isInProduction,
+  //   store,
+  // })
+}
 
 export const useSignOut = () => {
-  const { $urqlReset, ssrContext } = useNuxtApp()
+  const { $urql, $urqlReset, ssrContext } = useNuxtApp()
   const store = useVioAuthStore()
-
-  if (typeof $urqlReset !== 'function')
-    throw new Error('`$urqlReset` is not a function!')
+  const runtimeConfig = useRuntimeConfig()
 
   return {
     async signOut() {
       await signOut({
-        $urqlReset: $urqlReset as () => void,
+        $urqlReset: $urqlReset as () => Client,
+        client: ($urql as Ref<Client>).value,
+        event: ssrContext?.event,
+        isInProduction: runtimeConfig.public.vio.isInProduction,
         store,
-        res: ssrContext ? ssrContext.event.node.res : undefined,
       })
     },
   }