From 2cdefb22aad4381560a666bae6e0806a40cd2657 Mon Sep 17 00:00:00 2001 From: Grant Date: Sat, 3 Sep 2016 09:38:05 +1000 Subject: [PATCH 1/3] udpated to work with express 4, changed app.js to index.js to seperate app code from server --- .gitignore | 3 ++- README.md | 2 +- app.js => index.js | 29 ++++++++++++++++++++--------- package.json | 9 +++++++-- 4 files changed, 30 insertions(+), 13 deletions(-) rename app.js => index.js (79%) diff --git a/.gitignore b/.gitignore index 40b878d..12ac647 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules/ \ No newline at end of file +node_modules/ +.DS_Store \ No newline at end of file diff --git a/README.md b/README.md index ef0e078..815eef4 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ This code is an example to create secured routes in AngularJS. To have more deta To run this example: 1. `npm install` -2. `node app.js` +2. `node index.js` diff --git a/app.js b/index.js similarity index 79% rename from app.js rename to index.js index dfe9967..42cf075 100644 --- a/app.js +++ b/index.js @@ -4,6 +4,12 @@ var path = require('path'); var passport = require('passport'); var LocalStrategy = require('passport-local').Strategy; +let bodyParser = require('body-parser'); +let cookieParser = require('cookie-parser'); +let session = require('express-session'); +let methodOverride = require('method-override'); +var errorHandler = require('errorhandler'); + //================================================================== // Define the strategy to be used by PassportJS passport.use(new LocalStrategy( @@ -35,25 +41,30 @@ var auth = function(req, res, next){ // Start express application var app = express(); +// let router = express.Router(); // all environments -app.set('port', process.env.PORT || 3000); +app.set('port', process.env.PORT || 8000); app.set('views', __dirname + '/views'); app.set('view engine', 'ejs'); -app.use(express.favicon()); -app.use(express.logger('dev')); -app.use(express.cookieParser()); -app.use(express.bodyParser()); -app.use(express.methodOverride()); -app.use(express.session({ secret: 'securedsession' })); +// app.use(express.favicon()); +// app.use(express.logger('dev')); +app.use(cookieParser()); +app.use(bodyParser.json()); +app.use(methodOverride()); +app.use(session({ + secret: 'securedsession', + resave: false, + saveUninitialized: false +})); app.use(passport.initialize()); // Add passport initialization app.use(passport.session()); // Add passport initialization -app.use(app.router); +// app.use(app.router); app.use(express.static(path.join(__dirname, 'public'))); // development only if ('development' == app.get('env')) { - app.use(express.errorHandler()); + app.use(errorHandler()); } //================================================================== diff --git a/package.json b/package.json index a567e68..06217c7 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,14 @@ "start": "node app.js" }, "dependencies": { - "express": "3.3.5", + "body-parser": "^1.15.2", + "cookie-parser": "^1.4.3", "ejs": "*", + "errorhandler": "^1.4.3", + "express": "*", + "express-session": "^1.14.1", + "method-override": "^2.3.6", "passport": "*", "passport-local": "*" } -} \ No newline at end of file +} From 47d76771354d70044cb45bb7906e29014d98f3f8 Mon Sep 17 00:00:00 2001 From: Grant Date: Sat, 3 Sep 2016 09:47:35 +1000 Subject: [PATCH 2/3] clean up --- index.js | 6 +++--- package.json | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 42cf075..61dda93 100644 --- a/index.js +++ b/index.js @@ -8,7 +8,8 @@ let bodyParser = require('body-parser'); let cookieParser = require('cookie-parser'); let session = require('express-session'); let methodOverride = require('method-override'); -var errorHandler = require('errorhandler'); +let errorHandler = require('errorhandler'); +let morgan = require('morgan'); //================================================================== // Define the strategy to be used by PassportJS @@ -41,14 +42,13 @@ var auth = function(req, res, next){ // Start express application var app = express(); -// let router = express.Router(); // all environments app.set('port', process.env.PORT || 8000); app.set('views', __dirname + '/views'); app.set('view engine', 'ejs'); // app.use(express.favicon()); -// app.use(express.logger('dev')); +app.use(morgan('dev')); app.use(cookieParser()); app.use(bodyParser.json()); app.use(methodOverride()); diff --git a/package.json b/package.json index 06217c7..5547185 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "express": "*", "express-session": "^1.14.1", "method-override": "^2.3.6", + "morgan": "^1.7.0", "passport": "*", "passport-local": "*" } From 7be139130d2ae94c4fd16585d26b55ca2206c6a8 Mon Sep 17 00:00:00 2001 From: Grant Date: Sat, 3 Sep 2016 09:48:48 +1000 Subject: [PATCH 3/3] updated version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5547185..c8a4725 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "AuthenticationInAngularJS", - "version": "0.0.1", + "version": "0.0.2", "private": true, "scripts": { - "start": "node app.js" + "start": "node index.js" }, "dependencies": { "body-parser": "^1.15.2",