From ec3712685d021794e2fb5e1df9dbf4354452933d Mon Sep 17 00:00:00 2001
From: jrtechs <jxr8142@rit.edu>
Date: Sun, 17 Feb 2019 02:15:07 -0500
Subject: [PATCH] Improved security of web server.

---
 configManager.js         |  6 ------
 public/FriendsGraph.html |  3 +--
 routes/api.js            | 26 ++++++++++----------------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/configManager.js b/configManager.js
index c77a328..8c48aa9 100644
--- a/configManager.js
+++ b/configManager.js
@@ -33,11 +33,5 @@ module.exports=
         getSessionSecret: function()
         {
             return config.sessionSecret;
-        },
-
-        getAPIUser: function()
-        {
-            return config.user;
         }
-
     };
\ No newline at end of file
diff --git a/public/FriendsGraph.html b/public/FriendsGraph.html
index a9156bd..d845911 100644
--- a/public/FriendsGraph.html
+++ b/public/FriendsGraph.html
@@ -54,7 +54,7 @@
 
         <div class="row">
             <div class="col-md-8 col-12">
-                <h2 id="graphLabel"></h2>
+                <h2 id="graphLoading"></h2>
                 <div id="myGraph" class="w-100"></div>
                 <pre id="eventSpan"></pre>
             </div>
@@ -62,7 +62,6 @@
                 <div id="profileGen"></div>
             </div>
         </div>
-
 <script>
 
     function createGraphs(username)
diff --git a/routes/api.js b/routes/api.js
index 5d4eac5..5052743 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -34,6 +34,7 @@ function queryGitHubAPI(requestURL)
             {
                 queryURL = GITHUB_API + requestURL + "?" + authenticate;
             }
+            console.log(queryURL);
 
             got(queryURL, { json: true }).then(response =>
             {
@@ -41,12 +42,9 @@ function queryGitHubAPI(requestURL)
                 cache.put(requestURL, response.body);
             }).catch(error =>
             {
-                // resolve(response.body);
-                // cache.put(requestURL, response.body);
-                console.log(error);
                 reject(error);
+                cache.put(requestURL, response.body);
             });
-
         }
         else
         {
@@ -60,24 +58,20 @@ routes.get('/*', (request, result) =>
 {
     var gitHubAPIURL = request.url;
 
-    // if(request.query.hasOwnProperty("page"))
-    // {
-    //     gitHubAPIURL += "?page=" + request.query.page;
-    // }
-
-    console.log(request.query);
-
-    console.log(gitHubAPIURL);
-
-
     result.setHeader('Content-Type', 'application/json');
     queryGitHubAPI(gitHubAPIURL).then(function(data)
     {
-        result.write(JSON.stringify(data));
+        if(data.hasOwnProperty("id"))
+        {
+            result.write(JSON.stringify(data));
+        }
         result.end();
     }).catch(function(error)
     {
-        result.write(JSON.stringify(error));
+        if(error.hasOwnProperty("id"))
+        {
+            result.write(JSON.stringify(error));
+        }
         result.end();
     })
 });