@data-fair/lib-node 2.10.2 → 2.12.0

package/axios-auth.d.ts

@@ -1,5 +1,4 @@
-import type { AxiosInstance } from 'axios';
-import { CookieJar } from 'tough-cookie';
+import { type AxiosWithCookiesInstance } from './axios-with-cookies.js';
 export interface AxiosAuthOptions {
     email: string;
     password: string;
@@ -11,8 +10,7 @@ export interface AxiosAuthOptions {
     orgStorage?: boolean;
     globalCookies?: boolean;
 }
-export type AxiosAuthInstance = AxiosInstance & {
-    cookieJar: CookieJar;
+export type AxiosAuthInstance = AxiosWithCookiesInstance & {
     setOrg: (org: string, dep?: string) => void;
 };
 export declare function axiosAuth(opts: AxiosAuthOptions): Promise<AxiosAuthInstance>;

package/axios-auth.js

@@ -1,13 +1,9 @@
 // build axios instances with sessions on a simple-directory instance
 // 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);
-};
+import { axiosInstance } from './axios.js';
+import { axiosWithCookies } from './axios-with-cookies.js';
 export async function axiosAuth(opts) {
     const body = { email: opts.email, password: opts.password };
     if (opts.org)
@@ -28,8 +24,8 @@ export async function axiosAuth(opts) {
     if (callbackUrl.startsWith(directoryUrl + '/simple-directory')) {
         callbackUrl = callbackUrl.replace(directoryUrl + '/simple-directory', directoryUrl);
     }
-    const cookieJar = new CookieJar();
     const sdOrigin = new URL(directoryUrl).origin;
+    const cookieJar = new CookieJar();
     try {
         await axiosInstance.get(callbackUrl, { maxRedirects: 0 });
     }
@@ -43,38 +39,15 @@ export async function axiosAuth(opts) {
         for (const cookie of err.headers['set-cookie'] ?? [])
             cookieJar.setCookieSync(cookie, sdOrigin);
     }
-    const ax = axiosBuilder(axiosOpts, (ax) => {
-        ax.interceptors.request.use((config) => {
-            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);
-        });
+    const ax = axiosWithCookies({
+        axiosOpts,
+        cookiesOrigin: sdOrigin,
+        globalCookies: opts.globalCookies,
+        cookieJar
     });
-    ax.cookieJar = cookieJar;
     ax.setOrg = (org, dep) => {
-        cookieJar.setCookieSync(`id_token_org=${org}`, sdOrigin);
-        cookieJar.setCookieSync(`id_token_dep=${dep ?? ''}`, sdOrigin);
+        ax.cookieJar.setCookieSync(`id_token_org=${org}`, sdOrigin);
+        ax.cookieJar.setCookieSync(`id_token_dep=${dep ?? ''}`, sdOrigin);
     };
     return ax;
 }

package/axios-with-cookies.d.ts

@@ -0,0 +1,13 @@
+import type { AxiosInstance } from 'axios';
+import { CookieJar } from 'tough-cookie';
+export interface AxiosWithCookiesOptions {
+    axiosOpts?: any;
+    cookiesOrigin?: string;
+    globalCookies?: boolean;
+    cookieJar?: CookieJar;
+}
+export type AxiosWithCookiesInstance = AxiosInstance & {
+    cookieJar: CookieJar;
+};
+export declare function axiosWithCookies(opts?: AxiosWithCookiesOptions): AxiosWithCookiesInstance;
+export default axiosWithCookies;

package/axios-with-cookies.js

@@ -0,0 +1,41 @@
+// build axios instances with cookie jar support
+import { axiosBuilder } 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 function axiosWithCookies(opts = {}) {
+    const cookieJar = opts.cookieJar ?? new CookieJar();
+    const cookiesOrigin = opts.cookiesOrigin ?? '';
+    const ax = axiosBuilder(opts.axiosOpts, (ax) => {
+        ax.interceptors.request.use((config) => {
+            const url = getConfigUrl(config);
+            if (!opts.globalCookies || url.origin === cookiesOrigin) {
+                config.headers.Cookie = cookieJar.getCookiesSync(url.href);
+            }
+            else {
+                config.headers.Cookie = cookieJar.getCookiesSync(cookiesOrigin);
+            }
+            return config;
+        });
+        ax.interceptors.response.use((res) => {
+            const origin = opts.globalCookies ? cookiesOrigin : 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 ? cookiesOrigin : getConfigUrl(res.config).origin;
+                for (const cookie of res.headers['set-cookie'] ?? [])
+                    cookieJar.setCookieSync(cookie, origin);
+            }
+            return Promise.reject(error);
+        });
+    });
+    ax.cookieJar = cookieJar;
+    return ax;
+}
+export default axiosWithCookies;

package/package.json

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

package/upgrade-scripts.js

@@ -25,9 +25,18 @@ export default async function (db, locks, basePath = './', isFresh) {
 }
 async function runScripts(db, basePath, isFresh) {
     const dir = path.resolve(basePath);
+    // in the case of workspaces the parent package.json is the right place to look for name and versions
+    const parentPjsonPath = path.join(dir, '../package.json');
     const pjsonPath = path.join(dir, 'package.json');
-    debug('read service info from ' + pjsonPath);
-    const pjson = JSON.parse(readFileSync(pjsonPath, 'utf8'));
+    let pjson;
+    try {
+        pjson = JSON.parse(readFileSync(parentPjsonPath, 'utf8'));
+        debug('read service info from ' + parentPjsonPath);
+    }
+    catch (err) {
+        pjson = JSON.parse(readFileSync(pjsonPath, 'utf8'));
+        debug('read service info from ' + pjsonPath);
+    }
     const scriptsRoot = path.join(dir, 'upgrade');
     debug(`service=${pjson.name} version=${pjson.version}`);
     const services = db.collection('services');