krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'facebook-login-add-newuser-flag' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-facebook-login-add-newuser-flag

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-08-04 19:58:09 +02:00
parent d097868cad 2a76f0c8cf
commit d1bd63289b
3 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/server/controllers/api-v3/auth.js
View File

@@ -163,7 +163,7 @@ api.registerLocal = {
function _loginRes (user, req, res) {
if (user.auth.blocked) throw new NotAuthorized(res.t('accountSuspended', {userId: user._id}));
return res.respond(200, {id: user._id, apiToken: user.apiToken});
return res.respond(200, {id: user._id, apiToken: user.apiToken, newUser: user.newUser || false});
}
/**
@@ -260,6 +260,7 @@ api.loginSocial = {
let savedUser = await user.save();
user.newUser = true;
_loginRes(user, ...arguments);
// Clean previous email preferences