Merge pull request #500 from bheesham/use-nodes-global-fetch

fetch is now built-in to node 18

Author: bheesham

package-lock.json

@@ -22,7 +22,6 @@
     "c8": "^9.0.0",
     "eslint": "^9.22.0",
     "jest": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
     "prettier": "2.8.8",
     "lodash": "^4.17.21"
   },
@@ -31,8 +30,7 @@
     "aws-sdk": "^2.1646.0",
     "ipaddr.js": "^1.9.1",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "^9.0.2",
-    "node-fetch": "^2.7.0"
+    "jsonwebtoken": "^9.0.2"
   },
   "engines": {
     "node": ">=18.0.0 <23.0.0"

package.json

@@ -99,11 +99,6 @@ resource "auth0_action" "gheGroups" {
     version = "v3"
   }
 
-  dependencies {
-    name    = "node-fetch"
-    version = "2.7.0"
-  }
-
   secrets {
     name  = "personapi_audience"
     value = local.parsed_secrets["gheGroups_personapi_audience"]
@@ -173,11 +168,6 @@ resource "auth0_action" "accessRules" {
     version = "v3"
   }
 
-  dependencies {
-    name    = "node-fetch"
-    version = "2.7.0"
-  }
-
   dependencies {
     name    = "jsonwebtoken"
     version = "9.0.2"
@@ -326,11 +316,6 @@ resource "auth0_action" "activateNewUsersInCIS" {
     version = "v3"
   }
 
-  dependencies {
-    name    = "node-fetch"
-    version = "2.7.0"
-  }
-
   dependencies {
     name    = "jsonwebtoken"
     version = "9.0.2"

tf/actions.tf

@@ -1,5 +1,4 @@
 // Required Libraries
-const fetch = require("node-fetch");
 const YAML = require("js-yaml");
 const jwt = require("jsonwebtoken");
 const AWS = require("aws-sdk");

tf/actions/accessRules.js

@@ -1,4 +1,3 @@
-const fetch = require("node-fetch");
 const jwt = require("jsonwebtoken");
 const AWS = require("aws-sdk");
 

tf/actions/activateNewUsersInCIS.js

@@ -1,6 +1,3 @@
-// Required Libraries
-const fetch = require("node-fetch");
-
 exports.onExecutePostLogin = async (event, api) => {
   console.log("Running action:", "gheGroups");
 

tf/actions/gheGroups.js

@@ -1,14 +1,11 @@
 const _ = require("lodash");
-const fetch = require("node-fetch");
 
 const appsYaml = require("./modules/apps.yml.js").load();
 const eventObj = require("./modules/event.json");
 const decodeRedirect = require("./modules/decodePostErrorUrl.js");
 const idTokenObj = require("./modules/idToken.json");
 const { onExecutePostLogin } = require("../actions/accessRules.js");
 
-jest.mock("node-fetch");
-
 beforeEach(() => {
   _event = _.cloneDeep(eventObj);
   _event.user.aai = [];
@@ -20,10 +17,6 @@ beforeEach(() => {
 
   _idToken = _.cloneDeep(idTokenObj);
 
-  fetch.mockResolvedValue({
-    text: jest.fn().mockResolvedValue(appsYaml),
-  });
-
   // Mock auth0 api object
   api = {
     idToken: {
@@ -62,6 +55,9 @@ beforeEach(() => {
   consoleLogSpy = jest.spyOn(console, "log").mockImplementation(() => {});
   consoleWarnSpy = jest.spyOn(console, "warn").mockImplementation(() => {});
   consoleErrorSpy = jest.spyOn(console, "error").mockImplementation(() => {});
+  fetchSpy = jest.spyOn(global, "fetch").mockResolvedValue({
+    text: jest.fn().mockResolvedValue(appsYaml),
+  });
 });
 
 afterEach(() => {
@@ -70,6 +66,7 @@ afterEach(() => {
   consoleLogSpy.mockRestore();
   consoleWarnSpy.mockRestore();
   consoleErrorSpy.mockRestore();
+  fetchSpy.mockRestore();
 });
 
 // TODO: test whitelisted duo users

tf/tests/accessRules.test.js

@@ -1,12 +1,7 @@
 const _ = require("lodash");
-const fetch = require("node-fetch");
-
 const eventObj = require("./modules/event.json");
 const { onExecutePostLogin } = require("../actions/activateNewUsersInCIS.js");
 
-// Mock the node-fetch module
-jest.mock("node-fetch");
-
 // Take all log enteries and combine them into a single array
 const combineLog = (consoleLogs) => {
   let combinedLog = [];
@@ -124,11 +119,13 @@ beforeEach(() => {
       });
     }
   };
+  fetchSpy = jest.spyOn(global, "fetch").mockImplementation(fetchRespCallback);
 });
 
 afterEach(() => {
   // Clean up after each test
   jest.clearAllMocks();
+  fetchSpy.mockRestore();
   consoleLogSpy.mockRestore();
   consoleWarnSpy.mockRestore();
   consoleErrorSpy.mockRestore();
@@ -150,9 +147,6 @@ test("Expect onExecutePostLogin to be defined", async () => {
 });
 
 test("When connection does not match, expect empty logs and workflow to continue", async () => {
-  // Mock Fetch
-  fetch.mockImplementation(fetchRespCallback);
-
   // Set connection name to a connection other than WHITELISTED_CONNECTIONS
   _event.connection.name = "non_whitelisted_provider";
 
@@ -175,9 +169,6 @@ test("When connection does not match, expect empty logs and workflow to continue
 });
 
 test("When existsInCIS is already set, expect empty logs and workflow to continue", async () => {
-  // Mock Fetch
-  fetch.mockImplementation(fetchRespCallback);
-
   // Set existsInCIS in user metadata
   _event.user.app_metadata = { existsInCIS: true };
 
@@ -244,9 +235,6 @@ test("When failing to get beartoken, expect error logged and workflow to continu
 });
 
 test("When failing to get profile, expect error logged and workflow to continue", async () => {
-  // Mock Fetch
-  fetch.mockImplementation(fetchRespCallback);
-
   // Set token and person fetch responses
   tokenResp = { access_token: "fakefakefakefake" };
   personResponseStatusOk = false;
@@ -272,9 +260,6 @@ test("When failing to get profile, expect error logged and workflow to continue"
 });
 
 test("When change API fails, expect error logged and workflow to continue", async () => {
-  // Mock Fetch
-  fetch.mockImplementation(fetchRespCallback);
-
   // Set token, person and change responses
   tokenResp = { access_token: "fakefakefakefake" };
   personResp = {};
@@ -302,9 +287,6 @@ test("When change API fails, expect error logged and workflow to continue", asyn
 test.each(WHITELISTED_CONNECTIONS)(
   "When new user with %s connection is created, expect it logged and workflow to continue",
   async (connection) => {
-    // Mock Fetch
-    fetch.mockImplementation(fetchRespCallback);
-
     // Set token, person and change responses
     tokenResp = { access_token: "fakefakefakefake" };
     personResp = {};
@@ -339,9 +321,6 @@ test.each(WHITELISTED_CONNECTIONS)(
 );
 
 test("When person API profile exists, expect set existsInCIS", async () => {
-  // Mock Fetch
-  fetch.mockImplementation(fetchRespCallback);
-
   // Set token and person fetch responses
   tokenResp = { access_token: "fakefakefakefake" };
   personResp = { usernames: { values: { "HACK#GITHUB": "jdoegithub" } } };

tf/tests/activateNewUsersInCIS.test.js

@@ -3,8 +3,6 @@ const _ = require("lodash");
 const eventObj = require("./modules/event.json");
 const { onExecutePostLogin } = require("../actions/awsSaml.js");
 
-jest.mock("node-fetch");
-
 const compileGroups = async (_event) => {
   // Ensure we have the correct group data
   const app_metadata_groups = _event.user.app_metadata.groups || [];