From 318e27910a365ee0824148719256c08adb6cd133 Mon Sep 17 00:00:00 2001 From: nickangtc Date: Sun, 18 Sep 2016 16:12:45 +0800 Subject: [PATCH] Revert "authentication tests passed, messed up migrations big time" This reverts commit 9619eede47f5c57028393cc485d0ee66f3210da0. --- config/ppConfig.js | 7 -- controllers/auth.js | 11 --- index.js | 11 +-- static/index.html | 153 ++++++++++++++++++++++++++++++++++++++++++ views/auth/login.ejs | 21 ------ views/auth/signup.ejs | 26 ------- views/user_new.ejs | 7 +- 7 files changed, 156 insertions(+), 80 deletions(-) create mode 100644 static/index.html diff --git a/config/ppConfig.js b/config/ppConfig.js index e816fff..f7ed5e6 100644 --- a/config/ppConfig.js +++ b/config/ppConfig.js @@ -24,19 +24,12 @@ passport.use(new LocalStrategy({ passwordField: 'password', // default: password session: true // use passport to handle sessions (default: true) }, function (email, password, cb) { // (callback) - console.log('email passed to passport:', email); - console.log('password passed to passport:', password); db.user.find({ where: { email: email } }).then(function (user) { - console.log('(sensitive info) found user with matching email:', user.id, user.name); - if (!user || !user.validPassword(password)) { - console.log('!user?', !user); - console.log('!user.validPassword(password)?', !user.validPassword(password)); cb(null, false); } else { - console.log('password matches hash in db, logging in'); cb(null, user); } }).catch(cb); diff --git a/controllers/auth.js b/controllers/auth.js index f2b763d..a8e216a 100644 --- a/controllers/auth.js +++ b/controllers/auth.js @@ -4,32 +4,21 @@ var router = express.Router(); var passport = require('../config/ppConfig'); var db = require('../models'); -// READ: get signup form router.get('/signup', function (req, res) { - console.log('GET /auth/signup request received'); - res.render('auth/signup'); }); -// READ: get login form router.get('/login', function (req, res) { - console.log('GET /auth/login request received'); - res.render('auth/login'); }); -// POST: login info router.post('/login', passport.authenticate('local', { - // authenticate happens in config/ppConfig.js successRedirect: '/', failureRedirect: '/auth/login' })); -// POST: signup new user // handle signup based on form input router.post('/signup', function (req, res) { - console.log('POST /auth/signup request received'); - console.log('req.body:', req.body); db.user.findOrCreate({ where: { email: req.body.email }, defaults: { diff --git a/index.js b/index.js index 5c0df4a..377a4df 100644 --- a/index.js +++ b/index.js @@ -24,13 +24,10 @@ app.use(session({ app.use(passport.initialize()); app.use(passport.session()); // this must come after use(session) - dependency -// ========== AUTH routes ========== - -// READ: /auth/login, /logout, /signup routes +// /auth/login, /logout, /signup routes app.use('/auth', require('./controllers/auth')); // ============== ROUTES ============= - // READ: get homepage app.get('/', function (req, res) { console.log('GET / request received'); @@ -62,12 +59,6 @@ app.post('/users', function (req, res) { app.get('/users/:id/starred', function (req, res) { console.log('GET /users/id request received'); console.log('id:', req.params.id); - if (req.user !== undefined) { - console.log('user is logged in and authorised to view page'); - console.log('req.user:', req.user); - } else { - console.log('user is not logged in'); - } // render user_starred res.render('user_starred'); }); diff --git a/static/index.html b/static/index.html new file mode 100644 index 0000000..fd8ba08 --- /dev/null +++ b/static/index.html @@ -0,0 +1,153 @@ + + + + + Spidey: the best info web crawler + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+

Current search: lorem ipsum

+
+ + + +
+
+

Wikipedia

+
+
+
+ + +
+
+

Google

+
+
+
+ +

+ Lorem ipsum (placeholder text) +

+

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+ +
+ + + + +
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+
+
+
+ +
+ + + diff --git a/views/auth/login.ejs b/views/auth/login.ejs index a4710fe..e69de29 100644 --- a/views/auth/login.ejs +++ b/views/auth/login.ejs @@ -1,21 +0,0 @@ -
-
-
-

Login

-

Keep URLs and more

- -
-
- Email: -
-
- Login password: -
- -
- -
-
-
-
-
diff --git a/views/auth/signup.ejs b/views/auth/signup.ejs index c487bea..e69de29 100644 --- a/views/auth/signup.ejs +++ b/views/auth/signup.ejs @@ -1,26 +0,0 @@ - - -
-
-
-

Sign up

-

Favourite urls and refer to them anytime you want

- -
-
- Name: -
-
- Email: -
-
- Login password: -
- -
- -
-
-
-
-
diff --git a/views/user_new.ejs b/views/user_new.ejs index b6e8901..3e35b56 100644 --- a/views/user_new.ejs +++ b/views/user_new.ejs @@ -1,6 +1,6 @@ - - - - +