@data-fair/lib-vue 1.8.0 → 1.9.1

package/package.json

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

package/session.d.ts

@@ -12,6 +12,7 @@ interface GenericCookies {
 export interface SessionOptions {
     sitePath: string;
     directoryUrl: string;
+    defaultLang: string;
     route?: RouteLocation;
     logoutRedirectUrl?: string;
     req?: IncomingMessage;
@@ -19,12 +20,22 @@ export interface SessionOptions {
     customFetch?: typeof fetch;
     siteInfo?: boolean;
 }
-export interface Theme {
-    primaryColor: string;
+export interface Colors {
+    background: string;
+    surface: string;
+    primary: string;
+    secondary: string;
+    accent: string;
+    error: string;
+    info: string;
+    success: string;
+    warning: string;
+    admin: string;
 }
 export interface SiteInfo {
-    theme: Theme;
+    main?: boolean;
     logo?: string;
+    colors: Colors;
 }
 export interface Session {
     state: SessionState;

package/session.js

@@ -3,6 +3,7 @@ import { ofetch } from 'ofetch'
 import { jwtDecode } from 'jwt-decode'
 import cookiesModule from 'universal-cookie'
 import Debug from 'debug'
+import inIframe from '@data-fair/lib-utils/in-iframe.js'
 const Cookies = cookiesModule
 const debug = Debug('session')
 debug.log = console.log.bind(console)
@@ -36,7 +37,11 @@ const goTo = (url) => {
   }
   if (url) { topLocation.href = url } else { topLocation.reload() }
 }
-const defaultOptions = { directoryUrl: '/simple-directory', sitePath: '' }
+const getSiteInfoStorage = (sitePath) => {
+  const siteInfoStorageStr = window.localStorage.getItem('sd-site-info' + sitePath)
+  return siteInfoStorageStr ? JSON.parse(siteInfoStorageStr) : null
+}
+const defaultOptions = { directoryUrl: '/simple-directory', sitePath: '', defaultLang: 'fr' }
 export async function getSession (initOptions) {
   const options = { ...defaultOptions, ...initOptions }
   const cookiesPath = options.sitePath + '/'
@@ -62,7 +67,7 @@ export async function getSession (initOptions) {
     const darkCookie = cookies.get('theme_dark')
     state.dark = darkCookie === '1' || darkCookie === 'true'
     const langCookie = cookies.get('i18n_lang')
-    if (langCookie) { state.lang = langCookie } else { delete state.lang }
+    state.lang = langCookie ?? options.defaultLang
     const idToken = cookies.get('id_token')
     const user = jwtDecodeAlive(idToken)
     if (!user) {
@@ -109,7 +114,7 @@ export async function getSession (initOptions) {
       state.accountRole = 'admin'
     }
     if (!ssr) {
-      const siteInfoStorage = getSiteInfoStorage()
+      const siteInfoStorage = getSiteInfoStorage(options.sitePath)
       site.value = siteInfoStorage ? siteInfoStorage.info : null
     }
   }
@@ -217,10 +222,6 @@ export async function getSession (initOptions) {
     await customFetch(`${options.directoryUrl}/api/auth/keepalive`, { method: 'POST' })
     readState()
   }
-  const getSiteInfoStorage = () => {
-    const siteInfoStorageStr = window.localStorage.getItem('sd-site-info' + options.sitePath)
-    return siteInfoStorageStr ? JSON.parse(siteInfoStorageStr) : null
-  }
   const setSiteInfoStorage = (siteInfo) => {
     const siteInfoStorage = { info: siteInfo, updatedAt: new Date().getTime() }
     window.localStorage.setItem('sd-site-info' + options.sitePath, JSON.stringify(siteInfoStorage))
@@ -235,13 +236,13 @@ export async function getSession (initOptions) {
   // immediately performs a keepalive, but only on top windows (not iframes or popups)
   // and only if it was not done very recently (maybe from a refreshed page next to this one)
   // also run an auto-refresh loop
-  if (!ssr && window.top === window.self) {
+  if (!ssr && !inIframe) {
     const lastKeepalive = window.localStorage.getItem('sd-keepalive' + options.sitePath)
-    if (!lastKeepalive || (new Date().getTime() - Number(lastKeepalive)) > 10000) {
+    if (state.user && (!lastKeepalive || (new Date().getTime() - Number(lastKeepalive)) > 10000)) {
       await keepalive()
     }
     if (options.siteInfo) {
-      const lastSiteInfoStorage = getSiteInfoStorage()
+      const lastSiteInfoStorage = getSiteInfoStorage(options.sitePath)
       if (!lastSiteInfoStorage || (new Date().getTime() - Number(lastSiteInfoStorage.updatedAt)) > 10000) {
         await refreshSiteInfo()
       }