|
@@ -1,5 +1,4 @@
|
|
|
-var debug = require('debug')('crowi:lib:middlewares')
|
|
|
|
|
- ;
|
|
|
|
|
|
|
+var debug = require('debug')('crowi:lib:middlewares');
|
|
|
|
|
|
|
|
exports.loginChecker = function(app, models) {
|
|
exports.loginChecker = function(app, models) {
|
|
|
return function(req, res, next) {
|
|
return function(req, res, next) {
|
|
@@ -7,7 +6,7 @@ exports.loginChecker = function(app, models) {
|
|
|
if (req.session.user && '_id' in req.session.user) {
|
|
if (req.session.user && '_id' in req.session.user) {
|
|
|
models.User.findById(req.session.user._id, function(err, userData) {
|
|
models.User.findById(req.session.user._id, function(err, userData) {
|
|
|
if (err) {
|
|
if (err) {
|
|
|
- next()
|
|
|
|
|
|
|
+ next();
|
|
|
} else {
|
|
} else {
|
|
|
req.user = req.session.user = userData;
|
|
req.user = req.session.user = userData;
|
|
|
res.locals({user: req.user});
|
|
res.locals({user: req.user});
|
|
@@ -38,7 +37,7 @@ exports.swigFilters = function(app, swig) {
|
|
|
|
|
|
|
|
swig.setFilter('datetz', function(input, format) {
|
|
swig.setFilter('datetz', function(input, format) {
|
|
|
// timezone
|
|
// timezone
|
|
|
- var swigFilters = require('swig/lib/filters')
|
|
|
|
|
|
|
+ var swigFilters = require('swig/lib/filters');
|
|
|
return swigFilters.date(input, format, app.get('tzoffset'));
|
|
return swigFilters.date(input, format, app.get('tzoffset'));
|
|
|
});
|
|
});
|
|
|
|
|
|
|
@@ -130,11 +129,7 @@ exports.applicationInstalled = function() {
|
|
|
exports.awsEnabled = function() {
|
|
exports.awsEnabled = function() {
|
|
|
return function (req, res, next) {
|
|
return function (req, res, next) {
|
|
|
var config = req.config;
|
|
var config = req.config;
|
|
|
- if (config.crowi['aws:region'] != ''
|
|
|
|
|
- && config.crowi['aws:bucket'] != ''
|
|
|
|
|
- && config.crowi['aws:accessKeyId'] != ''
|
|
|
|
|
- && config.crowi['aws:secretAccessKey'] != ''
|
|
|
|
|
- ) {
|
|
|
|
|
|
|
+ if (config.crowi['aws:region'] !== '' && config.crowi['aws:bucket'] !== '' && config.crowi['aws:accessKeyId'] !== '' && config.crowi['aws:secretAccessKey'] !== '') {
|
|
|
req.flash('globalError', 'AWS settings required to use this function. Please ask the administrator.');
|
|
req.flash('globalError', 'AWS settings required to use this function. Please ask the administrator.');
|
|
|
return res.redirect('/');
|
|
return res.redirect('/');
|
|
|
}
|
|
}
|