diff --git a/.gitignore b/.gitignore index d5d6790..45a7670 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,11 @@ node_modules .nyc_output dist npm-debug.log -coverage \ No newline at end of file +coverage +.nycrc +.npmignore +.eslinstrc.js +.DS_Store +.prettierignore +.prettierrc.json +.sequelizerc \ No newline at end of file diff --git a/server/services/plex/helpers.js b/server/services/plex/helpers.js index 8f776bf..3aca2df 100644 --- a/server/services/plex/helpers.js +++ b/server/services/plex/helpers.js @@ -50,4 +50,14 @@ const request = async function(url) { }); }; -export default {formatResponse, buildUrl, request}; +const handleError = (res, method) => err => { + console.log('Error in', method); + console.log(err); + const {code, message} = err.responseData || { + code: 500, + message: 'An unknown error occurred.', + }; + res.status(code).json({message}); +}; + +export default {formatResponse, buildUrl, request, handleError}; diff --git a/server/services/plex/index.js b/server/services/plex/index.js index bd92816..2b2080b 100644 --- a/server/services/plex/index.js +++ b/server/services/plex/index.js @@ -1,6 +1,7 @@ import plexApi from './plexApi'; import importData from './importData'; import auth from './auth'; +import helpers from './helpers'; const getAuthToken = async (req, res) => { const {username} = req.query; @@ -16,7 +17,7 @@ const getUsers = async (req, res) => { const users = await plexApi.getUsers(); res.json(users); } catch (error) { - res.json(error); + helpers.handleError(res, getUsers.name); } }; diff --git a/test/server/services/plex/index.test.js b/test/server/services/plex/index.test.js index 84d2d3f..35b12ee 100644 --- a/test/server/services/plex/index.test.js +++ b/test/server/services/plex/index.test.js @@ -101,8 +101,8 @@ describe('Library Data', () => { .request(app) .get('/api/users?X-Plex-Token') .end((err, res) => { - console.log('error-mike--', res); res.should.have.status(404); + console.log(res.body); done(); }); });