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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ npm-debug.log
*.env
.DS_Store
Dockerfile
docker-compose.yml
docker-compose.yml
backend/db/config/config.json
config/keys.js
7 changes: 7 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const PORT = process.env.PORT || 3000;
const inProduction = process.env.NODE_ENV === "production";
const app = express();

const keys = require('./config/keys.js')
const cookieSession = require('cookie-session');
const bodyParser = require("body-parser");
const logger = require("morgan");
app.use(bodyParser.json());
Expand All @@ -12,6 +14,11 @@ app.use(express.static(path.join(__dirname, "public")));
app.disable("x-powered-by");
app.use(logger("dev"));
// app.use(require("cookie-parser"));
app.use(cookieSession({
maxAge: 24 * 60 * 60 * 1000,
keys: [keys.session.cookieKey]
})
);
const models = require("./backend/db/models");

//need to add postgresql for sessions
Expand Down
12 changes: 10 additions & 2 deletions backend/controllers/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,23 @@ const express = require('express');
const router = express.Router();
const passport = require('../middlewares/auth');


router.get('/', function (req, res) {
res.render('login');
});

router.post('/', function (req, res) {
passport.authenticate('local', {
successRedirect: '/timeline',
failureRedirect: '/login',
})(req, res);
});

module.exports = router;
router.get('/google', passport.authenticate('google', { scope: ['profile'] })
);

// Callback route for Google OAuth
router.get('/google/redirect', passport.authenticate('google'), function (req, res) {
res.send(req.user);
});

module.exports = router;
23 changes: 0 additions & 23 deletions backend/db/config/config.json

This file was deleted.

3 changes: 2 additions & 1 deletion backend/db/models/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = (sequelize, DataTypes) => {
lastName: DataTypes.STRING,
email: DataTypes.STRING,
password: DataTypes.STRING,
googleID: DataTypes.STRING,
about: DataTypes.STRING,
karma: {type: DataTypes.INTEGER, defaultValue: 10}
}, {
Expand All @@ -28,4 +29,4 @@ module.exports = (sequelize, DataTypes) => {
})
);
return Users;
};
};
33 changes: 31 additions & 2 deletions backend/middlewares/auth.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
const bcrypt = require('bcrypt-nodejs');
const passport = require('passport');
const LocalStrategy = require('passport-local').Strategy;
const GoogleStrategy = require('passport-google-oauth20');

const keys = require('../../config/keys');
const Users = require('../db/models').Users;

function passwordsMatch(passwordSubmitted, storedPassword) {
Expand Down Expand Up @@ -30,6 +32,34 @@ passport.use(new LocalStrategy({
})
);

passport.use(
new GoogleStrategy({
clientID: keys.google.clientID,
clientSecret: keys.google.clientSecret,
callbackURL: '/login/google/redirect'
}, (accessToken, refreshToken, profile, done) => {
console.log('passport callback function fired!');
Users.findOne({
where: {googleID: profile.id}
}).then((user) => {
if(user) {
console.log('User already exists');
done(null, user);
}
else {
Users.create({
firstName: profile.name.givenName,
lastName: profile.name.familyName,
googleID: profile.id
}).then((user) => {
console.log('New user created');
done(null, user);
})
}
})
})
);

passport.serializeUser((user, done) => {
done(null, user.id);
});
Expand All @@ -39,7 +69,6 @@ passport.deserializeUser((id, done) => {
if (!user) {
return done(null, false);
}

return done(null, user);
});
});
Expand All @@ -54,4 +83,4 @@ passport.redirectIfNotLoggedIn = (route) =>
(req.user ? next() : res.redirect(route));
}

module.exports = passport;
module.exports = passport;
6 changes: 3 additions & 3 deletions backend/views/login.pug
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
extends ./layouts/main.pug
block style
link(rel="stylesheet", href="css/homepage.css")
link(rel="stylesheet", href="/css/homepage.css")
block body
body#login
.hero_sect
Expand All @@ -17,7 +17,7 @@ block body
h3 Quickly Login with these instead
.btns
a.btn.fb(href="#") Facebook
a.btn.google(href="#") Google
a.btn.google(href="/login/google") Google
a.btn.reddit(href="#") Reddit
a.btn.github(href="#") Github


13 changes: 13 additions & 0 deletions config/passport-setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const passport = require('passport');
const GoogleStrategy = require('passport-google-oauth20');
const keys = require('./keys');

passport.use(
new GoogleStrategy({
clientID: keys.google.clientID,
clientSecret: keys.google.clientSecret,
callbackURL: 'login/google/redirect'
}), () => {
// passport callback function
}
);
Loading