UserRepository handles updating db settings better.
Moved the plex_userid to settings to expanded with functions for updating and fetching settings, each with its own helper function towards the database. Since we had a linkPlexUserId function and we dont want plex_userid to be updated from the updatesettings function we moved unlinking to a separate endpoint and class function. Also a new controller and endpoints for getting and updating settings.
This commit is contained in:
@@ -9,6 +9,8 @@ const configuration = require('src/config/configuration').getInstance();
|
||||
|
||||
const listController = require('./controllers/list/listController');
|
||||
const tautulli = require('./controllers/user/viewHistory.js');
|
||||
const SettingsController = require('./controllers/user/settings');
|
||||
const AuthenticatePlexAccountController = require('./controllers/user/AuthenticatePlexAccount');
|
||||
|
||||
// TODO: Have our raven router check if there is a value, if not don't enable raven.
|
||||
Raven.config(configuration.get('raven', 'DSN')).install();
|
||||
@@ -55,9 +57,12 @@ app.use(function onError(err, req, res, next) {
|
||||
*/
|
||||
router.post('/v1/user', require('./controllers/user/register.js'));
|
||||
router.post('/v1/user/login', require('./controllers/user/login.js'));
|
||||
router.get('/v1/user/settings', mustBeAuthenticated, SettingsController.getSettingsController);
|
||||
router.put('/v1/user/settings', mustBeAuthenticated, SettingsController.updateSettingsController);
|
||||
router.get('/v1/user/search_history', mustBeAuthenticated, require('./controllers/user/searchHistory.js'));
|
||||
router.get('/v1/user/requests', mustBeAuthenticated, require('./controllers/user/requests.js'));
|
||||
router.post('/v1/user/authenticate', mustBeAuthenticated, require('./controllers/user/authenticatePlexAccount.js'));
|
||||
router.post('/v1/user/link_plex', mustBeAuthenticated, AuthenticatePlexAccountController.link);
|
||||
router.post('/v1/user/unlink_plex', mustBeAuthenticated, AuthenticatePlexAccountController.unlink);
|
||||
|
||||
router.get('/v1/user/view_history', mustHaveAccountLinkedToPlex, tautulli.userViewHistoryController);
|
||||
router.get('/v1/user/watch_time', mustHaveAccountLinkedToPlex, tautulli.watchTimeStatsController);
|
||||
|
||||
@@ -57,7 +57,7 @@ function plexAuthenticate(username, password) {
|
||||
.then(resp => handleResponse(resp))
|
||||
}
|
||||
|
||||
function authenticatePlexAccountController(req, res) {
|
||||
function link(req, res) {
|
||||
const user = req.loggedInUser;
|
||||
const { username, password } = req.body;
|
||||
|
||||
@@ -70,4 +70,18 @@ function authenticatePlexAccountController(req, res) {
|
||||
.catch(error => handleError(error, res))
|
||||
}
|
||||
|
||||
module.exports = authenticatePlexAccountController;
|
||||
function link(req, res) {
|
||||
const user = req.loggedInUser;
|
||||
|
||||
return userRepository.unlinkPlexUserId(user.username)
|
||||
.then(response => res.send({
|
||||
success: true,
|
||||
message: "Successfully unlinked plex account from seasoned request."
|
||||
}))
|
||||
.catch(error => handleError(error, res))
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
link,
|
||||
unlink
|
||||
};
|
||||
|
||||
42
seasoned_api/src/webserver/controllers/user/settings.js
Normal file
42
seasoned_api/src/webserver/controllers/user/settings.js
Normal file
@@ -0,0 +1,42 @@
|
||||
const UserRepository = require('src/user/userRepository');
|
||||
const userRepository = new UserRepository();
|
||||
/**
|
||||
* Controller: Retrieves settings of a logged in user
|
||||
* @param {Request} req http request variable
|
||||
* @param {Response} res
|
||||
* @returns {Callback}
|
||||
*/
|
||||
const getSettingsController = (req, res) => {
|
||||
const user = req.loggedInUser;
|
||||
const username = user === undefined ? undefined : user.username;
|
||||
|
||||
userRepository.getSettings(username)
|
||||
.then(settings => {
|
||||
res.send({ success: true, settings });
|
||||
})
|
||||
.catch(error => {
|
||||
res.status(404).send({ success: false, message: error.message });
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
const updateSettingsController = (req, res) => {
|
||||
const user = req.loggedInUser;
|
||||
const username = user === undefined ? undefined : user.username;
|
||||
|
||||
const idempotencyKey = req.headers('Idempotency-Key'); // TODO implement better transactions
|
||||
const { dark_mode, emoji } = req.body;
|
||||
|
||||
userRepository.updateSettings(username, dark_mode, emoji)
|
||||
.then(settings => {
|
||||
res.send({ success: true, settings });
|
||||
})
|
||||
.catch(error => {
|
||||
res.status(404).send({ success: false, message: error.message });
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getSettingsController,
|
||||
updateSettingsController
|
||||
}
|
||||
@@ -7,10 +7,10 @@ const mustHaveAccountLinkedToPlex = (req, res, next) => {
|
||||
if (loggedInUser === undefined) {
|
||||
return res.status(401).send({
|
||||
success: false,
|
||||
message: 'You must be logged in.',
|
||||
message: 'You must have your account linked to a plex account.',
|
||||
});
|
||||
} else {
|
||||
database.get(`SELECT plex_userid FROM user WHERE user_name IS ?`, loggedInUser.username)
|
||||
database.get(`SELECT plex_userid FROM settings WHERE user_name IS ?`, loggedInUser.username)
|
||||
.then(row => {
|
||||
const plex_userid = row.plex_userid;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user