@data-fair/lib-vue 1.10.4 → 1.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.10.4",
+  "version": "1.12.0",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [

package/session.js

@@ -1,3 +1,4 @@
+import { FetchError } from 'ofetch'
 import { reactive, computed, watch, inject, ref } from 'vue'
 import { ofetch } from 'ofetch'
 import { jwtDecode } from 'jwt-decode'
@@ -13,13 +14,12 @@ function jwtDecodeAlive (jwt) {
   if (!decoded) { return }
   const now = Math.ceil(Date.now().valueOf() / 1000)
   if (typeof decoded.exp !== 'undefined' && decoded.exp < now) {
-    console.error(`token expired: ${decoded.exp}<${now},  ${JSON.stringify(decoded)}`)
+    // token expired
     return
   }
   if (typeof decoded.nbf !== 'undefined' && decoded.nbf > now) {
     console.warn(`token not yet valid: ${decoded.nbf}>${now}, ${JSON.stringify(decoded)}`)
-    // do not return null here, this is probably a false flag due to a slightly mismatched clock
-    // return null
+    // do not return here, this is probably a false flag due to a slightly mismatched clock
   }
   return decoded
 }
@@ -211,8 +211,16 @@ export async function getSession (initOptions) {
     if (!ssr) {
       window.localStorage.setItem('sd-keepalive' + options.sitePath, `${new Date().getTime()}`)
     }
-    await customFetch(`${options.directoryUrl}/api/auth/keepalive`, { method: 'POST' })
-    readState()
+    try {
+      await customFetch(`${options.directoryUrl}/api/auth/keepalive`, { method: 'POST' })
+    } catch (err) {
+      if (err instanceof FetchError && err.statusCode === 401) {
+        console.warn('session was expired or deleted server side')
+      } else {
+        throw err
+      }
+      readState()
+    }
   }
   const refreshSiteInfo = async () => {
     const siteInfo = await customFetch(`${options.directoryUrl}/api/sites/_public`) ?? null
@@ -224,7 +232,8 @@ export async function getSession (initOptions) {
   // also run an auto-refresh loop
   if (!ssr && !inIframe) {
     const lastKeepalive = window.localStorage.getItem('sd-keepalive' + options.sitePath)
-    if (state.user && (!lastKeepalive || (new Date().getTime() - Number(lastKeepalive)) > 10000)) {
+    // check cookies.get('id_token') not state.user so that we do a keepalive on expired id tokens
+    if (cookies.get('id_token') && (!lastKeepalive || (new Date().getTime() - Number(lastKeepalive)) > 10000)) {
       await keepalive()
     }
     const refreshLoopDelay = 10 * 60 * 1000 // 10 minutes