fix(carddav): honour fetch override in makeAddressBook

dist/addressBook.d.ts

@@ -69,4 +69,5 @@ export declare const makeAddressBook: (params: {
     headers?: Record<string, string>;
     headersToExclude?: string[];
     fetchOptions?: RequestInit;
+    fetch?: typeof fetch;
 }) => Promise<DAVResponse[]>;

dist/client.d.ts

@@ -233,6 +233,7 @@ export declare const createDAVClient: (params: {
         headers?: Record<string, string>;
         headersToExclude?: string[];
         fetchOptions?: RequestInit;
+        fetch?: typeof fetch;
     }) => Promise<DAVResponse[]>;
     fetchVCards: (params: {
         addressBook: DAVAddressBook;

dist/index.d.ts

@@ -268,6 +268,7 @@ declare const _default: {
         headers?: Record<string, string>;
         headersToExclude?: string[];
         fetchOptions?: RequestInit;
+        fetch?: typeof fetch;
     }) => Promise<import("./types/DAVTypes").DAVResponse[]>;
     serviceDiscovery: (params: {
         account: import("./types/models").DAVAccount;
@@ -614,6 +615,7 @@ declare const _default: {
             headers?: Record<string, string>;
             headersToExclude?: string[];
             fetchOptions?: RequestInit;
+            fetch?: typeof fetch;
         }) => Promise<import("./types/DAVTypes").DAVResponse[]>;
         fetchVCards: (params: {
             addressBook: import("./types/models").DAVAddressBook;

dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsdav",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "WebDAV, CALDAV, and CARDDAV client for Nodejs and the Browser",
   "keywords": [
     "dav",

dist/tsdav.cjs

@@ -813,7 +813,7 @@ const deleteVCard = async (params) => {
     });
 };
 const makeAddressBook = async (params) => {
-    const { url, props, depth, headers, headersToExclude, fetchOptions = {} } = params;
+    const { url, props, depth, headers, headersToExclude, fetchOptions = {}, fetch: fetchOverride, } = params;
     return davRequest({
         url,
         init: {
@@ -835,6 +835,7 @@ const makeAddressBook = async (params) => {
                 : undefined,
         },
         fetchOptions,
+        fetch: fetchOverride,
     });
 };
 
@@ -2357,7 +2358,11 @@ class DAVClient {
         })(params[0]);
     }
     async makeAddressBook(...params) {
-        return defaultParam(makeAddressBook, { headers: this.authHeaders, fetchOptions: this.fetchOptions })(params[0]);
+        return defaultParam(makeAddressBook, {
+            headers: this.authHeaders,
+            fetchOptions: this.fetchOptions,
+            fetch: this.fetchOverride,
+        })(params[0]);
     }
     async fetchAddressBooks(...params) {
         return defaultParam(fetchAddressBooks, {

dist/tsdav.cjs.js

@@ -813,7 +813,7 @@ const deleteVCard = async (params) => {
     });
 };
 const makeAddressBook = async (params) => {
-    const { url, props, depth, headers, headersToExclude, fetchOptions = {} } = params;
+    const { url, props, depth, headers, headersToExclude, fetchOptions = {}, fetch: fetchOverride, } = params;
     return davRequest({
         url,
         init: {
@@ -835,6 +835,7 @@ const makeAddressBook = async (params) => {
                 : undefined,
         },
         fetchOptions,
+        fetch: fetchOverride,
     });
 };
 
@@ -2357,7 +2358,11 @@ class DAVClient {
         })(params[0]);
     }
     async makeAddressBook(...params) {
-        return defaultParam(makeAddressBook, { headers: this.authHeaders, fetchOptions: this.fetchOptions })(params[0]);
+        return defaultParam(makeAddressBook, {
+            headers: this.authHeaders,
+            fetchOptions: this.fetchOptions,
+            fetch: this.fetchOverride,
+        })(params[0]);
     }
     async fetchAddressBooks(...params) {
         return defaultParam(fetchAddressBooks, {

dist/tsdav.d.ts

@@ -254,6 +254,7 @@ declare const makeAddressBook: (params: {
     headers?: Record<string, string>;
     headersToExclude?: string[];
     fetchOptions?: RequestInit;
+    fetch?: typeof fetch;
 }) => Promise<DAVResponse[]>;
 
 declare const fetchCalendarUserAddresses: (params: {
@@ -812,6 +813,7 @@ declare const createDAVClient: (params: {
         headers?: Record<string, string>;
         headersToExclude?: string[];
         fetchOptions?: RequestInit;
+        fetch?: typeof fetch;
     }) => Promise<DAVResponse[]>;
     fetchVCards: (params: {
         addressBook: DAVAddressBook;
@@ -1291,6 +1293,7 @@ declare const _default: {
         headers?: Record<string, string>;
         headersToExclude?: string[];
         fetchOptions?: RequestInit;
+        fetch?: typeof fetch;
     }) => Promise<DAVResponse[]>;
     serviceDiscovery: (params: {
         account: DAVAccount;
@@ -1637,6 +1640,7 @@ declare const _default: {
             headers?: Record<string, string>;
             headersToExclude?: string[];
             fetchOptions?: RequestInit;
+            fetch?: typeof fetch;
         }) => Promise<DAVResponse[]>;
         fetchVCards: (params: {
             addressBook: DAVAddressBook;

dist/tsdav.esm.js

@@ -809,7 +809,7 @@ const deleteVCard = async (params) => {
     });
 };
 const makeAddressBook = async (params) => {
-    const { url, props, depth, headers, headersToExclude, fetchOptions = {} } = params;
+    const { url, props, depth, headers, headersToExclude, fetchOptions = {}, fetch: fetchOverride, } = params;
     return davRequest({
         url,
         init: {
@@ -831,6 +831,7 @@ const makeAddressBook = async (params) => {
                 : undefined,
         },
         fetchOptions,
+        fetch: fetchOverride,
     });
 };
 
@@ -2353,7 +2354,11 @@ class DAVClient {
         })(params[0]);
     }
     async makeAddressBook(...params) {
-        return defaultParam(makeAddressBook, { headers: this.authHeaders, fetchOptions: this.fetchOptions })(params[0]);
+        return defaultParam(makeAddressBook, {
+            headers: this.authHeaders,
+            fetchOptions: this.fetchOptions,
+            fetch: this.fetchOverride,
+        })(params[0]);
     }
     async fetchAddressBooks(...params) {
         return defaultParam(fetchAddressBooks, {

dist/tsdav.js

@@ -10003,7 +10003,7 @@ const deleteVCard = async (params) => {
     });
 };
 const makeAddressBook = async (params) => {
-    const { url, props, depth, headers, headersToExclude, fetchOptions = {} } = params;
+    const { url, props, depth, headers, headersToExclude, fetchOptions = {}, fetch: fetchOverride, } = params;
     return davRequest({
         url,
         init: {
@@ -10025,6 +10025,7 @@ const makeAddressBook = async (params) => {
                 : undefined,
         },
         fetchOptions,
+        fetch: fetchOverride,
     });
 };
 
@@ -11719,7 +11720,11 @@ class DAVClient {
         })(params[0]);
     }
     async makeAddressBook(...params) {
-        return defaultParam(makeAddressBook, { headers: this.authHeaders, fetchOptions: this.fetchOptions })(params[0]);
+        return defaultParam(makeAddressBook, {
+            headers: this.authHeaders,
+            fetchOptions: this.fetchOptions,
+            fetch: this.fetchOverride,
+        })(params[0]);
     }
     async fetchAddressBooks(...params) {
         return defaultParam(fetchAddressBooks, {

dist/tsdav.mjs

@@ -809,7 +809,7 @@ const deleteVCard = async (params) => {
     });
 };
 const makeAddressBook = async (params) => {
-    const { url, props, depth, headers, headersToExclude, fetchOptions = {} } = params;
+    const { url, props, depth, headers, headersToExclude, fetchOptions = {}, fetch: fetchOverride, } = params;
     return davRequest({
         url,
         init: {
@@ -831,6 +831,7 @@ const makeAddressBook = async (params) => {
                 : undefined,
         },
         fetchOptions,
+        fetch: fetchOverride,
     });
 };
 
@@ -2353,7 +2354,11 @@ class DAVClient {
         })(params[0]);
     }
     async makeAddressBook(...params) {
-        return defaultParam(makeAddressBook, { headers: this.authHeaders, fetchOptions: this.fetchOptions })(params[0]);
+        return defaultParam(makeAddressBook, {
+            headers: this.authHeaders,
+            fetchOptions: this.fetchOptions,
+            fetch: this.fetchOverride,
+        })(params[0]);
     }
     async fetchAddressBooks(...params) {
         return defaultParam(fetchAddressBooks, {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsdav",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "WebDAV, CALDAV, and CARDDAV client for Nodejs and the Browser",
   "keywords": [
     "dav",

src/__tests__/unit/addressBook.test.ts

@@ -1,4 +1,4 @@
-import { fetchVCards } from '../../addressBook';
+import { fetchVCards, makeAddressBook } from '../../addressBook';
 import * as request from '../../request';
 
 jest.mock('../../request');
@@ -103,3 +103,32 @@ describe('fetchVCards', () => {
     expect(hrefs).toEqual(['/user/addr/card1.vcf']);
   });
 });
+
+describe('makeAddressBook', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockedDavRequest.mockResolvedValue([]);
+  });
+
+  it('should forward a custom fetch to davRequest', async () => {
+    const customFetch = jest.fn() as unknown as typeof fetch;
+
+    await makeAddressBook({
+      url: 'http://example.com/user/addr/',
+      props: {},
+      fetch: customFetch,
+    });
+
+    expect(mockedDavRequest).toHaveBeenCalledTimes(1);
+    expect(mockedDavRequest.mock.calls[0][0].fetch).toBe(customFetch);
+  });
+
+  it('should leave fetch undefined when no override is given', async () => {
+    await makeAddressBook({
+      url: 'http://example.com/user/addr/',
+      props: {},
+    });
+
+    expect(mockedDavRequest.mock.calls[0][0].fetch).toBeUndefined();
+  });
+});

src/__tests__/unit/client.test.ts

@@ -56,4 +56,49 @@ describe('DAVClient fetch override', () => {
 
     expect(mockFetch).toHaveBeenCalled();
   });
+
+  it('DAVClient should use fetch override in makeAddressBook', async () => {
+    const mockFetch = jest.fn().mockResolvedValue({
+      ok: true,
+      status: 200,
+      text: jest.fn().mockResolvedValue(''),
+      headers: new Map(),
+    });
+
+    const client = new DAVClient({
+      serverUrl: 'http://example.com',
+      credentials: mockCredentials,
+      fetch: mockFetch,
+    });
+
+    await client.makeAddressBook({
+      url: 'http://example.com/user/addr/',
+      props: {},
+    });
+
+    expect(mockFetch).toHaveBeenCalled();
+  });
+
+  it('createDAVClient should use fetch override in makeAddressBook', async () => {
+    const mockFetch = jest.fn().mockResolvedValue({
+      ok: true,
+      status: 200,
+      text: jest.fn().mockResolvedValue(''),
+      headers: new Map(),
+    });
+
+    const client = await createDAVClient({
+      serverUrl: 'http://example.com',
+      credentials: mockCredentials,
+      authMethod: 'Basic',
+      fetch: mockFetch,
+    });
+
+    await client.makeAddressBook({
+      url: 'http://example.com/user/addr/',
+      props: {},
+    });
+
+    expect(mockFetch).toHaveBeenCalled();
+  });
 });

src/addressBook.ts

@@ -332,8 +332,17 @@ export const makeAddressBook = async (params: {
   headers?: Record<string, string>;
   headersToExclude?: string[];
   fetchOptions?: RequestInit;
+  fetch?: typeof fetch;
 }): Promise<DAVResponse[]> => {
-  const { url, props, depth, headers, headersToExclude, fetchOptions = {} } = params;
+  const {
+    url,
+    props,
+    depth,
+    headers,
+    headersToExclude,
+    fetchOptions = {},
+    fetch: fetchOverride,
+  } = params;
   return davRequest({
     url,
     init: {
@@ -355,5 +364,6 @@ export const makeAddressBook = async (params: {
         : undefined,
     },
     fetchOptions,
+    fetch: fetchOverride,
   });
 };

src/client.ts

@@ -691,7 +691,11 @@ export class DAVClient {
   async makeAddressBook(
     ...params: Parameters<typeof rawMakeAddressBook>
   ): Promise<DAVResponse[]> {
-    return defaultParam(rawMakeAddressBook, { headers: this.authHeaders, fetchOptions: this.fetchOptions })(params[0]);
+    return defaultParam(rawMakeAddressBook, {
+      headers: this.authHeaders,
+      fetchOptions: this.fetchOptions,
+      fetch: this.fetchOverride,
+    })(params[0]);
   }
 
   async fetchAddressBooks(