Drop node-fetch and only use native fetch (#908)

auth0 · Aug 16, 2023 · 5c387f0 · 5c387f0
1 parent 691fc73
commit 5c387f0
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 147 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,7 +50,6 @@
   "homepage": "https://github.com/auth0/node-auth0",
   "dependencies": {
     "jose": "^4.13.2",
-    "node-fetch": "^3.3.1",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
@@ -72,6 +71,7 @@
     "husky": "^3.0.1",
     "jest": "^29.5.0",
     "nock": "^13.2.7",
+    "node-fetch": "^3.3.1",
     "prettier": "^2.8.7",
     "pretty-quick": "^1.11.1",
     "ts-jest": "^29.1.0",

diff --git a/src/lib/fetch.ts b/src/lib/fetch.ts
diff --git a/src/lib/runtime.ts b/src/lib/runtime.ts
@@ -8,10 +8,8 @@ import {
   Middleware,
   FetchAPI,
 } from './models.js';
-import { fetch as fetchApi, getFormDataCls, getBlobCls } from './fetch.js';
 
 export * from './models.js';
-export { getFormDataCls };
 
 /**
  * @private
@@ -33,7 +31,7 @@ export class BaseAPI {
     }
 
     this.middleware = configuration.middleware || [];
-    this.fetchApi = configuration.fetchApi || fetchApi;
+    this.fetchApi = configuration.fetchApi || fetch;
     this.parseError = configuration.parseError;
     this.timeoutDuration =
       typeof configuration.timeoutDuration === 'number' ? configuration.timeoutDuration : 10000;
@@ -86,11 +84,10 @@ export class BaseAPI {
       })),
     };
 
-    const Blob = await getBlobCls();
     const init: RequestInit = {
       ...overriddenInit,
       body:
-        (await isFormData(overriddenInit.body)) ||
+        overriddenInit.body instanceof FormData ||
         overriddenInit.body instanceof URLSearchParams ||
         overriddenInit.body instanceof Blob
           ? overriddenInit.body
@@ -174,11 +171,6 @@ export class BaseAPI {
   };
 }
 
-async function isFormData(value: unknown): Promise<boolean> {
-  const FormData = await getFormDataCls();
-  return typeof FormData !== 'undefined' && value instanceof FormData;
-}
-
 /**
  * @private
  */

diff --git a/src/management/__generated/managers/jobs-manager.ts b/src/management/__generated/managers/jobs-manager.ts
@@ -99,7 +99,7 @@ export class JobsManager extends BaseAPI {
     bodyParameters: PostUsersImportsData,
     initOverrides?: InitOverride
   ): Promise<ApiResponse<Job>> {
-    const formParams = new (await runtime.getFormDataCls())();
+    const formParams = new FormData();
 
     if (bodyParameters.users !== undefined) {
       formParams.append('users', await runtime.parseFormParam(bodyParameters.users));

diff --git a/test/lib/runtime.test.ts b/test/lib/runtime.test.ts
@@ -11,7 +11,6 @@ import {
 } from '../../src/index.js';
 import { InitOverrideFunction, RequestOpts } from '../../src/lib/models.js';
 import { BaseAPI, applyQueryParams } from '../../src/lib/runtime.js';
-import { Response as NodeResponse } from 'node-fetch';
 
 import * as utils from '../../src/utils.js';
 import { base64url } from 'jose';
@@ -296,7 +295,7 @@ describe('Runtime', () => {
       middleware: [
         {
           onError() {
-            return new NodeResponse(undefined, { status: 418 }) as Response;
+            return new Response(undefined, { status: 418 }) as Response;
           },
         },
       ],
@@ -320,7 +319,7 @@ describe('Runtime', () => {
       middleware: [
         {
           post() {
-            return new NodeResponse(JSON.stringify({ bar: 'foo' }), {
+            return new Response(JSON.stringify({ bar: 'foo' }), {
               status: 200,
             }) as Response;
           },