@data-fair/lib-node 2.7.1 → 2.8.0

package/axios-auth.d.ts

@@ -9,6 +9,7 @@ export interface AxiosAuthOptions {
     directoryUrl?: string;
     axiosOpts?: any;
     orgStorage?: boolean;
+    globalCookies?: boolean;
 }
 export type AxiosAuthInstance = AxiosInstance & {
     cookieJar: CookieJar;

package/axios-auth.js

@@ -1,8 +1,12 @@
 // build axios instances with sessions on a simple-directory instance
-// used for integration testing
+// WARNING: use for integration testing only
 import { Agent } from 'node:http'
 import { axiosBuilder, axiosInstance } from './axios.js'
 import { CookieJar } from 'tough-cookie'
+const getConfigUrl = (config) => {
+  if (!config.url) { throw new Error('url is required') }
+  return new URL((config.baseURL && config.url?.startsWith('/')) ? (config.baseURL + config.url) : config.url)
+}
 export async function axiosAuth (opts) {
   const body = { email: opts.email, password: opts.password }
   if (opts.org) { body.org = opts.org }
@@ -20,7 +24,7 @@ export async function axiosAuth (opts) {
     callbackUrl = callbackUrl.replace(directoryUrl + '/simple-directory', directoryUrl)
   }
   const cookieJar = new CookieJar()
-  const origin = new URL(directoryUrl).origin
+  const sdOrigin = new URL(directoryUrl).origin
   try {
     await axiosInstance.get(callbackUrl, { maxRedirects: 0 })
   } catch (err) {
@@ -28,20 +32,28 @@ export async function axiosAuth (opts) {
     const redirectUrl = new URL(err.headers.location)
     const redirectError = redirectUrl.searchParams.get('error')
     if (redirectError) { throw new Error(redirectError) }
-    for (const cookie of err.headers['set-cookie'] ?? []) { cookieJar.setCookieSync(cookie, origin) }
+    for (const cookie of err.headers['set-cookie'] ?? []) { cookieJar.setCookieSync(cookie, sdOrigin) }
   }
   const ax = axiosBuilder(axiosOpts, (ax) => {
     ax.interceptors.request.use((config) => {
-      const url = (config.baseURL && config.url?.startsWith('/')) ? (config.baseURL + config.url) : config.url
-      config.headers.Cookie = cookieJar.getCookiesSync(url ?? origin)
+      const url = getConfigUrl(config)
+      // if opts.globalCookies is true the cookie jar is used to store cookies shared accross all domains
+      // this behavior is useful for testing purposes if serves are not on the same domain
+      if (!opts.globalCookies || url.origin === sdOrigin) {
+        config.headers.Cookie = cookieJar.getCookiesSync(url.href)
+      } else {
+        config.headers.Cookie = cookieJar.getCookiesSync(sdOrigin)
+      }
       return config
     })
     ax.interceptors.response.use((res) => {
+      const origin = opts.globalCookies ? sdOrigin : getConfigUrl(res.config).origin
       for (const cookie of res.headers['set-cookie'] ?? []) { cookieJar.setCookieSync(cookie, origin) }
       return res
     }, async (error) => {
       const res = error.response
       if (res) {
+        const origin = opts.globalCookies ? sdOrigin : getConfigUrl(res.config).origin
         for (const cookie of res.headers['set-cookie'] ?? []) { cookieJar.setCookieSync(cookie, origin) }
       }
       return Promise.reject(error)
@@ -49,8 +61,8 @@ export async function axiosAuth (opts) {
   })
   ax.cookieJar = cookieJar
   ax.setOrg = (org, dep) => {
-    cookieJar.setCookieSync(`id_token_org=${org}`, origin)
-    cookieJar.setCookieSync(`id_token_dep=${dep ?? ''}`, origin)
+    cookieJar.setCookieSync(`id_token_org=${org}`, sdOrigin)
+    cookieJar.setCookieSync(`id_token_dep=${dep ?? ''}`, sdOrigin)
   }
   return ax
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-node",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "Small nodejs related utility functions for the data-fair stack.",
   "main": "index.js",
   "files": [