diff options
| -rw-r--r-- | public/assets/javascripts/ui/builder/BuilderSettings.js | 3 | ||||
| -rw-r--r-- | server/index.js | 150 | ||||
| -rw-r--r-- | server/lib/auth.js | 5 |
3 files changed, 85 insertions, 73 deletions
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js index b598a18..ff8a71b 100644 --- a/public/assets/javascripts/ui/builder/BuilderSettings.js +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -1,7 +1,4 @@ - - - var BuilderSettings = View.extend({ el: "#builderSettings", diff --git a/server/index.js b/server/index.js index 84d9818..21a1859 100644 --- a/server/index.js +++ b/server/index.js @@ -20,87 +20,101 @@ var http = require('http'), // var io = websocket.listen(config.socketPort) -var app = express(); +var app = express() +var SessionStore var DATABASE_URI = process.env.MONGOLAB_URI || ('mongodb://' + config.hostName + '/vvalls') -mongoose.connect(DATABASE_URI); -var SessionStore = new MongoStore({ mongoose_connection: mongoose.connection }) +// -// Configure things -app.set('port', config.port); -app.set('views', path.join(__dirname, '../views')); -app.set('view engine', 'ejs'); -app.use(express.static(path.join(__dirname, '../public'))); -app.use(express.logger('dev')); -app.use(express.json()); -app.use(express.urlencoded()); -app.use(express.cookieParser()); -app.use(express.session({ - key: 'vvalls.sid', - secret: 'flibbertigibbet', - cookie: { domain: '.' + config.hostName, maxAge: 43200000 }, - store: SessionStore -})); -app.use(bodyParser()); -app.use(multer()); -app.use(express.query()); -app.use(express.csrf()); -app.use(express.methodOverride()); -app.use(passport.initialize()); -app.use(passport.session()); -// app.use('/api', middleware.ensureAuthenticated, mers({conn: mongoose.connection}).rest()); -app.use(app.router); -app.get('env') === 'development' && app.use(express.errorHandler()); +var site = {} +site.init = function(){ + mongoose.connect(DATABASE_URI, {}, site.ready); +} -// Configure user authentication -auth.init() +site.ready = function(){ + auth.init() + site.setup() + site.route() + site.listen() +} -// Essential middleware -// app.all('*', middleware.enableCORS); +site.setup = function(){ + var SessionStore = new MongoStore({ mongoose_connection: mongoose.connection }) -app.all('*', middleware.ensureLocals); + app.set('port', config.port); + app.set('views', path.join(__dirname, '../views')); + app.set('view engine', 'ejs'); + app.use(express.static(path.join(__dirname, '../public'))); + app.use(express.logger('dev')); + app.use(express.json()); + app.use(express.urlencoded()); + app.use(express.cookieParser()); + app.use(express.session({ + key: 'vvalls.sid', + secret: 'flibbertigibbet', + cookie: { domain: '.' + config.hostName, maxAge: 43200000 }, + store: SessionStore + })); + app.use(bodyParser()); + app.use(multer()); + app.use(express.query()); + app.use(express.csrf()); + app.use(express.methodOverride()); + app.use(passport.initialize()); + app.use(passport.session()); + // app.use('/api', middleware.ensureAuthenticated, mers({conn: mongoose.connection}).rest()); + app.use(app.router); + app.get('env') === 'development' && app.use(express.errorHandler()); -// Initialize views -app.get('/', views.home); -app.get('/about', views.docs); -app.get('/about/:name/edit', views.docs); -app.get('/about/:name', views.docs); -app.get('/login', views.modal); -app.get('/signup', views.modal); -app.post('/auth/signin', auth.loggedInLocal); -app.post('/auth/signup', auth.signup); -app.get('/logout', auth.logout); -app.get('/auth/twitter', auth.login('twitter')); -app.get('/auth/twitter/callback', auth.loggedIn('twitter')); -app.get('/auth/facebook', auth.login('facebook')); -app.get('/auth/facebook/callback', auth.loggedIn('facebook')); -app.get('/profile', views.profile) -app.get('/profile/edit', views.profile) -app.get('/profile/:name', views.profile) + // Essential middleware + // app.all('*', middleware.enableCORS); + app.all('*', middleware.ensureLocals); -app.get('/api/profile', middleware.ensureAuthenticated, api.profile.show) -app.put('/api/profile', middleware.ensureAuthenticated, api.profile.update) + // auth.initSockets(io, SessionStore) +} -app.get('/project/new', middleware.ensureAuthenticated, views.modal); +site.route = function () { + app.get('/', views.home); + app.get('/about', views.docs); + app.get('/about/:name/edit', views.docs); + app.get('/about/:name', views.docs); + app.get('/login', views.modal); + app.get('/signup', views.modal); + app.post('/auth/signin', auth.loggedInLocal); + app.post('/auth/signup', auth.signup); + app.get('/logout', auth.logout); + app.get('/auth/twitter', auth.login('twitter')); + app.get('/auth/twitter/callback', auth.loggedIn('twitter')); + app.get('/auth/facebook', auth.login('facebook')); + app.get('/auth/facebook/callback', auth.loggedIn('facebook')); + app.get('/profile', views.profile) + app.get('/profile/edit', views.profile) + app.get('/profile/:name', views.profile) -app.get('/staff', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.staff.index); -app.get('/staff/bless', middleware.ensureAuthenticated, views.staff.bless); + app.get('/api/profile', middleware.ensureAuthenticated, api.profile.show) + app.put('/api/profile', middleware.ensureAuthenticated, api.profile.update) -app.get('/api/docs', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.show) -app.post('/api/docs/new', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.create) -app.post('/api/docs/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.update) -app.delete('/api/docs/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.destroy) + app.get('/project/new', middleware.ensureAuthenticated, views.modal); -app.use('/builder', middleware.ensureAuthenticated) -app.get('/builder', views.builder) -app.get('/builder/:name', views.builder) + app.get('/staff', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.staff.index); + app.get('/staff/bless', middleware.ensureAuthenticated, views.staff.bless); -/* -auth.initSockets(io) -*/ + app.get('/api/docs', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.show) + app.post('/api/docs/new', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.create) + app.post('/api/docs/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.update) + app.delete('/api/docs/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.destroy) -http.createServer(app).listen(app.get('port'), function () { - console.log('Express server listening on port ' + app.get('port')); -}); + app.use('/builder', middleware.ensureAuthenticated) + app.get('/builder', views.builder) + app.get('/builder/:name', views.builder) +} + +site.listen = function(){ + http.createServer(app).listen(app.get('port'), function () { + console.log('Express server listening on port ' + app.get('port')); + }); +} + +site.init() diff --git a/server/lib/auth.js b/server/lib/auth.js index b710a22..018c9ad 100644 --- a/server/lib/auth.js +++ b/server/lib/auth.js @@ -5,6 +5,7 @@ var passport = require('passport'), TwitterStrategy = require('passport-twitter').Strategy, LocalStrategy = require('passport-local').Strategy, passportSocketIo = require("passport.socketio"), + cookieParser = require('express').cookieParser, crypto = require('crypto'), _ = require('lodash'), util = require('./util'), @@ -33,9 +34,9 @@ var auth = { }, auth.insertFacebookUser)); }, - initSockets: function (io, cookieParser, SessionStore) { + initSockets: function (io, express, SessionStore) { io.set('authorization', passportSocketIo.authorize({ - cookieParser: express.cookieParser, + cookieParser: cookieParser, passport: passport, key: 'vvalls.sid', // the name of the cookie where express/connect stores its session_id secret: 'flibbertigibbet', // the session_secret to parse the cookie |