@data-fair/lib-node 1.2.0 → 1.3.1

package/axios-auth.d.ts

@@ -1,4 +1,5 @@
 import type { AxiosInstance } from 'axios';
+import { CookieJar } from 'tough-cookie';
 export interface AxiosAuthOptions {
     email: string;
     password: string;
@@ -9,5 +10,9 @@ export interface AxiosAuthOptions {
     axiosOpts?: any;
     orgStorage?: boolean;
 }
-export declare function axiosAuth(opts: AxiosAuthOptions): Promise<AxiosInstance>;
+export type AxiosAuthInstance = AxiosInstance & {
+    cookieJar: CookieJar;
+    setOrg: (org: string, dep?: string) => void;
+};
+export declare function axiosAuth(opts: AxiosAuthOptions): Promise<AxiosAuthInstance>;
 export default axiosAuth;

package/axios-auth.js

@@ -2,6 +2,7 @@
 // used for integration testing
 import { Agent } from 'node:http'
 import { axiosBuilder, axiosInstance } from './axios.js'
+import { CookieJar } from 'tough-cookie'
 export async function axiosAuth (opts) {
   const body = { email: opts.email, password: opts.password }
   if (opts.org) { body.org = opts.org }
@@ -10,6 +11,7 @@ export async function axiosAuth (opts) {
   if (opts.orgStorage) { body.orgStorage = opts.orgStorage }
   const axiosOpts = {
     httpAgent: new Agent({ keepAlive: false }),
+    maxRedirects: 0,
     ...opts.axiosOpts
   }
   const directoryUrl = opts.directoryUrl ?? 'http://localhost:8080'
@@ -17,14 +19,38 @@ export async function axiosAuth (opts) {
   if (callbackUrl.startsWith(directoryUrl + '/simple-directory')) {
     callbackUrl = callbackUrl.replace(directoryUrl + '/simple-directory', directoryUrl)
   }
+  const cookieJar = new CookieJar()
+  const origin = new URL(directoryUrl).origin
   try {
     await axiosInstance.get(callbackUrl, { maxRedirects: 0 })
   } catch (err) {
     if (err.status !== 302) { throw err }
-    axiosOpts.headers = axiosOpts.headers ?? {}
-    axiosOpts.headers.common = axiosOpts.headers.common ?? {}
-    axiosOpts.headers.common.Cookie = err.headers['set-cookie'].map((s) => s.split(';')[0]).join(';')
+    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.setCookie(cookie, origin) }
   }
-  return axiosBuilder(axiosOpts)
+  const ax = axiosBuilder(axiosOpts, (ax) => {
+    ax.interceptors.request.use(async (config) => {
+      config.headers.Cookie = await cookieJar.getCookies(origin)
+      return config
+    })
+    ax.interceptors.response.use(async (res) => {
+      for (const cookie of res.headers['set-cookie'] ?? []) { cookieJar.setCookie(cookie, origin) }
+      return res
+    }, async (error) => {
+      const res = error.response
+      if (res) {
+        for (const cookie of res.headers['set-cookie'] ?? []) { cookieJar.setCookie(cookie, origin) }
+      }
+      return Promise.reject(error)
+    })
+  })
+  ax.cookieJar = cookieJar
+  ax.setOrg = (org, dep) => {
+    cookieJar.setCookie(`id_token_org=${org}`, origin)
+    cookieJar.setCookie(`id_token_dep=${dep ?? ''}`, origin)
+  }
+  return ax
 }
 export default axiosAuth

package/axios.d.ts

@@ -1,4 +1,4 @@
-import type { AxiosInstance } from 'axios';
-export declare function axiosBuilder(opts?: object): AxiosInstance;
+import type { AxiosInstance, CreateAxiosDefaults } from 'axios';
+export declare function axiosBuilder(opts?: CreateAxiosDefaults, beforeInterceptors?: (ax: AxiosInstance) => void): AxiosInstance;
 export declare const axiosInstance: AxiosInstance;
 export default axiosInstance;

package/axios.js

@@ -19,12 +19,13 @@ const requestInterceptor = (config) => {
   config.errorContext = errorContext
   return config
 }
-export function axiosBuilder (opts = {}) {
+export function axiosBuilder (opts = {}, beforeInterceptors) {
   const ax = axios.create({
     httpAgent,
     httpsAgent,
     ...opts
   })
+  if (beforeInterceptors) { beforeInterceptors(ax) }
   ax.interceptors.request.use(requestInterceptor)
   // shorter stack traces
   ax.interceptors.response.use(response => response, error => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-node",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Small nodejs related utility functions for the data-fair stack.",
   "main": "index.js",
   "files": [
@@ -26,7 +26,8 @@
   "peerDependencies": {
     "mongodb": "6",
     "prom-client": "15",
-    "ws": "8"
+    "ws": "8",
+    "tough-cookie": "5"
   },
   "peerDependenciesMeta": {
     "mongodb": {
@@ -37,12 +38,16 @@
     },
     "ws": {
       "optional": true
+    },
+    "tough-cookie": {
+      "optional": true
     }
   },
   "type": "module",
   "devDependencies": {
     "mongodb": "^6.9.0",
     "prom-client": "^15.1.3",
-    "ws": "^8.18.0"
+    "ws": "^8.18.0",
+    "tough-cookie": "^5.0.0"
   }
 }