5 files changed, 99 insertions, 7 deletions

diff --git a/app.js b/app.js
index 5bf2796..3247fc5 100644
--- a/app.js
+++ b/app.js
@@ -4,8 +4,9 @@
  */
 
 var express = require('express')
-  , http = require('http')
-  , path = require('path');
+  , path = require('path')
+  , bcrypt = require('bcrypt')
+  , passport = require('passport');
 
 var app = express(); // initiates express
 
@@ -30,6 +31,8 @@ app.configure(function(){
     app.use(express.methodOverride());
     app.use(require('less-middleware')({ src: __dirname + '/public' }));
     app.use(express.static(path.join(__dirname, 'public')));
+    app.use(passport.initialize());
+    app.use(passport.session());
 });
 
 app.configure('development', function(){
@@ -50,6 +53,9 @@ require('./router')(app);
  * Server initiation
  */
 
-http.createServer(app).listen(app.get('port'), function(){
-  console.log("Express server listening on port " + app.get('port'));
+app.listen(app.get('port'), function() {
+    console.log("Express server listening on port " + app.get('port'));
 });
+
+
+
diff --git a/modules/account-manager.js b/modules/account-manager.js.old
index b9cb1f9..b9cb1f9 100644
--- a/modules/account-manager.js
+++ b/modules/account-manager.js.old
diff --git a/modules/passport-local.js b/modules/passport-local.js
new file mode 100644
index 0000000..939873f
--- /dev/null
+++ b/modules/passport-local.js
@@ -0,0 +1,85 @@
+
+mongoose.connect('localhost', 'test');
+
+var db = mongoose.connection;
+db.on('error', console.error.bind(console, 'connection error:'));
+db.once('open', function callback() {
+    console.log('Connected to MongoDB');
+})
+
+// User schema
+var userSchema = mongoose.Schema({
+    username: { type: String, required: true, unique: true },
+    email: { type: String, required: true, unique: true },
+    password: { type: String, required: true, unique: true},
+});
+
+// Bcrypt middleware
+userSchema.pre('save', function(next) {
+    var user = this;
+
+    if (!user.isModified('password')) return next();
+
+    bcrypt genSalt(SALT_WORK_FACTOR, function(err, salt) {
+        if (err) return next(err);
+
+        bcrypt.hash(user.password, salt, function(err, hash) {
+            if (err) return next(err);
+            user.password = hash;
+            next();
+        });
+    });
+});
+
+// Password verification
+userSchema.methods.comparePassword = function(candidatePassword, callback) {
+    bcrypt.compare(candidatePassword, this.password, function(err, isMatch) {
+        if (err) return callback(err);
+        callback(null, isMatch);
+    });
+};
+
+
+
+
+// Passport session setup.
+//   To support persistent login sessions, Passport needs to be able to
+//   serialize users into and deserialize users out of the session.  Typically,
+//   this will be as simple as storing the user ID when serializing, and finding
+//   the user by ID when deserializing.
+exports.passport.serializeUser(function(user, done) {
+    done(null, user.id);
+});
+
+exports.passport.deserializeUser(function(id, done) {
+    User.findById(id, function (err, user) {
+        done(err, user);
+    });
+});
+
+
+// Use the LocalStrategy within Passport.
+//   Strategies in passport require a `verify` function, which accept
+//   credentials (in this case, a username and password), and invoke a callback
+//   with a user object.  In the real world, this would query a database;
+//   however, in this example we are using a baked-in set of users.
+exports.passport.use(new LocalStrategy(function(username, password, done) {
+    User.findOne({ username: username }, function(err, user) {
+        if (err) return done(err);
+        if (!user) { return done(null, false, { message: 'Unknown user ' + username }); }
+        user.comparePassword(password, function(err, isMatch) {
+            if (err) return done(err);
+            if(isMatch) {
+                return done(null, user);
+            } else {
+                return done(null, false, { message: 'Invalid password' });
+            }
+        });
+    });
+}));
+
+
+
+
+
+
diff --git a/package.json b/package.json
index 6bbfa1f..d08311c 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,8 @@
     "emailjs": "*",
     "mongodb": "*",
     "moment": "*",
-    "less-middleware": "*"
+    "less-middleware": "*",
+    "passport": "*",
+    "bcrypt": "*"
   }
 }
diff --git a/router.js b/router.js
index b757e79..5463614 100644
--- a/router.js
+++ b/router.js
@@ -1,5 +1,4 @@
-
-var AM = require('./modules/account-manager');
+var passlo = require('./modules/passport-local');
 var EM = require('./modules/email-dispatcher');