From c39d494eb976c570aefc51a0aef4cbd3ed235186 Mon Sep 17 00:00:00 2001
From: IanSeinstraDSW <68335243+IanSeinstraDSW@users.noreply.github.com>
Date: Wed, 15 Jul 2020 15:19:00 +0200
Subject: [PATCH] Updated serviceBase.js to fix the HTTPS_PROXY

Changed the temporary variable name to nodeFetch because the global.fetch wasn't overwriting the variable.
This should fix issue 887:
https://github.com/microsoft/botframework-cli/issues/887
---
 packages/qnamaker/utils/api/serviceBase.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/qnamaker/utils/api/serviceBase.js b/packages/qnamaker/utils/api/serviceBase.js
index 6d10e46d2..7d04b6e22 100644
--- a/packages/qnamaker/utils/api/serviceBase.js
+++ b/packages/qnamaker/utils/api/serviceBase.js
@@ -7,12 +7,12 @@ const { insertParametersFromObject } = require('../insertParametersFromObject');
 const deriveParamsFromPath = require('../deriveParamsFromPath');
 const packageJSON = require('./../../package');
 
-const fetch = require('node-fetch');
+const nodeFetch = require('node-fetch');
 
 global.fetch = function (...args) {
     // No Proxy
     if (!process.env.HTTPS_PROXY) {
-        return fetch(...args);
+        return nodeFetch(...args);
     }
     const [urlOrRequest, requestInit = {}, ...rest] = args;
     // URL is first param attach the proxy
@@ -24,7 +24,7 @@ global.fetch = function (...args) {
     } else {
         urlOrRequest.agent = agent;
     }
-    return fetch(urlOrRequest, requestInit, ...rest);
+    return nodeFetch(urlOrRequest, requestInit, ...rest);
 };
 
 /**