mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
gut custom everyauth code & replace with derby-auth
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// Generated by CoffeeScript 1.4.0
|
||||
var MongoStore, ONE_YEAR, app, auth, derby, everyauth, express, expressApp, gzippo, habitrpgMiddleware, http, path, priv, publicPath, racer, root, server, serverError, store;
|
||||
var MongoStore, ONE_YEAR, app, auth, derby, everyauth, express, expressApp, gzippo, habitrpgMiddleware, http, options, path, priv, publicPath, racer, root, server, serverError, store, strategies;
|
||||
|
||||
http = require('http');
|
||||
|
||||
@@ -19,7 +19,7 @@ serverError = require('./serverError');
|
||||
|
||||
MongoStore = require('connect-mongo')(express);
|
||||
|
||||
auth = require('./auth');
|
||||
auth = require('derby-auth');
|
||||
|
||||
priv = require('./private');
|
||||
|
||||
@@ -48,12 +48,6 @@ store = derby.createStore({
|
||||
listen: server
|
||||
});
|
||||
|
||||
auth.setupQueries(store);
|
||||
|
||||
auth.setupEveryauth(everyauth);
|
||||
|
||||
auth.setupAccessControl(store);
|
||||
|
||||
ONE_YEAR = 1000 * 60 * 60 * 24 * 365;
|
||||
|
||||
root = path.dirname(path.dirname(__dirname));
|
||||
@@ -65,11 +59,27 @@ habitrpgMiddleware = function(req, res, next) {
|
||||
model = req.getModel();
|
||||
model.set('_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')));
|
||||
model.set('_nodeEnv', process.env.NODE_ENV);
|
||||
auth.setRequest(req);
|
||||
auth.newUserAndPurl();
|
||||
return next();
|
||||
};
|
||||
|
||||
strategies = {
|
||||
facebook: {
|
||||
strategy: require("passport-facebook").Strategy,
|
||||
conf: {
|
||||
clientID: process.env.FACEBOOK_KEY,
|
||||
clientSecret: process.env.FACEBOOK_SECRET
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
options = {
|
||||
domain: "http://localhost:3000",
|
||||
allowPurl: true,
|
||||
schema: require('../app/schema').newUserObject()
|
||||
};
|
||||
|
||||
auth.init(expressApp, store, strategies, options);
|
||||
|
||||
expressApp.use(express.favicon()).use(gzippo.staticGzip(publicPath, {
|
||||
maxAge: ONE_YEAR
|
||||
})).use(express.compress()).use(express.bodyParser()).use(express.methodOverride()).use(express.cookieParser()).use(store.sessionMiddleware({
|
||||
@@ -80,7 +90,9 @@ expressApp.use(express.favicon()).use(gzippo.staticGzip(publicPath, {
|
||||
store: new MongoStore({
|
||||
url: process.env.NODE_DB_URI
|
||||
})
|
||||
})).use(store.modelMiddleware()).use(priv.middleware).use(habitrpgMiddleware).use(everyauth.middleware()).use(app.router()).use(expressApp.router).use(serverError(root));
|
||||
})).use(store.modelMiddleware()).use(priv.middleware).use(habitrpgMiddleware).use(auth.middleware()).use(app.router()).use(expressApp.router).use(serverError(root));
|
||||
|
||||
auth.routes();
|
||||
|
||||
priv.routes(expressApp);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user