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

src/templates.js

@@ -15,7 +15,7 @@ var fs = require('fs');
 	}
 
 	Templates.init = function() {
-		loadTemplates(['header', 'footer', 'register', 'home']);
+		loadTemplates(['header', 'footer', 'register', 'home', 'login']);
 	}
 
 }(exports));

src/user.js

@@ -3,15 +3,45 @@ var RDB = require('./redis.js');
 (function(User) {
 	var current_uid;
 
+	User.login = function(user) {
+		if (current_uid) {
+			return global.socket.emit('user.login', {'status': 0, 'message': 'User is already logged in.'});
+			
+		}
+
+		if (user.username == null || user.password == null) {
+			return global.socket.emit('user.login', {'status': 0, 'message': 'Missing fields'});
+			
+		}
+
+		RDB.get('username:' + user.username + ':uid', function(uid) {
+			if (uid == null) {
+				return global.socket.emit('user.login', {'status': 0, 'message': 'Username does not exist.'});
+				
+			}
+
+			RDB.get('uid:' + uid + ':password', function(password) {
+				if (user.password != password) {
+					return global.socket.emit('user.login', {'status': 0, 'message': 'Incorrect username / password combination.'});
+				} else {
+					console.log('in');
+					return global.socket.emit('user.login', {'status': 1, 'message': 'Logged in!'});
+				}
+			});
+				
+		});
+				
+
+	};
+
+
 	User.create = function(username, password) {
 		if (current_uid) {
-			global.socket.emit('user.create', {'status': 0, 'message': 'Only anonymous users can register a new account.'});
-			return;
+			return; global.socket.emit('user.create', {'status': 0, 'message': 'Only anonymous users can register a new account.'});
 		}
 
 		if (username == null || password == null) {
-			global.socket.emit('user.create', {'status': 0, 'message': 'Missing fields'});
-			return;
+			return; global.socket.emit('user.create', {'status': 0, 'message': 'Missing fields'});
 		}
 
 

src/webserver.js

@@ -16,6 +16,13 @@ var express = require('express'),
 		res.send(templates['header'] + templates['home'] + templates['footer']);
 	});
 
+	app.get('/login', function(req, res) {
+		var body = templates['header'] + templates['login'] + templates['footer'];
+		res.setHeader('Content-Type', 'text/html');
+		res.setHeader('Content-Length', body.length);
+		res.end(body);
+	});
+
 
 	app.get('/register', function(req, res) {
 		res.send(templates['header'] + templates['register'] + templates['footer']);

src/websockets.js

@@ -36,6 +36,10 @@ var SocketIO = require('socket.io').listen(8081);
 
 		socket.on('user.latest', function(data) {
 			modules.user.latest(data);
+		});
+
+		socket.on('user.login', function(data) {
+			modules.user.login(data);
 		});		
 	});