From c0588283a07e8b721f039f0b3ce78c8721b5ae2f Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 16 Nov 2012 11:00:24 -0500 Subject: [PATCH] fix auth for new derby-auth version --- package.json | 2 +- src/server/index.coffee | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 06c665799e..96c134f886 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitrpg", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "0.0.0-143", + "version": "0.0.0-145", "main": "./server.js", "dependencies": { "derby": "0.3.13", diff --git a/src/server/index.coffee b/src/server/index.coffee index 09e0176cd8..3d250d2e2a 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -50,8 +50,7 @@ options = domain: (if process.env.NODE_ENV == 'production' then 'https://habitrpg.com' else "http://localhost:3000") allowPurl: true schema: require('../app/schema').newUserObject() -auth.init expressApp, store, strategies, options - + expressApp .use(express.favicon()) # Gzip static files and serve from memory @@ -78,13 +77,12 @@ expressApp # the app router to pass server accessible data to a model .use(priv.middleware) .use(habitrpgMiddleware) - .use(auth.middleware()) + .use(auth(store, strategies, options)) # Creates an express middleware from the app's routes .use(app.router()) .use(expressApp.router) .use(serverError root) -auth.routes() priv.routes(expressApp) require('./serverRoutes')(expressApp, root, derby)