Skip to content
This repository has been archived by the owner on Apr 24, 2019. It is now read-only.

Commit

Permalink
Merge e3f2370 into 8c0c629
Browse files Browse the repository at this point in the history
  • Loading branch information
relekang committed Sep 17, 2014
2 parents 8c0c629 + e3f2370 commit ef8980d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
6 changes: 3 additions & 3 deletions app.bs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import express
import express-flash as flash
import cookie-session as session
import path
import morgan as logging
Expand All @@ -8,6 +7,7 @@ import body-parser as bodyParser
import request
import passport
import passport-abakus as passportAbakus
import passport-memcached as passportMemcached

import ./routes/api
import ./routes/index
Expand All @@ -30,8 +30,8 @@ app.use(session({ cookie: { maxAge: 60000 }, secret: 'This is top secret'}))

if app.get('abakus token')
passport.use(passportAbakus.abakusStrategy())
passport.serializeUser(passportAbakus.serializeAbakusUser)
passport.deserializeUser(passportAbakus.deserializeAbakusUser)
passport.serializeUser(passportMemcached.memcachedSerializeUser)
passport.deserializeUser(passportMemcached.memcachedDeserializeUser)

app.use(passport.initialize())
app.use(passport.session())
Expand Down
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,28 @@
"coveralls": "npm test && node node_modules/.bin/coveralls < coverage/lcov.info"
},
"dependencies": {
"body-parser": "~1.0.0",
"cookie-parser": "~1.0.1",
"body-parser": "^1.0.2",
"cookie-parser": "^1.0.1",
"cookie-session": "^1.0.2",
"coveralls": "^2.11.1",
"debug": "~0.7.4",
"express": "~4.2.0",
"debug": "^0.7.4",
"express": "^4.2.0",
"express-flash": "0.0.2",
"express-ipfilter": "0.0.17",
"express-session": "^1.2.0",
"gulp-util": "^2.2.20",
"hjs": "~0.0.6",
"jade": "^1.3.1",
"memjs": "^0.8.4",
"morgan": "~1.0.0",
"morgan": "^1.0.1",
"nib": "^1.0.3",
"passport": "^0.2.0",
"passport-abakus": "0.0.3",
"passport-abakus": "^0.1.0",
"passport-memcached": "^0.2.0",
"redis": "^0.12.0",
"request": "^2.36.0",
"slugify": "^0.1.0",
"static-favicon": "~1.0.0"
"static-favicon": "^1.0.2"
},
"devDependencies": {
"chai": "^1.9.1",
Expand Down

0 comments on commit ef8980d

Please sign in to comment.