krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6225

Browse Source
This commit is contained in:
Blade Barringer
2015-11-12 12:52:35 -06:00
parent 431bbd762f
commit abe778836d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/src/controllers/api-v2/auth.js
View File

@@ -103,11 +103,13 @@ api.registerUser = function(req, res, next) {
hashed_password: utils.encryptPassword(req.body.password, salt) hashed_password: utils.encryptPassword(req.body.password, salt)
}, },
timestamps: {created: +new Date(), loggedIn: +new Date()} timestamps: {created: +new Date(), loggedIn: +new Date()}
} },
registeredThrough: req.headers['x-client']
}; };
// existing user, allow them to add local authentication // existing user, allow them to add local authentication
if (data.findFacebook) { if (data.findFacebook) {
data.findFacebook.auth.local = newUser.auth.local; data.findFacebook.auth.local = newUser.auth.local;
data.findFacebook.registeredThrough = newUser.registeredThrough;
data.findFacebook.save(cb); data.findFacebook.save(cb);
// new user, register them // new user, register them
} else { } else {
@@ -123,8 +125,6 @@ api.registerUser = function(req, res, next) {
}; };
analytics.track('register', analyticsData) analytics.track('register', analyticsData)
user.registeredThrough = req.headers['x-client']
user.save(function(err, savedUser){ user.save(function(err, savedUser){
// Clean previous email preferences // Clean previous email preferences
// TODO when emails added to EmailUnsubcription they should use lowercase version // TODO when emails added to EmailUnsubcription they should use lowercase version