Merge pull request #3 from TemaKozyrev/develop

Develop

Author: TemaKozyrev

server/app.js

@@ -7,8 +7,10 @@ var bodyParser = require('body-parser');
 var http = require('http');
 var mongoose = require('mongoose');
 var session = require('express-session');
-var passport = require('passport');
 var LocalStrategy = require('passport-local').Strategy;
+
+var User = require('./models/user');
+
 var cors = require('cors');
 
 // var routes = require('./controllers/index');
@@ -21,7 +23,9 @@ app.use(cors());
 
 //connect to mongodb
 
-mongoose.connect('mongodb://test:[email protected]:45329/ambaproject');
+
+mongoose.connect('mongodb://tema:[email protected]:41209/amba');
+
 
 // uncomment after placing your favicon in /public
 //app.use(favicon(__dirname + '/public/favicon.ico'));
@@ -31,32 +35,26 @@ app.use(bodyParser.urlencoded({
     extended: true
 }));
 
-app.use(session({
-    secret: 'Secret Session Key',
-    saveUninitialized: true,
-    resave: true
-}));
+app.use(session({ secret: 'session secret key' }));
+
+//passport congif 
 
+var passport = require('./config/passport');
 app.use(passport.initialize());
 app.use(passport.session());
 
-// passport config
-var User = require('./models/user');
-passport.use(new LocalStrategy(User.authenticate()));
-passport.serializeUser(User.serializeUser());
-passport.deserializeUser(User.deserializeUser());
-
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use(require('./controllers'));
 
 // catch 404 and forward to error handler
-app.use(function(req, res, next) {
-  var err = new Error('Not Found');
-  err.status = 404;
-  next(err);
-});
+
+// app.use(function (req, res, next) {
+//     var err = new Error('Not Found');
+//     err.status = 404;
+//     next(err);
+// });
 
 
 /**

server/config/passport.js

@@ -0,0 +1,29 @@
+var passport = require('passport')
+  , LocalStrategy = require('passport-local').Strategy
+  , User = require('../models/user');
+
+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: 'Incorrect username.' });
+    user.comparePassword(password, function (err, isMatch) {
+      if (isMatch) {
+        return done(null, user);
+      } else {
+        return done(null, false, { message: 'Incorrect password.' });
+      }
+    });
+  });
+}));
+
+passport.serializeUser(function (user, done) {
+  done(null, user.id);
+});
+
+passport.deserializeUser(function (id, done) {
+  User.findById(id, function (err, user) {
+    done(err, user);
+  });
+});
+
+module.exports = passport;

server/controllers/user.js

@@ -5,43 +5,88 @@ var User = require('../models/user');
 var verifyToken = require('../middleware/verifyToken');
 var router = express.Router();
 
-router.get('/register', function(req, res) {
-    res.redirect('/register')
+
+router.get('/register', function (req, res) {
+    res.redirect('/register');
 });
 
-router.post('/register', function(req, res) {
-    User.register(new User({ username : req.body.username, email: req.body.email }), req.body.password, function(err, user) {
+router.post('/register', function (req, res) {
+    var user = new User({
+        username: req.body.username,
+        email: req.body.email,
+        password: req.body.password11
+    });
+
+
+    user.save(function (err) {
         if (err) {
-            return res.send(err)
+
+            return res.send(err);
         } else {
             verifyToken.createVerificationToken(user, req)
-        }
+        };
+
 
         passport.authenticate('local')(req, res, function () {
-            res.send(req.user)
+            res.send(req.user);
         });
-    });
+    })
 });
 
-router.get('/login', function(req, res) {
-    res.redirect('/login')
+
+router.get('/login', function (req, res) {
+    res.send('login');
 });
 
-router.post('/login', passport.authenticate('local'), function(req, res) {
-    res.redirect('/')
+router.post('/login', function (req, res, next) {
+    passport.authenticate('local', function (err, user, info) {
+        if (!user) {
+            return res.redirect('/login');
+        };
+        req.logIn(user, function (err) {
+            return res.redirect('/');
+        });
+    })(req, res, next);
+
 });
 
-router.get('/logout', function(req, res) {
+router.get('/logout', function (req, res) {
     req.logout();
     res.send('ok');
 });
 
 router.get("/verify/:token", function (req, res, next) {
     var token = req.params.token;
-    verifyToken.verifyUser(token, function(err) {
+
+    verifyToken.verifyUser(token, function (err) {
+
         if (err) return res.send("verification-failure");
         res.send("verification-success");
     });
 });
 
+router.post('/changepass', function (req, res) {
+    if (req.isAuthenticated()) {
+        User.findOne({ username: req.user.username }, function (err, user) {
+            user.comparePassword(req.body.oldpass, function (err, isMatch) {
+                if (isMatch) {
+                    user.password = req.body.newpass;
+                    user.save();
+                    res.send("password changed");
+                } else {
+                    res.send("incorrect old passowrd");
+                }
+            })
+        });
+    };
+});
+
+router.get('/info', function (req, res) {
+    if (req.isAuthenticated()) {
+        res.send(req.user.username);
+    } else {
+        res.send('not auth');
+    }
+})
+
 module.exports = router;

server/models/user.js

@@ -1,11 +1,9 @@
 var mongoose = require('mongoose');
 var uniqueValidator = require('mongoose-unique-validator');
-var passportLocalMongoose = require('passport-local-mongoose');
+var bcrypt = require('bcrypt-nodejs');
 var offerSchema = require('./offer').offerSchema;
 var Schema = mongoose.Schema;
 
-
-
 userSchema = new Schema({   //TODO extend(check) userSchema
     username: {
         type: String,
@@ -26,7 +24,13 @@ userSchema = new Schema({   //TODO extend(check) userSchema
         default: false
     },
     password: {
-        type: String
+        type: String,
+        required: true
+    },
+    createdAt: {
+        type: Date,
+        required: true,
+        default: Date.now
     },
     createdAt: {
         type: Date,
@@ -35,7 +39,30 @@ userSchema = new Schema({   //TODO extend(check) userSchema
     offer: [offerSchema]
 });
 
+userSchema.pre('save', function (next) {
+    var user = this;
+    var SALT_FACTOR = 5;
+
+    if (!user.isModified('password')) return next();
+
+    bcrypt.genSalt(SALT_FACTOR, function (err, salt) {
+        if (err) return next(err);
+
+        bcrypt.hash(user.password, salt, null, function (err, hash) {
+            if (err) return next(err);
+            user.password = hash;
+            next();
+        });
+    });
+});
+
+userSchema.methods.comparePassword = function(candidatePassword, cb) {
+  bcrypt.compare(candidatePassword, this.password, function(err, isMatch) {
+    if (err) return cb(err);
+    cb(null, isMatch);
+  });
+};
+
 userSchema.plugin(uniqueValidator);
-userSchema.plugin(passportLocalMongoose);
 
 module.exports = mongoose.model('User', userSchema);

server/package.json

@@ -6,6 +6,7 @@
     "start": "node app.js"
   },
   "dependencies": {
+    "bcrypt-nodejs": "0.0.3",
     "body-parser": "~1.12.4",
     "cookie-parser": "~1.3.5",
     "cors": "^2.8.1",
@@ -20,7 +21,6 @@
     "nodemailer": "^3.1.5",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
-    "passport-local-mongoose": "^4.0.0",
     "serve-favicon": "~2.2.1"
   }
 }