Merge branch 'api_fixes' of github.com:kevinmidboe/seasonedShows into api_fixes

This commit is contained in:
2018-02-05 14:25:25 +01:00
2 changed files with 6 additions and 5 deletions

View File

@@ -106,10 +106,11 @@ class RequestRepository {
// }); // });
// return tmdbMovie; // return tmdbMovie;
// }); // });
if (type === 'movie') { type = 'movieInfo'} let tmdbType = undefined;
else if (type === 'tv') { type = 'tvInfo'} if (type === 'movie') { tmdbType = 'movieInfo'}
else if (type === 'tv') { tmdbType = 'tvInfo'}
return Promise.resolve() return Promise.resolve()
.then(() => tmdb.lookup(identifier, type)) .then(() => tmdb.lookup(identifier, tmdbType))
.then((tmdbMovie) => { .then((tmdbMovie) => {
return Promise.resolve(plexRepository.searchMedia(tmdbMovie.title)) return Promise.resolve(plexRepository.searchMedia(tmdbMovie.title))
.then((plexMovies) => { .then((plexMovies) => {

View File

@@ -62,7 +62,7 @@ app.use(function onError(err, req, res, next) {
*/ */
router.post('/v1/user', require('./controllers/user/register.js')); router.post('/v1/user', require('./controllers/user/register.js'));
router.post('/v1/user/login', require('./controllers/user/login.js')); router.post('/v1/user/login', require('./controllers/user/login.js'));
router.get('/v1/user/history', mustBeAuthenticated, require('./controllers/user/history.js')); router.get('/v1/user/history', require('./controllers/user/history.js'));
/** /**
* Seasoned * Seasoned
@@ -84,7 +84,7 @@ router.get('/v1/plex/hook', require('./controllers/plex/hookDump.js'));
/** /**
* Requests * Requests
*/ */
router.get('/v1/plex/requests/all', mustBeAuthenticated, require('./controllers/plex/fetchRequested.js')); router.get('/v1/plex/requests/all', require('./controllers/plex/fetchRequested.js'));
router.put('/v1/plex/request/:requestId', mustBeAuthenticated, require('./controllers/plex/updateRequested.js')); router.put('/v1/plex/request/:requestId', mustBeAuthenticated, require('./controllers/plex/updateRequested.js'));
/** /**