Merged api/v2 into feature branch

seasoned_api/package.json

@@ -23,13 +23,13 @@
     "cross-env": "~5.1.4",
     "express": "~4.16.0",
     "form-data": "^2.5.1",
-    "jsonwebtoken": "^8.0.1",
+    "jsonwebtoken": "^8.2.0",
     "km-moviedb": "^0.2.12",
     "node-cache": "^4.1.1",
     "node-fetch": "^2.6.0",
     "python-shell": "^0.5.0",
     "raven": "^2.4.2",
-    "request": "^2.85.0",
+    "request": "^2.87.0",
     "request-promise": "^4.2",
     "sqlite3": "^4.0.0"
   },

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'})

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)

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'})

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)

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 });
   });
 }
 

seasoned_api/src/webserver/controllers/pirate/addMagnet.js

@@ -17,8 +17,8 @@ function addMagnet(req, res) {
       .then((result) => {
          res.send(result);
       })
-      .catch((error) => {
+      .catch(error => {
-         res.status(500).send({ success: false, error: error.message });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 

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) => {
+      .catch(error => {
-         res.status(401).send({ success: false, error: error.message });
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 

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 });
       });
 }
 

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) => {
+      .catch(error => {
-         res.status(500).send({ success: false, error: error.message });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 

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) => {
+      }).catch(error => {
-         res.status(404).send({ success: false, error: error.message });
+         res.status(404).send({ success: false, message: error.message });
       });
 }
 

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) => {
+      }).catch(error => {
-         res.status(500).send({ success: false, error: error.message });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 

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) => {
+      .catch(error => {
-         res.status(500).send({ success: false, error: error.message });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 

seasoned_api/src/webserver/controllers/plex/searchRequest.js

@@ -18,8 +18,8 @@ function searchRequestController(req, res) {
       .then((searchResult) => {
          res.send(searchResult);
       })
-      .catch((error) => {
+      .catch(error => {
-         res.status(500).send({ success: false, error: error });
+         res.status(500).send({ success: false, message: error.message });
       });
 }
 

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;

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 });
       });
 }
 

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))
+  .then(result => res.send(result))
-  .catch((error) => {
+  .catch(error => {
-    res.status(404).send({ success: false, error: error.message });
+    res.status(404).send({ success: false, message: error.message });
   });
 }
 

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 });
     });
 }
 

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) => {
+    .catch(error => {
-      res.send({ success: false, error: error.message });
+      res.send({ success: false, message: error.message });
     })
 }
 

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)

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)

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)

seasoned_api/src/webserver/controllers/search/showSearch.js

@@ -27,8 +27,8 @@ function showSearchController(req, res) {
   .then((shows) => {
     res.send(shows);
   })
-  .catch((error) => {
+  .catch(error => {
-    res.status(500).send({ success: false, error: error.message });
+    res.status(500).send({ success: false, message: error.message });
   });
 }
 

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 });
       });
 }
 

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 });
       });
 }
 

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 });
       });
 }
 

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)

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.'
+    })
   }
 }
 

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) => {
+      .catch(error => {
-         res.status(404).send({ success: false, error: error });
+         res.status(404).send({ success: false, message: error.message });
       });
 }
 

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) => {
+      .catch(error => {
-         res.status(401).send({ success: false, error: error.message });
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 

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) => {
+      .catch(error => {
-         res.status(401).send({ success: false, error: error.message });
+         res.status(401).send({ success: false, message: error.message });
       });
 }
 

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) => {
+      .catch(error => {
-         console.log(error)
+         res.status(500).send({ success: false, message: error.message });
-         res.status(500).send({ success: false, error: error });
       });
 }