From cf38dbcfd494eec9bc479845d918f1354197321f Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 21 Jul 2014 21:18:28 -0700 Subject: Upgrade express and other dependencies to the latest and greatest --- app.coffee | 15 ++++++++++----- app.js | 28 +++++++++++++++++++++------- install.coffee | 13 +------------ install.js | 21 ++------------------- package.json | 35 +++++++++++++++++++---------------- public/js/calculator.coffee | 1 + routes/calculator.coffee | 2 +- routes/calculator.js | 3 ++- 8 files changed, 57 insertions(+), 61 deletions(-) diff --git a/app.coffee b/app.coffee index 83025b60..e0930713 100644 --- a/app.coffee +++ b/app.coffee @@ -1,4 +1,6 @@ express = require('express') +bodyParser = require('body-parser') +cookieParser = require('cookie-parser') path = require('path') engines = require('consolidate') passport = require('./passport') @@ -8,9 +10,11 @@ sessions = require("./routes/sessions")(passport) transactions = require("./routes/transactions") users = require("./routes/users")(sessions) -RedisStore = require('connect-redis')(express) +session = require('express-session') +RedisStore = require('connect-redis')(session) sessionStore = new RedisStore(require('./redis').host, ttl: 172800) + app = express() app.enable('trust proxy') app.engine('html', require('hogan-express')) @@ -18,12 +22,13 @@ app.set('view engine', 'html') app.set('views', __dirname + '/views') app.use(express.static(__dirname + '/public')) app.use(require('connect-assets')(src: 'public')) -app.use(express.bodyParser()) -app.use(express.cookieParser()) -app.use(express.session(secret: 'weareallmadeofstars', store: sessionStore, cookie: { maxAge: 25920000000 }, key: 'vanbtc.sid')) +app.use(bodyParser.urlencoded({ extended: true})) +app.use(bodyParser.json()) +app.use(bodyParser.json({ type: 'application/vnd.api+json' })) +app.use(cookieParser('weareallmadeofstars')) +app.use(session(resave: true, saveUninitialized: true, secret: 'weareallmadeofstars', store: sessionStore, cookie: { maxAge: 25920000000 }, key: 'vanbtc.sid')) app.use(passport.initialize()) app.use(passport.session()) -app.use(app.router) authorize = (req, res, next) -> diff --git a/app.js b/app.js index 277d04f7..05452d81 100644 --- a/app.js +++ b/app.js @@ -1,8 +1,12 @@ (function() { - var RedisStore, app, authorize, calculator, engines, express, passport, path, sessionStore, sessions, transactions, users; + var RedisStore, app, authorize, bodyParser, calculator, cookieParser, engines, express, passport, path, session, sessionStore, sessions, transactions, users; express = require('express'); + bodyParser = require('body-parser'); + + cookieParser = require('cookie-parser'); + path = require('path'); engines = require('consolidate'); @@ -17,7 +21,9 @@ users = require("./routes/users")(sessions); - RedisStore = require('connect-redis')(express); + session = require('express-session'); + + RedisStore = require('connect-redis')(session); sessionStore = new RedisStore(require('./redis').host, { ttl: 172800 @@ -39,11 +45,21 @@ src: 'public' })); - app.use(express.bodyParser()); + app.use(bodyParser.urlencoded({ + extended: true + })); + + app.use(bodyParser.json()); + + app.use(bodyParser.json({ + type: 'application/vnd.api+json' + })); - app.use(express.cookieParser()); + app.use(cookieParser('weareallmadeofstars')); - app.use(express.session({ + app.use(session({ + resave: true, + saveUninitialized: true, secret: 'weareallmadeofstars', store: sessionStore, cookie: { @@ -56,8 +72,6 @@ app.use(passport.session()); - app.use(app.router); - authorize = function(req, res, next) { var _ref, _ref1, _ref2; if (req.params.user === ((_ref = req.user) != null ? _ref.username : void 0) || ((_ref1 = req.user) != null ? _ref1.username : void 0) === 'admin' || ((_ref2 = req.user) != null ? _ref2.username : void 0) === 'ben') { diff --git a/install.coffee b/install.coffee index fa95f6f8..38e32b6f 100644 --- a/install.coffee +++ b/install.coffee @@ -10,18 +10,7 @@ db.get("user:admin", (err, res) -> password: hash, , -> console.log("Created admin user with password 'admin'") + process.exit() ) ) ) - -db.sismember("mts","mt:rest", (err,res) -> - if !res - db.hmset("mt:rest",{code: "rest", label: "Restaurant/Bar"}, -> - db.sadd("mts","mt:rest") - ) - db.hmset("mt:coff",{code: "rest", label: "Coffee Shop"}, -> - db.sadd("mts","mt:coff") - ) - console.log("Added merchant types") -) - diff --git a/install.js b/install.js index 0e6256df..088d593e 100644 --- a/install.js +++ b/install.js @@ -13,28 +13,11 @@ username: 'admin', password: hash }, function() { - return console.log("Created admin user with password 'admin'"); + console.log("Created admin user with password 'admin'"); + return process.exit(); }); }); } }); - db.sismember("mts", "mt:rest", function(err, res) { - if (!res) { - db.hmset("mt:rest", { - code: "rest", - label: "Restaurant/Bar" - }, function() { - return db.sadd("mts", "mt:rest"); - }); - db.hmset("mt:coff", { - code: "rest", - label: "Coffee Shop" - }, function() { - return db.sadd("mts", "mt:coff"); - }); - return console.log("Added merchant types"); - } - }); - }).call(this); diff --git a/package.json b/package.json index e83c4801..212b9be5 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,28 @@ { - "name": "pos.bitcoincoop.org", + "name": "coinos", "version": "0.0.1", "private": true, "scripts": { - "prepublish": "coffee install.coffee", - "start": "coffee app.coffee" + "start": "node app.js" }, "dependencies": { - "express": "3.0.1", - "consolidate": "git://github.com/simov/consolidate.js.git", - "hogan.js": "2.0.0", - "coffee-script": "1.4.0", - "connect-assets": "2.3.3", - "less": "1.3.1", - "redis": "0.8.2", - "passport": "0.1.15", - "passport-local": "0.1.6", - "bcrypt": "0.7.4", - "mmm": "0.2.1", - "connect-redis": "1.4.5", - "async": "~0.2.9" + "async": "0.9.0", + "bcrypt": "0.7.8", + "body-parser": "^1.5.0", + "coffee-script": "1.7.1", + "connect-assets": "4.0.1", + "connect-redis": "2.0.0", + "consolidate": "0.10.0", + "cookie-parser": "^1.3.2", + "express": "4.6.1", + "express-session": "^1.6.5", + "hogan-express": "0.5.2", + "hogan.js": "3.0.2", + "less": "1.7.3", + "mmm": "0.2.2", + "passport": "0.2.0", + "passport-local": "1.0.0", + "redis": "0.11.0" }, "devDependencies": { "grunt": "^0.4.5", diff --git a/public/js/calculator.coffee b/public/js/calculator.coffee index 0ccea5ce..f035855e 100644 --- a/public/js/calculator.coffee +++ b/public/js/calculator.coffee @@ -6,6 +6,7 @@ #= require jsbn.js #= require jsbn2.js #= require check_address.js +#= require socket.io.js EXCHANGE_FAIL = "Error fetching exchange rate" SOCKET_FAIL = "Error connecting to payment server" diff --git a/routes/calculator.coffee b/routes/calculator.coffee index ea6a5543..891fdce8 100644 --- a/routes/calculator.coffee +++ b/routes/calculator.coffee @@ -5,7 +5,7 @@ exports.sweep = (req, res) -> res.render('calculator/sweep', layout: 'layout') exports.show = (req, res) -> - res.render('calculator/show', layout: 'layout') + res.render('calculator/show', layout: 'layout', x: 'meow') exports.ticker = (req, res) -> fs = require('fs') diff --git a/routes/calculator.js b/routes/calculator.js index 834d9bbc..3e067df6 100644 --- a/routes/calculator.js +++ b/routes/calculator.js @@ -11,7 +11,8 @@ exports.show = function(req, res) { return res.render('calculator/show', { - layout: 'layout' + layout: 'layout', + x: 'meow' }); }; -- cgit v1.2.3