Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-12-02 21:58:37 -05:00
parent fc066c21bf
commit b900bc9cce
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/database/redis.js
View File

@@ -126,7 +126,12 @@
//hashes //hashes
module.setObject = function(key, data, callback) { module.setObject = function(key, data, callback) {
redisClient.hmset(key, data, callback); // TODO: this crashes if callback isnt supplied -baris
redisClient.hmset(key, data, function(err, res) {
if(callback) {
callback(err, res);
}
});
} }
module.setObjectField = function(key, field, value, callback) { module.setObjectField = function(key, field, value, callback) {

1
src/login.js
View File

@@ -43,6 +43,7 @@ var user = require('./user'),
} }
if (res) { if (res) {
console.log('logged in', uid);
next(null, { next(null, {
user: { user: {
uid: uid uid: uid

10
src/routes/authentication.js
View File

@@ -14,8 +14,12 @@
passport.use(new passportLocal(function(user, password, next) { passport.use(new passportLocal(function(user, password, next) {
login_module.loginViaLocal(user, password, function(err, login) { login_module.loginViaLocal(user, password, function(err, login) {
if (!err) next(null, login.user); if (!err) {
else next(null, false, err); console.log('LOGGED IN');
next(null, login.user);
} else {
next(null, false, err);
}
}); });
})); }));
@@ -189,7 +193,9 @@
}); });
app.post('/register', function(req, res) { app.post('/register', function(req, res) {
console.log('CALLING USER CREATE');
user.create(req.body.username, req.body.password, req.body.email, function(err, uid) { user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
console.log('USER CREATE DONE', err, uid);
if (err === null && uid) { if (err === null && uid) {
req.login({ req.login({
uid: uid uid: uid

4
src/user.js
View File

@@ -68,7 +68,7 @@ var bcrypt = require('bcrypt'),
return callback(err); return callback(err);
} }
db.incrObjectField('global', 'nextUserId', function(err, uid) { db.incrObjectField('global', 'nextUid', function(err, uid) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
@@ -103,7 +103,7 @@ var bcrypt = require('bcrypt'),
if (email !== undefined) { if (email !== undefined) {
db.setObjectField('email:uid', email, uid); db.setObjectField('email:uid', email, uid);
User.sendConfirmationEmail(email); //User.sendConfirmationEmail(email);
} }
plugins.fireHook('action:user.create', {uid: uid, username: username, email: email, picture: gravatar, timestamp: timestamp}); plugins.fireHook('action:user.create', {uid: uid, username: username, email: email, picture: gravatar, timestamp: timestamp});