krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

add res.respond middleware... and use it in user controller

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-11-23 13:07:21 +01:00
parent 349122c9a1
commit 7086fbfbd6
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/src/controllers/api-v3/user.js
View File

@@ -95,7 +95,11 @@ api.registerLocal = {
}
})
.then((savedUser) => {
res.status(201).json(savedUser);
if (savedUser.auth.facebook.id) {
res.respond(200, savedUser.auth.local); // TODO make sure this used .toJSON and removes private fields
} else {
res.respond(201, savedUser);
}
// Clean previous email preferences
EmailUnsubscription
@@ -117,7 +121,7 @@ api.registerLocal = {
function _loginRes (user, req, res, next) {
if (user.auth.blocked) return next(new NotAuthorized(res.t('accountSuspended', {userId: user._id})));
res.status(200).json({id: user._id, apiToken: user.apiToken});
res.respond(200, {id: user._id, apiToken: user.apiToken});
}
/**
@@ -254,7 +258,7 @@ api.deleteSocial = {
if (!user.auth.local.username) return next(new NotAuthorized(res.t('cantDetachFb'))); // TODO move to model validation?
User.update({_id: user._id}, {$unset: {'auth.facebook': 1}})
.then(() => res.status(200).json({ok: true})) // TODO standardize this type of response
.then(() => res.respond(200))
.catch(next);
},
};