From 7db8f752c59e89ddd67ecb3f938d591dede2c7c1 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sat, 8 Dec 2018 03:59:04 +0000
Subject: [PATCH 1/4] fix: seasoned_api/package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:base64url:20180511
- https://snyk.io/vuln/npm:cryptiles:20180710
- https://snyk.io/vuln/npm:extend:20180424
- https://snyk.io/vuln/npm:stringstream:20180511
---
 seasoned_api/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seasoned_api/package.json b/seasoned_api/package.json
index 2001433..fd1f102 100644
--- a/seasoned_api/package.json
+++ b/seasoned_api/package.json
@@ -18,12 +18,12 @@
     "body-parser": "~1.18.2",
     "cross-env": "~5.1.4",
     "express": "~4.16.0",
-    "jsonwebtoken": "^8.0.1",
+    "jsonwebtoken": "^8.2.0",
     "mongoose": "~5.0.11",
     "km-moviedb": "^0.2.12",
     "node-cache": "^4.1.1",
     "python-shell": "^0.5.0",
-    "request": "^2.85.0",
+    "request": "^2.87.0",
     "request-promise": "^4.2",
     "sqlite3": "^4.0.0"
   },

From 4eaa60b0445d22e977cafeab12b6e7d95c0294f7 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 13 Dec 2018 03:19:03 +0000
Subject: [PATCH 2/4] fix: seasoned_api/package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MPATH-72672
---
 seasoned_api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seasoned_api/package.json b/seasoned_api/package.json
index 2001433..a1e7f03 100644
--- a/seasoned_api/package.json
+++ b/seasoned_api/package.json
@@ -19,7 +19,7 @@
     "cross-env": "~5.1.4",
     "express": "~4.16.0",
     "jsonwebtoken": "^8.0.1",
-    "mongoose": "~5.0.11",
+    "mongoose": "~5.2.12",
     "km-moviedb": "^0.2.12",
     "node-cache": "^4.1.1",
     "python-shell": "^0.5.0",

From 53228a2662ee898b204d79bfa6afd54f91fc5a58 Mon Sep 17 00:00:00 2001
From: snyk-test <snyk-test@snyk.io>
Date: Fri, 26 Jul 2019 23:56:40 +0000
Subject: [PATCH 3/4] fix: client/package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JSYAML-173999
- https://snyk.io/vuln/SNYK-JS-JSYAML-174129
---
 client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index 3529ce3..10fca34 100644
--- a/client/package.json
+++ b/client/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "clean-webpack-plugin": "^0.1.17",
-    "css-loader": "^0.28.4",
+    "css-loader": "^1.0.0",
     "html-webpack-plugin": "^2.28.0",
     "path": "^0.12.7",
     "react": "^15.6.1",

From 6b737b8ab4fac60d74823fdf9b82cea9382823a2 Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Mon, 4 Nov 2019 00:57:27 +0100
Subject: [PATCH 4/4] Updated all controller responses to return message not
 error on errors.

---
 .../src/webserver/controllers/list/listController.js      | 2 +-
 seasoned_api/src/webserver/controllers/movie/credits.js   | 2 +-
 seasoned_api/src/webserver/controllers/movie/info.js      | 2 +-
 .../src/webserver/controllers/movie/releaseDates.js       | 2 +-
 seasoned_api/src/webserver/controllers/person/info.js     | 2 +-
 .../src/webserver/controllers/pirate/addMagnet.js         | 4 ++--
 .../src/webserver/controllers/pirate/searchTheBay.js      | 4 ++--
 .../src/webserver/controllers/plex/fetchRequested.js      | 2 +-
 .../src/webserver/controllers/plex/plexPlaying.js         | 6 +++---
 .../src/webserver/controllers/plex/readRequest.js         | 6 +++---
 seasoned_api/src/webserver/controllers/plex/search.js     | 8 ++++----
 .../src/webserver/controllers/plex/searchMedia.js         | 8 ++++----
 .../src/webserver/controllers/plex/searchRequest.js       | 4 ++--
 .../src/webserver/controllers/plex/submitRequest.js       | 4 ++--
 .../src/webserver/controllers/plex/updateRequested.js     | 2 +-
 .../src/webserver/controllers/request/fetchAllRequests.js | 6 +++---
 .../src/webserver/controllers/request/getRequest.js       | 2 +-
 .../src/webserver/controllers/request/requestTmdbId.js    | 8 ++++----
 .../src/webserver/controllers/search/movieSearch.js       | 2 +-
 .../src/webserver/controllers/search/multiSearch.js       | 2 +-
 .../src/webserver/controllers/search/personSearch.js      | 2 +-
 .../src/webserver/controllers/search/showSearch.js        | 4 ++--
 .../src/webserver/controllers/seasoned/readStrays.js      | 2 +-
 .../src/webserver/controllers/seasoned/strayById.js       | 2 +-
 .../src/webserver/controllers/seasoned/verifyStray.js     | 2 +-
 seasoned_api/src/webserver/controllers/show/credits.js    | 2 +-
 seasoned_api/src/webserver/controllers/show/info.js       | 6 ++++--
 seasoned_api/src/webserver/controllers/user/history.js    | 6 +++---
 seasoned_api/src/webserver/controllers/user/login.js      | 6 +++---
 seasoned_api/src/webserver/controllers/user/register.js   | 6 +++---
 seasoned_api/src/webserver/controllers/user/requests.js   | 7 +++----
 31 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/seasoned_api/src/webserver/controllers/list/listController.js b/seasoned_api/src/webserver/controllers/list/listController.js
index 0a4018b..4e7806f 100644
--- a/seasoned_api/src/webserver/controllers/list/listController.js
+++ b/seasoned_api/src/webserver/controllers/list/listController.js
@@ -20,7 +20,7 @@ function handleError(error, res) {
   const { status, message } = error;
 
   if (status && message) {
-    res.status(error.status).send({ success: false, error: error.message })
+    res.status(status).send({ success: false, message })
   } else {
     console.log('caught list controller error', error)
     res.status(500).send({ message: 'An unexpected error occured while requesting list'})
diff --git a/seasoned_api/src/webserver/controllers/movie/credits.js b/seasoned_api/src/webserver/controllers/movie/credits.js
index a3eceb8..542adfc 100644
--- a/seasoned_api/src/webserver/controllers/movie/credits.js
+++ b/seasoned_api/src/webserver/controllers/movie/credits.js
@@ -14,7 +14,7 @@ const movieCreditsController = (req, res) => {
       const { status, message } = error;
 
       if (status && message) {
-        res.status(error.status).send({ success: false, error: error.message })
+        res.status(status).send({ success: false, message })
       } else {
         // TODO log unhandled errors
         console.log('caugth movie credits controller error', error)
diff --git a/seasoned_api/src/webserver/controllers/movie/info.js b/seasoned_api/src/webserver/controllers/movie/info.js
index 14d4d82..91d8391 100644
--- a/seasoned_api/src/webserver/controllers/movie/info.js
+++ b/seasoned_api/src/webserver/controllers/movie/info.js
@@ -10,7 +10,7 @@ function handleError(error, res) {
   const { status, message } = error;
 
   if (status && message) {
-    res.status(error.status).send({ success: false, error: error.message })
+    res.status(status).send({ success: false, message })
   } else {
     console.log('caught movieinfo controller error', error)
     res.status(500).send({ message: 'An unexpected error occured while requesting movie info'})
diff --git a/seasoned_api/src/webserver/controllers/movie/releaseDates.js b/seasoned_api/src/webserver/controllers/movie/releaseDates.js
index 01cd48e..c9797de 100644
--- a/seasoned_api/src/webserver/controllers/movie/releaseDates.js
+++ b/seasoned_api/src/webserver/controllers/movie/releaseDates.js
@@ -14,7 +14,7 @@ const movieReleaseDatesController = (req, res) => {
       const { status, message } = error;
 
       if (status && message) {
-        res.status(error.status).send({ success: false, error: error.message })
+        res.status(status).send({ success: false, message })
       } else {
         // TODO log unhandled errors : here our at tmdbReleaseError ?
         console.log('caugth release dates controller error', error)
diff --git a/seasoned_api/src/webserver/controllers/person/info.js b/seasoned_api/src/webserver/controllers/person/info.js
index a0eeab6..ea24d7a 100644
--- a/seasoned_api/src/webserver/controllers/person/info.js
+++ b/seasoned_api/src/webserver/controllers/person/info.js
@@ -18,7 +18,7 @@ function personInfoController(req, res) {
   tmdb.personInfo(personId)
   .then(person => res.send(person.createJsonResponse()))
   .catch(error => {
-    res.status(404).send({ success: false, error: error.message });
+    res.status(404).send({ success: false, message: error.message });
   });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/pirate/addMagnet.js b/seasoned_api/src/webserver/controllers/pirate/addMagnet.js
index e46988a..b11af5f 100644
--- a/seasoned_api/src/webserver/controllers/pirate/addMagnet.js
+++ b/seasoned_api/src/webserver/controllers/pirate/addMagnet.js
@@ -17,8 +17,8 @@ function addMagnet(req, res) {
       .then((result) => {
          res.send(result);
       })
-      .catch((error) => {
-         res.status(500).send({ success: false, error: error.message });
+      .catch(error => {
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js b/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js
index fcba93a..1497a29 100644
--- a/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js
+++ b/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js
@@ -21,8 +21,8 @@ function updateRequested(req, res) {
       .then((result) => {
          res.send({ success: true, results: result });
       })
-      .catch((error) => {
-         res.status(401).send({ success: false, error: error.message });
+      .catch(error => {
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/plex/fetchRequested.js b/seasoned_api/src/webserver/controllers/plex/fetchRequested.js
index cd0f842..149fe73 100644
--- a/seasoned_api/src/webserver/controllers/plex/fetchRequested.js
+++ b/seasoned_api/src/webserver/controllers/plex/fetchRequested.js
@@ -17,7 +17,7 @@ function fetchRequestedController(req, res) {
          res.send({ success: true, results: requestedItems, total_results: requestedItems.length });
       })
       .catch((error) => {
-         res.status(401).send({ success: false, error: error.message });
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/plex/plexPlaying.js b/seasoned_api/src/webserver/controllers/plex/plexPlaying.js
index 30b05e2..c26f677 100644
--- a/seasoned_api/src/webserver/controllers/plex/plexPlaying.js
+++ b/seasoned_api/src/webserver/controllers/plex/plexPlaying.js
@@ -5,11 +5,11 @@ const plexRepository = new PlexRepository(configuration.get('plex', 'ip'));
 
 function playingController(req, res) {
    plexRepository.nowPlaying()
-      .then((movies) => {
+      .then(movies => {
          res.send(movies);
       })
-      .catch((error) => {
-         res.status(500).send({ success: false, error: error.message });
+      .catch(error => {
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/plex/readRequest.js b/seasoned_api/src/webserver/controllers/plex/readRequest.js
index 351dae6..224f682 100644
--- a/seasoned_api/src/webserver/controllers/plex/readRequest.js
+++ b/seasoned_api/src/webserver/controllers/plex/readRequest.js
@@ -12,10 +12,10 @@ function readRequestController(req, res) {
    const mediaId = req.params.mediaId;
    const { type } = req.query;
    requestRepository.lookup(mediaId, type)
-      .then((movies) => {
+      .then(movies => {
          res.send(movies);
-      }).catch((error) => {
-         res.status(404).send({ success: false, error: error.message });
+      }).catch(error => {
+         res.status(404).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/plex/search.js b/seasoned_api/src/webserver/controllers/plex/search.js
index 69401c6..bf932d3 100644
--- a/seasoned_api/src/webserver/controllers/plex/search.js
+++ b/seasoned_api/src/webserver/controllers/plex/search.js
@@ -11,14 +11,14 @@ const plex = new Plex(configuration.get('plex', 'ip'));
 function searchPlexController(req, res) {
    const { query, type } = req.query;
    plex.search(query, type)
-      .then((movies) => {
+      .then(movies => {
          if (movies.length > 0) {
             res.send(movies);
          } else {
-            res.status(404).send({ success: false, error: 'Search query did not give any results from plex.'})
+            res.status(404).send({ success: false, message: 'Search query did not give any results from plex.'})
          }
-      }).catch((error) => {
-         res.status(500).send({ success: false, error: error.message });
+      }).catch(error => {
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/plex/searchMedia.js b/seasoned_api/src/webserver/controllers/plex/searchMedia.js
index 4eee722..514312f 100644
--- a/seasoned_api/src/webserver/controllers/plex/searchMedia.js
+++ b/seasoned_api/src/webserver/controllers/plex/searchMedia.js
@@ -14,15 +14,15 @@ function searchMediaController(req, res) {
    const { query } = req.query;
 
    plexRepository.search(query)
-      .then((media) => {
+      .then(media => {
          if (media !== undefined || media.length > 0) {
             res.send(media);
          } else {
-            res.status(404).send({ success: false, error: 'Search query did not return any results.' });
+            res.status(404).send({ success: false, message: 'Search query did not return any results.' });
          }
       })
-      .catch((error) => {
-         res.status(500).send({ success: false, error: error.message });
+      .catch(error => {
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/plex/searchRequest.js b/seasoned_api/src/webserver/controllers/plex/searchRequest.js
index 6aabb7b..2bc970c 100644
--- a/seasoned_api/src/webserver/controllers/plex/searchRequest.js
+++ b/seasoned_api/src/webserver/controllers/plex/searchRequest.js
@@ -18,8 +18,8 @@ function searchRequestController(req, res) {
       .then((searchResult) => {
          res.send(searchResult);
       })
-      .catch((error) => {
-         res.status(500).send({ success: false, error: error });
+      .catch(error => {
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/plex/submitRequest.js b/seasoned_api/src/webserver/controllers/plex/submitRequest.js
index e4d7e78..a86aaa2 100644
--- a/seasoned_api/src/webserver/controllers/plex/submitRequest.js
+++ b/seasoned_api/src/webserver/controllers/plex/submitRequest.js
@@ -37,7 +37,7 @@ function submitRequestController(req, res) {
     console.log('show')
     mediaFunction = tmdbShowInfo
   } else {
-    res.status(422).send({ success: false, error: 'Incorrect type. Allowed types: "movie" or "show"'})
+    res.status(422).send({ success: false, message: 'Incorrect type. Allowed types: "movie" or "show"'})
   }
 
   if (mediaFunction === undefined) { res.status(200); return }
@@ -45,7 +45,7 @@ function submitRequestController(req, res) {
   mediaFunction(id)
     .then(tmdbMedia => request.requestFromTmdb(tmdbMedia, ip, user_agent, user))
     .then(() => res.send({ success: true, message: 'Media item successfully requested' }))
-    .catch(err => res.status(500).send({ success: false, error: err.message }))
+    .catch(err => res.status(500).send({ success: false, message: err.message }))
 }
 
 module.exports = submitRequestController;
diff --git a/seasoned_api/src/webserver/controllers/plex/updateRequested.js b/seasoned_api/src/webserver/controllers/plex/updateRequested.js
index 6057bf4..fdb2a72 100644
--- a/seasoned_api/src/webserver/controllers/plex/updateRequested.js
+++ b/seasoned_api/src/webserver/controllers/plex/updateRequested.js
@@ -18,7 +18,7 @@ function updateRequested(req, res) {
          res.send({ success: true });
       })
       .catch((error) => {
-         res.status(401).send({ success: false, error: error.message });
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/request/fetchAllRequests.js b/seasoned_api/src/webserver/controllers/request/fetchAllRequests.js
index fb16b41..030deb3 100644
--- a/seasoned_api/src/webserver/controllers/request/fetchAllRequests.js
+++ b/seasoned_api/src/webserver/controllers/request/fetchAllRequests.js
@@ -18,9 +18,9 @@ function fetchAllRequests(req, res) {
 
   Promise.resolve()
   .then(() => request.fetchAll(page, sort_by, sort_direction, filter, query))
-  .then((result) => res.send(result))
-  .catch((error) => {
-    res.status(404).send({ success: false, error: error.message });
+  .then(result => res.send(result))
+  .catch(error => {
+    res.status(404).send({ success: false, message: error.message });
   });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/request/getRequest.js b/seasoned_api/src/webserver/controllers/request/getRequest.js
index e72b8e2..856f320 100644
--- a/seasoned_api/src/webserver/controllers/request/getRequest.js
+++ b/seasoned_api/src/webserver/controllers/request/getRequest.js
@@ -14,7 +14,7 @@ function fetchAllRequests(req, res) {
   request.getRequestByIdAndType(id, type)
     .then(result => res.send(result))
     .catch(error => {
-      res.status(404).send({ success: false, error: error.message });
+      res.status(404).send({ success: false, message: error.message });
     });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/request/requestTmdbId.js b/seasoned_api/src/webserver/controllers/request/requestTmdbId.js
index 5604252..016accb 100644
--- a/seasoned_api/src/webserver/controllers/request/requestTmdbId.js
+++ b/seasoned_api/src/webserver/controllers/request/requestTmdbId.js
@@ -38,15 +38,15 @@ function requestTmdbIdController(req, res) {
   } else if (type === 'show') {
     mediaFunction = tmdbShowInfo
   } else {
-    res.status(422).send({ success: false, error: 'Incorrect type. Allowed types: "movie" or "show"'})
+    res.status(422).send({ success: false, message: 'Incorrect type. Allowed types: "movie" or "show"'})
   }
 
   mediaFunction(id)
     // .catch((error) => { console.error(error); res.status(404).send({ success: false, error: 'Id not found' }) })
-    .then((tmdbMedia) => request.requestFromTmdb(tmdbMedia, ip, user_agent, user))
+    .then(tmdbMedia => request.requestFromTmdb(tmdbMedia, ip, user_agent, user))
     .then(() => res.send({success: true, message: 'Request has been submitted.'}))
-    .catch((error) => {
-      res.send({ success: false, error: error.message });
+    .catch(error => {
+      res.send({ success: false, message: error.message });
     })
 }
 
diff --git a/seasoned_api/src/webserver/controllers/search/movieSearch.js b/seasoned_api/src/webserver/controllers/search/movieSearch.js
index 4a9dfd7..e9b7ffa 100644
--- a/seasoned_api/src/webserver/controllers/search/movieSearch.js
+++ b/seasoned_api/src/webserver/controllers/search/movieSearch.js
@@ -26,7 +26,7 @@ function movieSearchController(req, res) {
       const { status, message } = error;
 
       if (status && message) {
-        res.status(error.status).send({ success: false, error: error.message })
+        res.status(status).send({ success: false, message })
       } else {
         // TODO log unhandled errors
         console.log('caugth movie search controller error', error)
diff --git a/seasoned_api/src/webserver/controllers/search/multiSearch.js b/seasoned_api/src/webserver/controllers/search/multiSearch.js
index 37b44cf..0f9b05f 100644
--- a/seasoned_api/src/webserver/controllers/search/multiSearch.js
+++ b/seasoned_api/src/webserver/controllers/search/multiSearch.js
@@ -33,7 +33,7 @@ function multiSearchController(req, res) {
     const { status, message } = error;
 
     if (status && message) {
-      res.status(error.status).send({ success: false, error: error.message })
+      res.status(status).send({ success: false, message })
     } else {
       // TODO log unhandled errors
       console.log('caugth multi search controller error', error)
diff --git a/seasoned_api/src/webserver/controllers/search/personSearch.js b/seasoned_api/src/webserver/controllers/search/personSearch.js
index 7c35272..dcb7b2a 100644
--- a/seasoned_api/src/webserver/controllers/search/personSearch.js
+++ b/seasoned_api/src/webserver/controllers/search/personSearch.js
@@ -28,7 +28,7 @@ function personSearchController(req, res) {
       const { status, message } = error;
 
       if (status && message) {
-        res.status(error.status).send({ success: false, error: error.message })
+        res.status(status).send({ success: false, message })
       } else {
         // TODO log unhandled errors
         console.log('caugth person search controller error', error)
diff --git a/seasoned_api/src/webserver/controllers/search/showSearch.js b/seasoned_api/src/webserver/controllers/search/showSearch.js
index f982116..fc77cae 100644
--- a/seasoned_api/src/webserver/controllers/search/showSearch.js
+++ b/seasoned_api/src/webserver/controllers/search/showSearch.js
@@ -27,8 +27,8 @@ function showSearchController(req, res) {
   .then((shows) => {
     res.send(shows);
   })
-  .catch((error) => {
-    res.status(500).send({ success: false, error: error.message });
+  .catch(error => {
+    res.status(500).send({ success: false, message: error.message });
   });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/seasoned/readStrays.js b/seasoned_api/src/webserver/controllers/seasoned/readStrays.js
index 1f87b31..ca71d46 100644
--- a/seasoned_api/src/webserver/controllers/seasoned/readStrays.js
+++ b/seasoned_api/src/webserver/controllers/seasoned/readStrays.js
@@ -10,7 +10,7 @@ function readStraysController(req, res) {
          res.send(strays);
       })
       .catch((error) => {
-         res.status(500).send({ success: false, error: error.message });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/seasoned/strayById.js b/seasoned_api/src/webserver/controllers/seasoned/strayById.js
index 9cdd57c..2810097 100644
--- a/seasoned_api/src/webserver/controllers/seasoned/strayById.js
+++ b/seasoned_api/src/webserver/controllers/seasoned/strayById.js
@@ -10,7 +10,7 @@ function strayByIdController(req, res) {
          res.send(stray);
       })
       .catch((error) => {
-         res.status(500).send({ success: false, error: error.message });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js b/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js
index 79c807c..84abc76 100644
--- a/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js
+++ b/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js
@@ -10,7 +10,7 @@ function verifyStrayController(req, res) {
          res.send({ success: true, message: 'Episode verified' });
       })
       .catch((error) => {
-         res.status(500).send({ success: false, error: error.message });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/show/credits.js b/seasoned_api/src/webserver/controllers/show/credits.js
index fcfccbd..7974f1f 100644
--- a/seasoned_api/src/webserver/controllers/show/credits.js
+++ b/seasoned_api/src/webserver/controllers/show/credits.js
@@ -14,7 +14,7 @@ const showCreditsController = (req, res) => {
       const { status, message } = error;
 
       if (status && message) {
-        res.status(error.status).send({ success: false, error: error.message })
+        res.status(status).send({ success: false, message })
       } else {
         // TODO log unhandled errors
         console.log('caugth show credits controller error', error)
diff --git a/seasoned_api/src/webserver/controllers/show/info.js b/seasoned_api/src/webserver/controllers/show/info.js
index 5cd56e8..e335b15 100644
--- a/seasoned_api/src/webserver/controllers/show/info.js
+++ b/seasoned_api/src/webserver/controllers/show/info.js
@@ -10,10 +10,12 @@ function handleError(error, res) {
   const { status, message } = error;
 
   if (status && message) {
-    res.status(error.status).send({ success: false, error: error.message })
+    res.status(status).send({ success: false, message })
   } else {
     console.log('caught showinfo controller error', error)
-    res.status(500).send({ message: 'An unexpected error occured while requesting show info'})
+    res.status(500).send({
+      message: 'An unexpected error occured while requesting show info.'
+    })
   }
 }
 
diff --git a/seasoned_api/src/webserver/controllers/user/history.js b/seasoned_api/src/webserver/controllers/user/history.js
index ef41bb5..36cb77f 100644
--- a/seasoned_api/src/webserver/controllers/user/history.js
+++ b/seasoned_api/src/webserver/controllers/user/history.js
@@ -13,11 +13,11 @@ function historyController(req, res) {
    const username = user === undefined ? undefined : user.username;
 
    searchHistory.read(username)
-      .then((searchQueries) => {
+      .then(searchQueries => {
          res.send({ success: true, searchQueries });
       })
-      .catch((error) => {
-         res.status(404).send({ success: false, error: error });
+      .catch(error => {
+         res.status(404).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/user/login.js b/seasoned_api/src/webserver/controllers/user/login.js
index 25d8bca..ada2bcc 100644
--- a/seasoned_api/src/webserver/controllers/user/login.js
+++ b/seasoned_api/src/webserver/controllers/user/login.js
@@ -20,13 +20,13 @@ function loginController(req, res) {
 
    userSecurity.login(user, password)
       .then(() => userRepository.checkAdmin(user))
-      .then((checkAdmin) => {
+      .then(checkAdmin => {
          const isAdmin = checkAdmin === 1 ? true : false;
          const token = new Token(user, isAdmin).toString(secret);
          res.send({ success: true, token });
       })
-      .catch((error) => {
-         res.status(401).send({ success: false, error: error.message });
+      .catch(error => {
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/user/register.js b/seasoned_api/src/webserver/controllers/user/register.js
index 36d9ff2..4ede957 100644
--- a/seasoned_api/src/webserver/controllers/user/register.js
+++ b/seasoned_api/src/webserver/controllers/user/register.js
@@ -20,15 +20,15 @@ function registerController(req, res) {
 
    userSecurity.createNewUser(user, password)
       .then(() => userRepository.checkAdmin(user))
-      .then((checkAdmin) => {
+      .then(checkAdmin => {
          const isAdmin = checkAdmin === 1 ? true : false;
          const token = new Token(user, isAdmin).toString(secret);
          res.send({
             success: true, message: 'Welcome to Seasoned!', token
          });
       })
-      .catch((error) => {
-         res.status(401).send({ success: false, error: error.message });
+      .catch(error => {
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 
diff --git a/seasoned_api/src/webserver/controllers/user/requests.js b/seasoned_api/src/webserver/controllers/user/requests.js
index 98bb219..b43e71c 100644
--- a/seasoned_api/src/webserver/controllers/user/requests.js
+++ b/seasoned_api/src/webserver/controllers/user/requests.js
@@ -12,12 +12,11 @@ function requestsController(req, res) {
    const user = req.loggedInUser;
 
    requestRepository.userRequests(user)
-      .then((requests) => {
+      .then(requests => {
          res.send({ success: true, results: requests, total_results: requests.length });
       })
-      .catch((error) => {
-         console.log(error)
-         res.status(500).send({ success: false, error: error });
+      .catch(error => {
+         res.status(500).send({ success: false, message: error.message });
       });
 }