Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 114 additions & 0 deletions config/passport/passport.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
// load bcrypt
var bCrypt = require("bcrypt-nodejs");

module.exports = function(passport, user) {
let User = user;
let LocalStrategy = require("passport-local").Strategy;

passport.use(
"local-signup",
new LocalStrategy(
{
usernameField: "userName",
passwordField: "password",
passReqToCallback: true // allows us to pass back the entire request to the callback
},

function(req, userName, password, done) {
var generateHash = function(password) {
return bCrypt.hashSync(password, bCrypt.genSaltSync(8), null);
};
User.findOne({
where: {
userName: userName
}
}).then(function(user) {
if (user) {
return done(null, false, {
message: "That useranme is already taken"
});
} else {
var userPassword = generateHash(password);
var data = {
userName: userName,
password: userPassword
};

User.create(data).then(function(newUser) {
if (!newUser) {
return done(null, false);
}
if (newUser) {
return done(null, newUser);
}
});
}
});
}
)
);

passport.use(
"local-login",
new LocalStrategy(
{
// by default, local strategy uses username and password, we will override with userName
usernameField: "userName",
passwordField: "password",
passReqToCallback: true // allows us to pass back the entire request to the callback
},

function(req, userName, password, done) {
var User = user;
var isValidPassword = function(userpass, password) {
return bCrypt.compareSync(password, userpass);
};

User.findOne({
where: {
userName: userName
}
})
.then(function(user) {
if (!user) {
return done(null, false, {
message: "Username does not exist"
});
}

if (!isValidPassword(user.password, password)) {
return done(null, false, {
message: "Incorrect password."
});
}

var userinfo = user.get();
return done(null, userinfo);
})
.catch(function(err) {
console.log("Error:", err);

return done(null, false, {
message: "Something went wrong with your Signin"
});
});
}
)
);

// serialize
passport.serializeUser(function(user, done) {
done(null, user.id);
});

// deserialize user
passport.deserializeUser(function(id, done) {
User.findByPk(id).then(function(user) {
if (user) {
done(null, user.get());
} else {
done(user.errors, null);
}
});
});
};
6 changes: 3 additions & 3 deletions models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = function(sequelize, DataTypes) {
userName: {
type: DataTypes.STRING,
allowNull: false,
validate: { len: [4, 16] }
validate: { len: [3, 16] }
},
email: {
type: DataTypes.STRING,
Expand All @@ -12,8 +12,8 @@ module.exports = function(sequelize, DataTypes) {
},
password: {
type: DataTypes.STRING,
allowNull: false,
validate: { len: [4, 16] }
allowNull: false
// validate: { len: [4, 16] }
}
});

Expand Down
77 changes: 77 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
},
"license": "ISC",
"dependencies": {
"bcrypt-nodejs": "0.0.3",
"cron": "^1.7.1",
"dotenv": "^8.0.0",
"express": "^4.17.1",
"express-handlebars": "^3.1.0",
"express-session": "^1.16.2",
"mysql": "^2.17.1",
"mysql2": "^1.6.5",
"passport": "^0.4.0",
"passport-local": "^1.0.0",
"public-ip": "^3.1.0",
"request": "^2.88.0",
"request-json": "^0.6.4",
Expand Down
25 changes: 0 additions & 25 deletions public/js/login.js

This file was deleted.

33 changes: 33 additions & 0 deletions routes/authRoutes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module.exports = function(app, passport) {
app.post(
"/signup",
passport.authenticate("local-signup", {
failureRedirect: "/signup"
}),
(request, response) => {
let redirect = `/users/${request.user.userName}`;
response.redirect(redirect);
}
);

app.post(
"/login",
passport.authenticate("local-login", {
failureRedirect: "/login"
}),
(request, response) => {
let redirect = `/users/${request.user.userName}`;
response.redirect(redirect);
}
);

app.get("/logout", function(request, response) {
request.session.destroy(error => {
if (error) {
throw error;
}
let redirect = "/";
response.redirect(redirect);
});
});
};
5 changes: 3 additions & 2 deletions scripts/seedData.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var csv = require("csvtojson");
const bCrypt = require("bcrypt-nodejs");

var db = require("../models");

Expand All @@ -15,9 +16,9 @@ db.sequelize
}).then(function(dbPlant) {
console.log("Creating fake user.");
db.User.create({
userName: "user",
userName: "jan",
email: "[email protected]",
password: "password"
password: bCrypt.hashSync("password", bCrypt.genSaltSync(8), null)
}).then(function(dbUser) {
console.log("Creating fake device.");
db.Device.create({
Expand Down
19 changes: 19 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var express = require("express");
var exphbs = require("express-handlebars");
const passport = require("passport");
const session = require("express-session");

var db = require("./models");

Expand All @@ -11,6 +13,18 @@ app.use(express.urlencoded({ extended: false }));
app.use(express.json());
app.use(express.static("public"));
app.use(express.static("device"));

// For Passport
app.use(
session({
secret: process.env.PASSPORT_SECRET,
resave: true,
saveUninitialized: true
})
); // session secret
app.use(passport.initialize());
app.use(passport.session()); // persistent login sessions

// Handlebars
app.engine(
"handlebars",
Expand All @@ -25,6 +39,11 @@ app.set("view engine", "handlebars");
require("./routes/apiRoutes")(app);
require("./routes/htmlRoutes")(app);
require("./device-routes/apiRoutes")(app);
require("./routes/authRoutes")(app, passport);

// Load passport strategies
require("./config/passport/passport")(passport, db.User);

var syncOptions = { force: false };

// If running a test, set syncOptions.force to true
Expand Down
Loading