From bd5e6d26456ed4297808d9df8347d1ae8b12fdb5 Mon Sep 17 00:00:00 2001 From: Youssef Yehia Date: Thu, 6 Apr 2017 23:49:59 +0200 Subject: [PATCH 1/2] First Commit --- app/routes.js | 24 ++++++++---------------- views/login.ejs | 6 +++--- views/{index.ejs => page.ejs} | 0 3 files changed, 11 insertions(+), 19 deletions(-) rename views/{index.ejs => page.ejs} (100%) diff --git a/app/routes.js b/app/routes.js index a2e3976..75fe668 100644 --- a/app/routes.js +++ b/app/routes.js @@ -13,24 +13,16 @@ module.exports = function(app, passport){ res.render('signupSP.ejs', { message: req.flash('signupMessage') }); }); app.post('/signupSP', passport.authenticate('local-signup2', { - successRedirect: '/', + successRedirect: '/page', failureRedirect: '/signupSP', failureFlash: true })); -app.get('/index', function(req, res){ - res.render('index.ejs', { message: req.flash('signupMessage') }); + app.get('/page', function(req, res){ + res.render('page.ejs', { message: req.flash('signupMessage') }); }); - - - - - - - - - app.get('/', function(req, res){ - res.render('index.ejs'); + app.get('/page', function(req, res){ + res.render('page.ejs'); }); app.get('/login', function(req, res){ @@ -48,7 +40,7 @@ app.get('/index', function(req, res){ app.post('/signup', passport.authenticate('local-signup', { - successRedirect: '/', + successRedirect: '/page', failureRedirect: '/signup', failureFlash: true })); @@ -73,7 +65,7 @@ app.get('/index', function(req, res){ app.get('/logout', function(req, res){ req.logout(); - res.redirect('/'); + res.redirect('/page'); }) }; @@ -83,4 +75,4 @@ function isLoggedIn(req, res, next) { } res.redirect('/login'); -} \ No newline at end of file +} diff --git a/views/login.ejs b/views/login.ejs index b574d8f..d1abbf7 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -36,11 +36,11 @@
-

Need an account? Signup

-

Or go home.

+

Need an account? Signup

+

Or go home.

- \ No newline at end of file + diff --git a/views/index.ejs b/views/page.ejs similarity index 100% rename from views/index.ejs rename to views/page.ejs From 4e6b0cda05a56f938d249b66d39f358dd6a73770 Mon Sep 17 00:00:00 2001 From: Youssef Yehia Date: Thu, 6 Apr 2017 23:52:50 +0200 Subject: [PATCH 2/2] First Commit --- README.md | 1 - app/models/sp.js | 19 -------- app/models/user.js | 16 ------- app/routes.js | 78 --------------------------------- config/database.js | 5 --- config/passport.js | 107 --------------------------------------------- package.json | 26 ----------- server.js | 47 -------------------- views/login.ejs | 46 ------------------- views/profile.ejs | 16 ------- views/signup.ejs | 64 --------------------------- views/signupSP.ejs | 64 --------------------------- 12 files changed, 489 deletions(-) delete mode 100644 README.md delete mode 100644 app/models/sp.js delete mode 100644 app/models/user.js delete mode 100644 app/routes.js delete mode 100644 config/database.js delete mode 100644 config/passport.js delete mode 100644 package.json delete mode 100644 server.js delete mode 100644 views/login.ejs delete mode 100644 views/profile.ejs delete mode 100644 views/signup.ejs delete mode 100644 views/signupSP.ejs diff --git a/README.md b/README.md deleted file mode 100644 index 5f47f45..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# code-breackers diff --git a/app/models/sp.js b/app/models/sp.js deleted file mode 100644 index dd860b7..0000000 --- a/app/models/sp.js +++ /dev/null @@ -1,19 +0,0 @@ -var mongoose = require('mongoose'); - -var spSchema = mongoose.Schema({ - local: { - email: String, - password: String, - username : String, - service: {type: mongoose.Schema.Types.ObjectId, ref: 'Service'}, - complaints : [{ - type: mongoose.Schema.Types.ObjectId, - ref : 'complaint' - }] - - - - } -}); - -module.exports = mongoose.model('sp', spSchema); diff --git a/app/models/user.js b/app/models/user.js deleted file mode 100644 index e21e971..0000000 --- a/app/models/user.js +++ /dev/null @@ -1,16 +0,0 @@ -var mongoose = require('mongoose'); -var bcrypt = require('bcrypt'); -var userSchema = mongoose.Schema({ - local: { - email: String, - password: String, - username : String, - birthday: Date, - points: {Number, - value: 0} - - } - -}); - -module.exports = mongoose.model('User', userSchema); \ No newline at end of file diff --git a/app/routes.js b/app/routes.js deleted file mode 100644 index 75fe668..0000000 --- a/app/routes.js +++ /dev/null @@ -1,78 +0,0 @@ -var User = require('./models/user'); -var sp = require('./models/sp'); - -module.exports = function(app, passport){ - - - - - - - - app.get('/signupSP', function(req, res){ - res.render('signupSP.ejs', { message: req.flash('signupMessage') }); - }); - app.post('/signupSP', passport.authenticate('local-signup2', { - successRedirect: '/page', - failureRedirect: '/signupSP', - failureFlash: true - })); - app.get('/page', function(req, res){ - res.render('page.ejs', { message: req.flash('signupMessage') }); - }); - - app.get('/page', function(req, res){ - res.render('page.ejs'); - }); - - app.get('/login', function(req, res){ - res.render('login.ejs', { message: req.flash('loginMessage') }); - }); - app.post('/login', passport.authenticate('local-login', { - successRedirect: '/profile', - failureRedirect: '/login', - failureFlash: true - })); - - app.get('/signup', function(req, res){ - res.render('signup.ejs', { message: req.flash('signupMessage') }); - }); - - - app.post('/signup', passport.authenticate('local-signup', { - successRedirect: '/page', - failureRedirect: '/signup', - failureFlash: true - })); - - app.get('/profile', isLoggedIn, function(req, res){ - res.render('profile.ejs', { user: req.user }); - }); - - - - app.get('/:email/:password', function(req, res){ - var newUser = new User(); - newUser.local.email = req.params.email; - newUser.local.email = req.params.email; - console.log(newUser.local.email + " " + newUser.local.password); - newUser.save(function(err){ - if(err) - throw err; - }); - res.send("Success!"); - }); - - app.get('/logout', function(req, res){ - req.logout(); - res.redirect('/page'); - }) -}; - -function isLoggedIn(req, res, next) { - if(req.isAuthenticated()){ - return next(); - } - - res.redirect('/login'); -} diff --git a/config/database.js b/config/database.js deleted file mode 100644 index d9c9f9d..0000000 --- a/config/database.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - - 'url' : 'your database link' - -}; \ No newline at end of file diff --git a/config/passport.js b/config/passport.js deleted file mode 100644 index 9b072db..0000000 --- a/config/passport.js +++ /dev/null @@ -1,107 +0,0 @@ -var LocalStrategy = require('passport-local').Strategy; - - -var User = require('../app/models/user'); - -module.exports = function(passport) { - - - passport.serializeUser(function(user, done){ - done(null, user.id); - }); - - passport.deserializeUser(function(id, done){ - User.findById(id, function(err, user){ - done(err, user); - }); - }); - - - passport.use('local-signup', new LocalStrategy({ - usernameField: 'email', - passwordField: 'password', - passReqToCallback: true - }, - function(req, email, password, done){ - process.nextTick(function(){ - User.findOne({'local.email': email}, function(err, user){ - if(err) - return done(err); - if(user){ - return done(null, false, req.flash('signupMessage', 'That email already taken')); - } else { - var newUser = new User(); - newUser.local.email = email; - newUser.local.password = password; - newUser.local.username = req.body.username; - newUser.local.birthday = req.body.birthday; - - newUser.save(function(err){ - if(err) - throw err; - return done(null, newUser); - }) - } - }) - - }); - })); - - - - passport.use('local-signup2', new LocalStrategy({ - usernameField: 'email', - passwordField: 'password', - passReqToCallback: true - }, - function(req, email, password, done){ - process.nextTick(function(){ - User.findOne({'local.email': email}, function(err, sp){ - if(err) - return done(err); - if(sp){ - return done(null, false, req.flash('signupMessage', 'That email already taken')); - } else { - var newsp = new sp(); - newsp.email = email; - newsp.password = password; - newsp.username = req.body.username; - - - newsp.save(function(err){ - if(err) - throw err; - return done(null, newsp); - }) - } - }) - - }); - })); - - - - passport.use('local-login', new LocalStrategy({ - usernameField: 'email', - passwordField: 'password', - passReqToCallback: true - }, - function(req, email, password, done){ - process.nextTick(function(){ - User.findOne({ 'local.email': email}, function(err, user){ - if(err) - return done(err); - if(!user) - return done(null, false, req.flash('loginMessage', 'No User found')); - if(user.local.password != password){ - return done(null, false, req.flash('loginMessage', 'inavalid password')); - } - return done(null, user); - - }); - }); - } - )); - - -}; diff --git a/package.json b/package.json deleted file mode 100644 index a0b3e7e..0000000 --- a/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "project", - "version": "1.0.0", - "main": "server.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "bcrypt": "^1.0.2", - "bcrypt-nodejs": "0.0.3", - "body-parser": "latest", - "connect-flash": "^0.1.1", - "cookie-parser": "latest", - "ejs": "^2.5.6", - "express": "^4.15.2", - "express-session": "latest", - "mongoose": "^4.9.3", - "morgan": "^1.8.1", - "passport": "^0.3.2", - "passport-local": "^1.0.0" - }, - "devDependencies": {}, - "description": "" -} diff --git a/server.js b/server.js deleted file mode 100644 index 7cb3d57..0000000 --- a/server.js +++ /dev/null @@ -1,47 +0,0 @@ -var express = require('express'); -var app = express(); -var port = process.env.PORT || 8080; - -var mongoose = require('mongoose'); -var DB_URI = "mongodb://localhost:27017/loginapp"; -var bodyParser = require('body-parser'); -var morgan = require('morgan'); -var cookieParser = require('cookie-parser'); -var session = require('express-session'); -var passport = require('passport'); -var flash = require('connect-flash'); - -mongoose.connect(DB_URI); -require('./config/passport')(passport); - -app.use(morgan('dev')); -app.use(cookieParser()); -app.use(bodyParser.urlencoded({extended: false})); -app.use(session({secret: 'anystringoftext', - saveUninitialized: true, - resave: true})); - - -app.use(passport.initialize()); -app.use(passport.session()); -app.use(flash()); - - - - -app.set('view engine', 'ejs'); - - - - -//app.use('/', function(req,res){ - //res.send('Our first Express Program'); - //console.log(req.cookies); - //console.log('****'); - //console.log(req.session); -//}); - -require('./app/routes.js')(app, passport); - -app.listen(port); -console.log('server running on port ' + port); \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs deleted file mode 100644 index d1abbf7..0000000 --- a/views/login.ejs +++ /dev/null @@ -1,46 +0,0 @@ - - - - Node Authentication - - - - - -
- -
- -

Login

- - - <% if (message.length > 0) { %> -
<%= message %>
- <% } %> - - -
-
- - -
-
- - -
- - -
- -
- -

Need an account? Signup

-

Or go home.

- -
- -
- - diff --git a/views/profile.ejs b/views/profile.ejs deleted file mode 100644 index d622265..0000000 --- a/views/profile.ejs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - -
- -
-

Profile

- Logout -
- - - - - \ No newline at end of file diff --git a/views/signup.ejs b/views/signup.ejs deleted file mode 100644 index 54de85c..0000000 --- a/views/signup.ejs +++ /dev/null @@ -1,64 +0,0 @@ - - - - Node Authentication - - - - - -
- -
- -

Signup

- - - <% if (message.length > 0) { %> -
<%= message %>
- <% } %> - - -
-
- - -
-
- - -
-
- - -
-
- - -
- - - -
-
- -
- - diff --git a/views/signupSP.ejs b/views/signupSP.ejs deleted file mode 100644 index 08d66e5..0000000 --- a/views/signupSP.ejs +++ /dev/null @@ -1,64 +0,0 @@ - - - - Node Authentication - - - - - -
- -
- -

Signup

- - - <% if (message.length > 0) { %> -
<%= message %>
- <% } %> - - -
-
- - -
-
- - -
-
- - -
- - - - -
-
- -
- -