Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-31 04:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: #7038, autoLocale logic not playing nicely with no-refresh auths (#7059)

Browse Source 
* fix: #7038, autoLocale logic not playing nicely with no-refresh auths

- on login, req.query.lang is deleted (since it seems to be left over)
- on logout, the middleware.autoLocale is executed, which resets
  req.query.lang
- middleware.autoLocale is new, just refactored existing logic in
  webserver.js into new middleware method.

* style: tests, use lodash

* fix: timeago strings not switching languages on login or out
This commit is contained in:
Julian Lam
2018-12-07 11:29:20 -05:00
committed by GitHub
parent 72f56d7f49
commit 5f3d1c76c8
6 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/authentication.js
View File

@@ -284,6 +284,8 @@ function continueLogin(req, res, next) {
});
});
} else {
delete req.query.lang;
async.parallel({
doLogin: async.apply(authenticationController.doLogin, req, userData.uid),
header: async.apply(middleware.generateHeader, req, res, {}),

28
src/middleware/headers.js
View File

@@ -2,8 +2,10 @@
var os = require('os');
var winston = require('winston');
var _ = require('lodash');
var meta = require('../meta');
var languages = require('../languages');
module.exports = function (middleware) {
middleware.addHeaders = function (req, res, next) {
@@ -60,4 +62,30 @@ module.exports = function (middleware) {
next();
};
let langs = [];
middleware.autoLocale = function (req, res, next) {
if (parseInt(req.uid, 10) > 0 || !meta.config.autoDetectLang) {
return next();
}
var lang = req.acceptsLanguages(langs);
if (!lang) {
return next();
}
req.query.lang = lang;
next();
};
languages.listCodes(function (err, codes) {
if (err) {
winston.error('[middleware/autoLocale] Could not retrieve languages codes list!');
codes = [];
}
winston.verbose('[middleware/autoLocale] Retrieves languages list for middleware');
var defaultLang = meta.config.defaultLang || 'en-GB';
langs = _.uniq([defaultLang, ...codes]);
});
};

33
src/webserver.js
View File

@@ -25,7 +25,6 @@ var db = require('./database');
var file = require('./file');
var emailer = require('./emailer');
var meta = require('./meta');
var languages = require('./languages');
var logger = require('./logger');
var plugins = require('./plugins');
var flags = require('./flags');
@@ -194,12 +193,13 @@ function setupExpressApp(app, callback) {
app.use(middleware.addHeaders);
app.use(middleware.processRender);
auth.initialize(app, middleware);
app.use(middleware.autoLocale); // must be added after auth middlewares are added
var toobusy = require('toobusy-js');
toobusy.maxLag(meta.config.eventLoopLagThreshold);
toobusy.interval(meta.config.eventLoopInterval);
setupAutoLocale(app, callback);
callback();
}
function setupFavicon(app) {
@@ -233,35 +233,6 @@ function setupCookie() {
return cookie;
}
function setupAutoLocale(app, callback) {
languages.listCodes(function (err, codes) {
if (err) {
return callback(err);
}
var defaultLang = meta.config.defaultLang || 'en-GB';
var langs = [defaultLang].concat(codes).filter(function (el, i, arr) {
return arr.indexOf(el) === i;
});
app.use(function (req, res, next) {
if (parseInt(req.uid, 10) > 0 || !meta.config.autoDetectLang) {
return next();
}
var lang = req.acceptsLanguages(langs);
if (!lang) {
return next();
}
req.query.lang = lang;
next();
});
callback();
});
}
function listen(callback) {
callback = callback || function () { };
var port = nconf.get('port');