Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6136 from HabitRPG/upgrade-stack

Browse Source 
Upgrade stack
This commit is contained in:
Matteo Pagliazzi
2015-10-29 19:28:51 +01:00
parent dd09633d31 82f5897c41
commit 332df1d646
15 changed files with 114 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/controllers/challenges.js
+5 -5
View File
@@ -230,7 +230,7 @@ api.update = function(req, res, next){
// before-save / after-save comparison to determine if we need to sync to users
before = _before;
var attrs = _.pick(req.body, 'name shortName description habits dailys todos rewards date'.split(' '));
Challenge.findByIdAndUpdate(cid, {$set:attrs}, cb);
Challenge.findByIdAndUpdate(cid, {$set:attrs}, {new: true}, cb);
},
function(saved, cb) {
@@ -271,7 +271,7 @@ function closeChal(cid, broken, cb) {
function(_removed, cb2) {
removed = _removed;
var pull = {'$pull':{}}; pull['$pull'][_removed._id] = 1;
Group.findByIdAndUpdate(_removed.group, pull);
Group.findByIdAndUpdate(_removed.group, {new: true}, pull);
User.find({_id:{$in: removed.members}}, cb2);
},
function(users, cb2) {
@@ -297,7 +297,7 @@ function closeChal(cid, broken, cb) {
/**
* Delete & close
*/
api['delete'] = function(req, res, next){
api.delete = function(req, res, next){
var user = res.locals.user;
var cid = req.params.cid;
@@ -370,7 +370,7 @@ api.join = function(req, res, next){
async.waterfall([
function(cb) {
Challenge.findByIdAndUpdate(cid, {$addToSet:{members:user._id}}, cb);
Challenge.findByIdAndUpdate(cid, {$addToSet:{members:user._id}}, {new: true}, cb);
},
function(chal, cb) {
@@ -403,7 +403,7 @@ api.leave = function(req, res, next){
async.waterfall([
function(cb){
Challenge.findByIdAndUpdate(cid, {$pull:{members:user._id}}, cb);
Challenge.findByIdAndUpdate(cid, {$pull:{members:user._id}}, {new: true}, cb);
},
function(chal, cb){
website/src/controllers/groups.js
+2 -1
View File
@@ -521,6 +521,7 @@ api.leave = function(req, res, next) {
group.leave(user, keep, function(err){
if (err) return next(err);
user = group = keep = null;
return res.send(204);
});
};
@@ -683,7 +684,7 @@ api.invite = function(req, res, next){
} else if (req.body.emails) {
inviteByEmails(req.body.emails, group, req, res, next)
} else {
return res.json(400,{err: "Can invite only by email or uuid"});
return res.json(400, {err: "Can only invite by email or uuid"});
}
}
website/src/controllers/unsubscription.js
+2 -2
View File
@@ -13,9 +13,9 @@ api.unsubscribe = function(req, res, next){
if(data._id){
User.update({_id: data._id}, {
$set: {'preferences.emailNotifications.unsubscribeFromAll': true}
}, {multi: false}, function(err, nAffected){
}, {multi: false}, function(err, updateRes){
if(err) return next(err);
if(nAffected !== 1) return res.json(404, {err: 'User not found'});
if(updateRes.n !== 1) return res.json(404, {err: 'User not found'});
res.send('<h1>' + i18n.t('unsubscribedSuccessfully', null, req.language) + '</h1>' + i18n.t('unsubscribedTextUsers', null, req.language));
});
website/src/controllers/user.js
+1 -1
View File
@@ -364,7 +364,7 @@ api.cron = function(req, res, next) {
// api.reroll // Shared.ops
// api.reset // Shared.ops
api['delete'] = function(req, res, next) {
api.delete = function(req, res, next) {
var user = res.locals.user;
var plan = user.purchased.plan;
website/src/i18n.js
+11 -8
View File
@@ -1,9 +1,10 @@
var fs = require('fs'),
path = require('path'),
_ = require('lodash'),
User = require('./models/user').model,
shared = require('../../common'),
translations = {};
var fs = require('fs');
var path = require('path');
var _ = require('lodash');
var accepts = require('accepts');
var User = require('./models/user').model;
var shared = require('../../common');
var translations = {};
var localePath = path.join(__dirname, "/../../common/locales/")
@@ -74,7 +75,9 @@ var chineseVersions = ['zh-tw'];
var getUserLanguage = function(req, res, next){
var getFromBrowser = function(){
var acceptable = _(req.acceptedLanguages).map(function(lang){
var acceptedLanguages = accepts(req).languages();
var acceptable = _(acceptedLanguages).map(function(lang){
return lang.slice(0, 2);
}).uniq().value();
@@ -83,7 +86,7 @@ var getUserLanguage = function(req, res, next){
var iAcceptedCompleteLang = (matches.length > 0) ? multipleVersionsLanguages.indexOf(matches[0].toLowerCase()) : -1;
if(iAcceptedCompleteLang !== -1){
var acceptedCompleteLang = _.find(req.acceptedLanguages, function(accepted){
var acceptedCompleteLang = _.find(acceptedLanguages, function(accepted){
return accepted.slice(0, 2) == multipleVersionsLanguages[iAcceptedCompleteLang];
});
website/src/routes/apiv1.js
+1 -1
View File
@@ -155,7 +155,7 @@ router.post('/user/tasks/:id/:direction', auth.auth, i18n.getUserLanguage, cron,
// Tasks
router.get('/user/tasks', auth.auth, i18n.getUserLanguage, cron, api.getTasks);
router.get('/user/task/:id', auth.auth, i18n.getUserLanguage, cron, api.getTask);
router["delete"]('/user/task/:id', auth.auth, i18n.getUserLanguage, cron, api.deleteTask);
router.delete('/user/task/:id', auth.auth, i18n.getUserLanguage, cron, api.deleteTask);
router.post('/user/task', auth.auth, i18n.getUserLanguage, cron, api.addTask);
// User
website/src/routes/apiv2.coffee
+2 -2
View File
@@ -265,7 +265,7 @@ module.exports = (swagger, v2) ->
method: 'DELETE'
description: "Delete a user object entirely, USE WITH CAUTION!"
middleware: [auth.auth, i18n.getUserLanguage]
action: user["delete"]
action: user.delete
"/user/revive":
spec:
@@ -774,7 +774,7 @@ module.exports = (swagger, v2) ->
description: "Delete a challenge"
parameters: [path('cid','Challenge id','string')]
middleware: [auth.auth, i18n.getUserLanguage]
action: challenges["delete"]
action: challenges.delete
"/challenges/{cid}/close":
spec:
website/src/server.js
+57 -41
View File
@@ -1,5 +1,5 @@
// Only do the minimal amount of work before forking just in case of a dyno restart
var cluster = require("cluster");
var cluster = require('cluster');
var _ = require('lodash');
var nconf = require('nconf');
var utils = require('./utils');
@@ -8,11 +8,13 @@ var logging = require('./logging');
var isProd = nconf.get('NODE_ENV') === 'production';
var isDev = nconf.get('NODE_ENV') === 'development';
var DISABLE_LOGGING = nconf.get('DISABLE_REQUEST_LOGGING');
var cores = +nconf.get("WEB_CONCURRENCY") || 0;
var cores = +nconf.get('WEB_CONCURRENCY') || 0;
if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
// Fork workers. If config.json has CORES=x, use that - otherwise, use all cpus-1 (production)
_.times(cores, cluster.fork);
for (var i = 0, n = cores; i < n; i += 1) {
cluster.fork();
}
cluster.on('disconnect', function(worker, code, signal) {
var w = cluster.fork(); // replace the dead worker
@@ -21,10 +23,10 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
} else {
require('coffee-script'); // remove this once we've fully converted over
var express = require("express");
var http = require("http");
var path = require("path");
var swagger = require("swagger-node-express");
var express = require('express');
var http = require('http');
var path = require('path');
var swagger = require('swagger-node-express');
var autoinc = require('mongoose-id-autoinc');
var shared = require('../../common');
@@ -77,8 +79,8 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
// This auth strategy is no longer used. It's just kept around for auth.js#loginFacebook() (passport._strategies.facebook.userProfile)
// The proper fix would be to move to a general OAuth module simply to verify accessTokens
passport.use(new FacebookStrategy({
clientID: nconf.get("FACEBOOK_KEY"),
clientSecret: nconf.get("FACEBOOK_SECRET"),
clientID: nconf.get('FACEBOOK_KEY'),
clientSecret: nconf.get('FACEBOOK_SECRET'),
//callbackURL: nconf.get("BASE_URL") + "/auth/facebook/callback"
},
function(accessToken, refreshToken, profile, done) {
@@ -87,61 +89,75 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
));
// ------------ Server Configuration ------------
var publicDir = path.join(__dirname, "/../public");
var publicDir = path.join(__dirname, '/../public');
app.set("port", nconf.get('PORT'));
app.set('port', nconf.get('PORT'));
require('./middlewares/apiThrottle')(app);
app.use(require('./middlewares/domain')(server,mongoose));
if (!isProd && !DISABLE_LOGGING) app.use(express.logger("dev"));
app.use(express.compress());
app.set("views", __dirname + "/../views");
app.set("view engine", "jade");
app.use(express.favicon(publicDir + '/favicon.ico'));
if (!isProd && !DISABLE_LOGGING) app.use(require('morgan')('dev'));
app.use(require('compression')());
app.set('views', __dirname + '/../views');
app.set('view engine', 'jade');
app.use(require('serve-favicon')(publicDir + '/favicon.ico'));
app.use(require('./middlewares/cors'));
var redirects = require('./middlewares/redirects');
app.use(redirects.forceHabitica);
app.use(redirects.forceSSL);
app.use(express.urlencoded());
app.use(express.json());
var bodyParser = require('body-parser');
// Default limit is 100kb, need that because we actually send whole groups to the server
// FIXME as soon as possible (need to move on the client from $resource -> $http)
app.use(bodyParser.urlencoded({
limit: '1mb',
parameterLimit: 10000, // Upped for safety from 1k, FIXME as above
extended: true // Uses 'qs' library as old connect middleware
}));
app.use(bodyParser.json({
limit: '1mb'
}));
app.use(require('method-override')());
//app.use(express.cookieParser(nconf.get('SESSION_SECRET')));
app.use(express.cookieParser());
app.use(express.cookieSession({ secret: nconf.get('SESSION_SECRET'), httpOnly: false, cookie: { maxAge: TWO_WEEKS }}));
//app.use(express.session());
app.use(require('cookie-parser')());
app.use(require('cookie-session')({
name: 'connect:sess', // Used to keep backward compatibility with Express 3 cookies
secret: nconf.get('SESSION_SECRET'),
httpOnly: false,
maxAge: TWO_WEEKS
}));
// Initialize Passport! Also use passport.session() middleware, to support
// persistent login sessions (recommended).
app.use(passport.initialize());
app.use(passport.session());
app.use(app.router);
// Custom Directives
app.use(require('./routes/pages'));
app.use(require('./routes/payments'));
app.use(require('./routes/auth'));
app.use(require('./routes/coupon'));
app.use(require('./routes/unsubscription'));
var v2 = express();
app.use('/api/v2', v2);
app.use('/api/v1', require('./routes/apiv1'));
app.use('/export', require('./routes/dataexport'));
require('./routes/apiv2.coffee')(swagger, v2);
var maxAge = isProd ? 31536000000 : 0;
// Cache emojis without copying them to build, they are too many
app.use(express['static'](path.join(__dirname, "/../build"), { maxAge: maxAge }));
app.use('/common/dist', express['static'](publicDir + "/../../common/dist", { maxAge: maxAge }));
app.use('/common/audio', express['static'](publicDir + "/../../common/audio", { maxAge: maxAge }));
app.use('/common/script/public', express['static'](publicDir + "/../../common/script/public", { maxAge: maxAge }));
app.use('/common/img', express['static'](publicDir + "/../../common/img", { maxAge: maxAge }));
app.use(express['static'](publicDir));
app.use(express.static(path.join(__dirname, '/../build'), { maxAge: maxAge }));
app.use('/common/dist', express.static(publicDir + '/../../common/dist', { maxAge: maxAge }));
app.use('/common/audio', express.static(publicDir + '/../../common/audio', { maxAge: maxAge }));
app.use('/common/script/public', express.static(publicDir + '/../../common/script/public', { maxAge: maxAge }));
app.use('/common/img', express.static(publicDir + '/../../common/img', { maxAge: maxAge }));
app.use(express.static(publicDir));
// Custom Directives
app.use(require('./routes/pages').middleware);
app.use(require('./routes/payments').middleware);
app.use(require('./routes/auth').middleware);
app.use(require('./routes/coupon').middleware);
app.use(require('./routes/unsubscription').middleware);
var v2 = express();
app.use('/api/v2', v2);
app.use('/api/v1', require('./routes/apiv1').middleware);
app.use('/export', require('./routes/dataexport').middleware);
require('./routes/apiv2.coffee')(swagger, v2);
app.use(require('./middlewares/errorHandler'));
server.on('request', app);
server.listen(app.get("port"), function() {
return logging.info("Express server listening on port " + app.get("port"));
server.listen(app.get('port'), function() {
return logging.info('Express server listening on port ' + app.get('port'));
});
module.exports = server;
website/src/utils.js
+2 -2
View File
@@ -174,8 +174,8 @@ module.exports.setupConfig = function(){
if (nconf.get('NODE_ENV') === "development")
Error.stackTraceLimit = Infinity;
//if (nconf.get('NODE_ENV') === 'production')
// require('newrelic');
if (nconf.get('NODE_ENV') === 'production')
require('newrelic');
isProd = nconf.get('NODE_ENV') === 'production';
baseUrl = nconf.get('BASE_URL');