From f451bff6e7505c1a56028d419a77bf6bb2aab77a Mon Sep 17 00:00:00 2001
From: Maxx Crawford <maxx.crawford@gmail.com>
Date: Tue, 23 Feb 2021 13:25:47 -0600
Subject: [PATCH] Add full Mullvad JSON URL to manifest, retool fetch request

---
 src/js/background/backgroundLogic.js | 27 +++++++++------------------
 src/manifest.json                    |  2 +-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index f2395b4..81bc43a 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -29,25 +29,16 @@ const backgroundLogic = {
   },
 
   async getMullvadInfo() {
-    console.log("getMullvadInfo");
     const amIMullvadPath = "https://am.i.mullvad.net/json";
-    console.log(`fetching ${amIMullvadPath}`);
-    const response = await fetch("https://am.i.mullvad.net/json", {
-      "credentials": "omit",
-      "headers": {
-        "Accept": "application/json",
-        "Accept-Encoding": "gzip, deflate, br",
-        "Accept-Language": "en-US,en;q=0.5",
-        "Host": "am.i.mullvad.net",
-      },
-      "method": "GET",
-      "mode": "cors"
-    });
-    // const response = await fetch(amIMullvadPath);
-    console.log(`response: ${response}`);
-    const responseJson = await response.json();
-    console.log(`responseJson: ${responseJson}`);
-    return responseJson;
+
+    // TODO: Add some sort of error catching
+    const mullvadFetchData = await fetch(amIMullvadPath)
+      .then((response) => response.json())
+      .then(data => {
+        return data;
+      });
+
+    return await mullvadFetchData;
   },
 
   async getMullvadServers() {
diff --git a/src/manifest.json b/src/manifest.json
index 90f9e0f..d3f2c11 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -30,7 +30,7 @@
     "webRequest",
     "proxy",
 
-    "https://am.i.mullvad.net/*"
+    "https://am.i.mullvad.net/json"
   ],
   "optional_permissions": [
     "bookmarks"