Skip to content

Commit 6153edc

Browse files
committed
add helmet and use const instead of var
1 parent 5ed8c9e commit 6153edc

File tree

8 files changed

+173
-66
lines changed

8 files changed

+173
-66
lines changed

app/models/user.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
* Module dependencies
33
*/
44

5-
var mongoose = require('mongoose');
6-
var Schema = mongoose.Schema;
5+
const mongoose = require('mongoose');
6+
const Schema = mongoose.Schema;
77

88
/**
99
* User schema
1010
*/
1111

12-
var UserSchema = new Schema({
12+
const UserSchema = new Schema({
1313
name: { type: String, default: '' },
1414
email: { type: String, default: '' },
1515
hashed_password: { type: String, default: '' },

config/env/development.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,5 @@
33
*/
44

55
module.exports = {
6-
db: process.env.MONGODB_URL || 'mongodb://localhost/my_app_development',
7-
facebook: {
8-
clientID: 'APP_ID',
9-
clientSecret: 'SECRET',
10-
callbackURL: 'http://localhost:3000/auth/facebook/callback',
11-
scope: ['email', 'user_about_me', 'user_friends']
12-
},
13-
google: {
14-
clientID: 'APP_ID',
15-
clientSecret: 'SECRET',
16-
callbackURL: 'http://localhost:3000/auth/google/callback',
17-
scope: [
18-
'https://www.googleapis.com/auth/userinfo.profile',
19-
'https://www.googleapis.com/auth/userinfo.email',
20-
'https://www.google.com/m8/feeds'
21-
]
22-
}
6+
db: process.env.MONGODB_URL || 'mongodb://localhost/my_app_development'
237
};

config/env/production.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,5 @@
33
*/
44

55
module.exports = {
6-
db: process.env.MONGODB_URL || 'mongodb://localhost/my_app_production',
7-
facebook: {
8-
clientID: 'APP_ID',
9-
clientSecret: 'SECRET',
10-
callbackURL: 'http://localhost:3000/auth/facebook/callback',
11-
scope: ['email', 'user_about_me', 'user_friends']
12-
},
13-
google: {
14-
clientID: 'APP_ID',
15-
clientSecret: 'SECRET',
16-
callbackURL: 'http://localhost:3000/auth/google/callback',
17-
scope: [
18-
'https://www.googleapis.com/auth/userinfo.profile',
19-
'https://www.googleapis.com/auth/userinfo.email',
20-
'https://www.google.com/m8/feeds'
21-
]
22-
}
6+
db: process.env.MONGODB_URL || 'mongodb://localhost/my_app_production'
237
};

config/express.js

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,33 @@
22
* Module dependencies.
33
*/
44

5-
var express = require('express');
6-
var session = require('express-session');
7-
var compression = require('compression');
8-
var morgan = require('morgan');
9-
var cookieParser = require('cookie-parser');
10-
var cookieSession = require('cookie-session');
11-
var bodyParser = require('body-parser');
12-
var methodOverride = require('method-override');
13-
var csrf = require('csurf');
14-
15-
var mongoStore = require('connect-mongo')(session);
16-
var flash = require('connect-flash');
17-
var winston = require('winston');
18-
var helpers = require('view-helpers');
19-
var config = require('./');
20-
var pkg = require('../package.json');
21-
22-
var env = process.env.NODE_ENV || 'development';
5+
const express = require('express');
6+
const session = require('express-session');
7+
const compression = require('compression');
8+
const morgan = require('morgan');
9+
const cookieParser = require('cookie-parser');
10+
const cookieSession = require('cookie-session');
11+
const bodyParser = require('body-parser');
12+
const methodOverride = require('method-override');
13+
const csrf = require('csurf');
14+
const helmet = require('helmet');
15+
16+
const mongoStore = require('connect-mongo')(session);
17+
const flash = require('connect-flash');
18+
const winston = require('winston');
19+
const helpers = require('view-helpers');
20+
const config = require('./');
21+
const pkg = require('../package.json');
22+
23+
const env = process.env.NODE_ENV || 'development';
2324

2425
/**
2526
* Expose
2627
*/
2728

2829
module.exports = function(app, passport) {
30+
app.use(helmet());
31+
2932
// Compression middleware (should be placed before express.static)
3033
app.use(
3134
compression({
@@ -37,7 +40,7 @@ module.exports = function(app, passport) {
3740
app.use(express.static(config.root + '/public'));
3841

3942
// Use winston on production
40-
var log;
43+
let log;
4144
if (env !== 'development') {
4245
log = {
4346
stream: {
@@ -74,7 +77,7 @@ module.exports = function(app, passport) {
7477
methodOverride(function(req) {
7578
if (req.body && typeof req.body === 'object' && '_method' in req.body) {
7679
// look in urlencoded POST bodies and delete it
77-
var method = req.body._method;
80+
const method = req.body._method;
7881
delete req.body._method;
7982
return method;
8083
}

config/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* Module dependencies.
33
*/
44

5-
var path = require('path');
6-
var development = require('./env/development');
7-
var test = require('./env/test');
8-
var production = require('./env/production');
9-
var defaults = {
5+
const path = require('path');
6+
const development = require('./env/development');
7+
const test = require('./env/test');
8+
const production = require('./env/production');
9+
const defaults = {
1010
root: path.normalize(__dirname + '/..')
1111
};
1212

config/passport/local.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* Module dependencies.
33
*/
44

5-
var mongoose = require('mongoose');
6-
var LocalStrategy = require('passport-local').Strategy;
7-
var User = mongoose.model('User');
5+
const mongoose = require('mongoose');
6+
const LocalStrategy = require('passport-local').Strategy;
7+
const User = mongoose.model('User');
88

99
/**
1010
* Expose
@@ -16,7 +16,7 @@ module.exports = new LocalStrategy(
1616
passwordField: 'password'
1717
},
1818
function(email, password, done) {
19-
var options = {
19+
const options = {
2020
criteria: { email: email }
2121
};
2222
User.load(options, function(err, user) {

0 commit comments

Comments
 (0)