@data-fair/lib-vue 1.20.1 → 1.21.0

package/package.json

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

package/session.d.ts

@@ -76,7 +76,7 @@ export interface Session {
     loginUrl: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => string;
     login: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => void;
     logout: (redirect?: string) => Promise<void>;
-    switchOrganization: (org: string | null, dep?: string, updateState?: boolean) => void;
+    switchOrganization: (org: string | null, dep?: string, role?: string, updateState?: boolean) => void;
     setAdminMode: (adminMode: boolean, redirect?: string) => Promise<void>;
     asAdmin: (user: any | null) => Promise<void>;
     cancelDeletion: () => Promise<void>;
@@ -110,7 +110,7 @@ export declare function createSession(initOptions: Partial<SessionOptions>): Pro
     loginUrl: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => string;
     login: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => void;
     logout: (redirect?: string) => Promise<void>;
-    switchOrganization: (org: string | null, dep?: string, updateState?: boolean) => void;
+    switchOrganization: (org: string | null, dep?: string, role?: string, updateState?: boolean) => void;
     setAdminMode: (adminMode: boolean, redirect?: string) => Promise<void>;
     asAdmin: (user: any | null) => Promise<void>;
     cancelDeletion: () => Promise<void>;

package/session.js

@@ -95,12 +95,14 @@ export async function getSession (initOptions) {
     state.user = user
     const organizationId = cookies.get('id_token_org')
     const departmentId = cookies.get('id_token_dep')
+    const switchedRole = cookies.get('id_token_role')
     if (organizationId) {
-      if (departmentId) {
-        state.organization = state.user.organizations.find(o => o.id === organizationId && o.department === departmentId)
-      } else {
-        state.organization = state.user.organizations.find(o => o.id === organizationId)
-      }
+      state.organization = state.user.organizations.find(o => {
+        if (o.id !== organizationId) { return false }
+        if (departmentId && departmentId !== o.department) { return false }
+        if (switchedRole && switchedRole !== o.role) { return false }
+        return true
+      })
     } else {
       delete state.organization
     }
@@ -185,12 +187,14 @@ export async function getSession (initOptions) {
     cookies.remove('id_token')
     cookies.remove('id_token_org')
     cookies.remove('id_token_dep')
+    cookies.remove('id_token_role')
     goTo(redirect ?? options.logoutRedirectUrl ?? null)
   }
-  const switchOrganization = (org, dep, updateState = true) => {
+  const switchOrganization = (org, dep, role, updateState = true) => {
     const cookieOpts = { path: cookiesPath }
     if (org) { cookies.set('id_token_org', org, cookieOpts) } else { cookies.remove('id_token_org', cookieOpts) }
     if (dep) { cookies.set('id_token_dep', dep, cookieOpts) } else { cookies.remove('id_token_dep', cookieOpts) }
+    if (role) { cookies.set('id_token_role', dep, cookieOpts) } else { cookies.remove('id_token_role', cookieOpts) }
     if (updateState) { readState() }
   }
   const setAdminMode = async (adminMode, redirect) => {