From f5eb2b50f687303def82e196f8922b36f4080581 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 20:00:29 +0000
Subject: [PATCH 1/2] Bump axios from 0.26.1 to 1.6.0 in /server

Bumps [axios](https://github.com/axios/axios) from 0.26.1 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.26.1...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 server/package.json |  2 +-
 server/yarn.lock    | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/server/package.json b/server/package.json
index 4470c258..2bafb947 100644
--- a/server/package.json
+++ b/server/package.json
@@ -17,7 +17,7 @@
     "@turf/clusters-kmeans": "^6.5.0",
     "@turf/helpers": "^6.5.0",
     "apollo-server-express": "3.x",
-    "axios": ">=0.21.2",
+    "axios": ">=1.6.0",
     "cross-fetch": "^3.1.5",
     "eslint-config-prettier": "^8.3.0",
     "express": "^4.17.1",
diff --git a/server/yarn.lock b/server/yarn.lock
index 48bc3568..888e0c60 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -2576,12 +2576,14 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-axios@>=0.21.2:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
-  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
+axios@>=1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
-    follow-redirects "^1.14.8"
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 axios@^1.6.0:
   version "1.6.1"
@@ -3835,11 +3837,6 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.14.8:
-  version "1.14.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
-  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
-
 follow-redirects@^1.15.0:
   version "1.15.3"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"

From 84dd78f795764b7107eb50d8894cb75391902ee0 Mon Sep 17 00:00:00 2001
From: Mackenzie Ian Frew <mackenzie.frew@sickkids.ca>
Date: Mon, 13 Nov 2023 16:28:54 -0500
Subject: [PATCH 2/2] Update jest config for new axios version

---
 server/jest.config.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/jest.config.ts b/server/jest.config.ts
index d626d0eb..21d8d344 100644
--- a/server/jest.config.ts
+++ b/server/jest.config.ts
@@ -8,6 +8,9 @@ const config: Config.InitialOptions = {
     '.(ts|tsx)': 'ts-jest',
   },
   verbose: true,
+  moduleNameMapper: {
+    axios: '<rootDir>/node_modules/axios/dist/node/axios.cjs',
+  }
 };
 
 export default config;