Merge branch 'master' of https://github.com/psychobunny/node-forum

README.md

@@ -3,9 +3,9 @@
 
 ## Installation
 
-NodeBB is powered by Node.js with a Redis database. They must be installed prior in order for NodeBB to work.
+NodeBB is powered by Node.js with a Redis database. They must be installed prior in order for NodeBB to work. `build-essential` exposes the build environment for `bcrypt` compilation.
 
-	# apt-get install nodejs redis-server npm
+	# apt-get install nodejs redis-server npm build-essential
 
 Next, obtain all of the dependencies required by NodeBB:
 

package.json

@@ -24,7 +24,9 @@
       "passport-google-oauth": "0.1.5",
       "passport-facebook": "0.1.5",
       "less-middleware": "0.1.11",
-      "marked": "0.2.8"
+      "marked": "0.2.8",
+      "bcrypt": "0.7.5",
+      "node-gyp": "0.9.5"
     },
   "devDependencies": {},
   "optionalDependencies": {},

public/css/style.less

@@ -226,7 +226,7 @@ footer.footer {
 	li {
 		vertical-align: top;
 		background: transparent;
-		.none;
+		display: none;
 		.pointer;
 
 		&.google {

src/posts.js

@@ -72,7 +72,7 @@ var	RDB = require('./redis.js'),
 
 
 	Posts.reply = function(socket, tid, uid, content) {
-		Posts.create(uid, content, function(pid) {
+		Posts.create(uid, tid, content, function(pid) {
 			RDB.rpush('tid:' + tid + ':posts', pid);
 
 			socket.emit('event:alert', {
@@ -84,7 +84,7 @@ var	RDB = require('./redis.js'),
 		});
 	};
 
-	Posts.create = function(uid, content, callback) {
+	Posts.create = function(uid, tid, content, callback) {
 		if (uid === null) return;
 		
 		RDB.incr('global:next_post_id', function(pid) {
@@ -93,6 +93,8 @@ var	RDB = require('./redis.js'),
 			RDB.set('pid:' + pid + ':uid', uid);
 			RDB.set('pid:' + pid + ':timestamp', new Date().getTime());
 			
+			RDB.incr('tid:' + tid + ':postcount');
+			
 			// User Details - move this out later
 			RDB.lpush('uid:' + uid + ':posts', pid);
 			

src/topics.js

@@ -75,7 +75,9 @@ var	RDB = require('./redis.js'),
 						timestamp = replies[2];
 						slug = replies[3];
 						postcount = replies[4];
-
+						
+						
+						
 						user.get_usernames_by_uids(uid, function(userNames) {
 							var topics = [];
 							
@@ -116,8 +118,9 @@ var	RDB = require('./redis.js'),
 			});
 			return; // for now, until anon code is written.
 		}
-
+		
 		RDB.incr('global:next_topic_id', function(tid) {
+
 			// Global Topics
 			if (uid == null) uid = 0;
 			if (uid !== null) {
@@ -141,7 +144,9 @@ var	RDB = require('./redis.js'),
 			RDB.set('tid:' + tid + ':slug', slug);
 			RDB.set('tid:' + tid + ':timestamp', new Date().getTime());
 			RDB.incr('tid:' + tid + ':postcount');
-
+			
+			
+			
 			RDB.set('topic:slug:' + slug + ':tid', tid);
 
 			// Posts

src/user.js

@@ -3,7 +3,8 @@ var	config = require('../config.js'),
 	RDB = require('./redis.js'),
 	crypto = require('crypto'),
 	emailjs = require('emailjs'),
-	emailjsServer = emailjs.server.connect(config.mailer);
+	emailjsServer = emailjs.server.connect(config.mailer),
+	bcrypt = require('bcrypt');
 
 (function(User) {
 
@@ -122,30 +123,21 @@ var	config = require('../config.js'),
 				}
 
 				RDB.get('uid:' + uid + ':password', function(user_password) {
-					if (password == user_password) {
-						// Start, replace, or extend a session
-						// RDB.get('sess:' + user.sessionID, function(session) {
-						// 	if (session !== user.sessionID) {
-						// 		RDB.set('sess:' + user.sessionID + ':uid', uid, 60*60*24*14);	// Login valid for two weeks
-						// 		RDB.set('uid:' + uid + ':session', user.sessionID, 60*60*24*14);
-						// 	} else {
-						// 		RDB.expire('sess:' + user.sessionID + ':uid', 60*60*24*14);	// Defer expiration to two weeks from now
-						// 		RDB.expire('uid:' + uid + ':session', 60*60*24*14);
-						// 	}
-						// });
-
-						next({
-							status: "ok",
-							user: {
-								uid: uid
-							}
-						});
-					} else {
-						next({
-							status: 'error',
-							message: 'invalid-password'
-						});
-					}
+					bcrypt.compare(password, user_password, function(err, res) {
+						if (res === true) {
+							next({
+								status: "ok",
+								user: {
+									uid: uid
+								}
+							});
+						} else {
+							next({
+								status: 'error',
+								message: 'invalid-password'
+							});
+						}
+					});
 				});
 			});
 		}
@@ -245,7 +237,13 @@ var	config = require('../config.js'),
 			RDB.incr('global:next_user_id', function(uid) {
 				RDB.set('username:' + username + ':uid', uid);
 				RDB.set('uid:' + uid + ':username', username);
-				if (password) RDB.set('uid:' + uid + ':password', password);
+				if (password) {
+					bcrypt.genSalt(10, function(err, salt) {
+						bcrypt.hash(password, salt, function(err, hash) {
+							RDB.set('uid:' + uid + ':password', hash);
+						});
+					});
+				}
 				if (email) {
 					RDB.set('uid:' + uid + ':email', email);
 					RDB.set('email:' + email, uid);