From 447371f35a683322ab0271bff514b6e73e2ce33f Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Wed, 12 May 2021 22:37:32 -0700
Subject: [PATCH] fix: Add server-side proxy support via fetch-with-proxy
 (#2044)

* fix: Add server-side proxy support via fetch-with-proxy

closes #1893

For some fun discussion on why this is required, see this issue: https://github.com/nodejs/node/issues/8381

* lint
---
 package.json            |  3 ++-
 server/slack.js         |  2 +-
 server/utils/avatars.js |  2 +-
 server/utils/s3.js      |  2 +-
 server/utils/updates.js |  2 +-
 yarn.lock               | 20 ++++++++++++++++++++
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f27c9fd0..d4f010f0 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
     "emoji-regex": "^6.5.1",
     "es6-error": "^4.1.1",
     "exports-loader": "^0.6.4",
+    "fetch-with-proxy": "^3.0.1",
     "file-loader": "^1.1.6",
     "flow-typed": "^2.6.2",
     "focus-visible": "^5.1.0",
@@ -229,4 +230,4 @@
     "js-yaml": "^3.13.1"
   },
   "version": "0.55.0"
-}
\ No newline at end of file
+}
diff --git a/server/slack.js b/server/slack.js
index dcd599a4..9045108f 100644
--- a/server/slack.js
+++ b/server/slack.js
@@ -1,6 +1,6 @@
 // @flow
 import querystring from "querystring";
-import fetch from "isomorphic-fetch";
+import fetch from "fetch-with-proxy";
 import { InvalidRequestError } from "./errors";
 
 const SLACK_API_URL = "https://slack.com/api";
diff --git a/server/utils/avatars.js b/server/utils/avatars.js
index ed207222..14b66d1e 100644
--- a/server/utils/avatars.js
+++ b/server/utils/avatars.js
@@ -1,6 +1,6 @@
 // @flow
 import crypto from "crypto";
-import fetch from "isomorphic-fetch";
+import fetch from "fetch-with-proxy";
 
 export const DEFAULT_AVATAR_HOST = "https://tiley.herokuapp.com";
 
diff --git a/server/utils/s3.js b/server/utils/s3.js
index ece56262..df41da0f 100644
--- a/server/utils/s3.js
+++ b/server/utils/s3.js
@@ -4,7 +4,7 @@ import * as Sentry from "@sentry/node";
 import AWS from "aws-sdk";
 import addHours from "date-fns/add_hours";
 import format from "date-fns/format";
-import fetch from "isomorphic-fetch";
+import fetch from "fetch-with-proxy";
 
 const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
 const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
diff --git a/server/utils/updates.js b/server/utils/updates.js
index 1d52e9c1..9e515932 100644
--- a/server/utils/updates.js
+++ b/server/utils/updates.js
@@ -1,7 +1,7 @@
 // @flow
 import crypto from "crypto";
+import fetch from "fetch-with-proxy";
 import invariant from "invariant";
-import fetch from "isomorphic-fetch";
 import packageInfo from "../../package.json";
 
 import { User, Team, Collection, Document } from "../models";
diff --git a/yarn.lock b/yarn.lock
index 62728968..b890af82 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5565,6 +5565,16 @@ fetch-test-server@^1.1.0:
     debug "^3.1.0"
     node-fetch "^2.1.2"
 
+fetch-with-proxy@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fetch-with-proxy/-/fetch-with-proxy-3.0.1.tgz#29ed6d0e2550ef999d40b18de2ba476af4b7dee4"
+  integrity sha512-8C5JZ+Ea2eTOkFuQhB252QPgEc68LS7+8uNrFbYFs7t114Bgdj7hiYmtwkHhmN8TvafGVRbspMMD/Rg/tw0RwA==
+  dependencies:
+    node-abort-controller "^1.1.0"
+    node-fetch "^2.6.1"
+    proxy-from-env "^1.1.0"
+    tunnel-agent "^0.6.0"
+
 figgy-pudding@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -9156,6 +9166,11 @@ nocache@2.1.0:
   resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f"
   integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==
 
+node-abort-controller@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-1.2.1.tgz#1eddb57eb8fea734198b11b28857596dc6165708"
+  integrity sha512-79PYeJuj6S9+yOHirR0JBLFOgjB6sQCir10uN6xRx25iD+ZD4ULqgRn3MwWBRaQGB0vEgReJzWwJo42T1R6YbQ==
+
 node-fetch@2.6.1, node-fetch@^2.1.2, node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
@@ -10431,6 +10446,11 @@ protobufjs@^6.9.0:
     "@types/node" "^13.7.0"
     long "^4.0.0"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"