Skip to content

Commit

Permalink
馃帹 Use settingsCache in theme handler (#8091)
Browse files Browse the repository at this point in the history 
no issue

- we already have the settingsCache here, makes no sense to call the API
  • Loading branch information
@ErisDS @kirrg001
ErisDS authored and kirrg001 committed Mar 2, 2017
1 parent a5ab2ff commit e3c82c1
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 58 deletions.
57 changes: 26 additions & 31 deletions core/server/middleware/theme-handler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ var _ = require('lodash'),
fs = require('fs'),
path = require('path'),
hbs = require('express-hbs'),
api = require('../api'),
settingsCache = require('../settings/cache'),
config = require('../config'),
utils = require('../utils'),
logging = require('../logging'),
errors = require('../errors'),
i18n = require('../i18n'),
settingsCache = require('../settings/cache'),
themeList = require('../themes').list,
themeHandler;

Expand Down Expand Up @@ -88,39 +87,35 @@ themeHandler = {
// activates that theme's views with the hbs templating engine if it
// is not yet activated.
updateActiveTheme: function updateActiveTheme(req, res, next) {
var blogApp = req.app;
var blogApp = req.app,
activeTheme = settingsCache.get('activeTheme');

api.settings.read({context: {internal: true}, key: 'activeTheme'}).then(function then(response) {
var activeTheme = response.settings[0];

// Check if the theme changed
if (activeTheme.value !== blogApp.get('activeTheme')) {
// Change theme
if (!themeList.get(activeTheme.value)) {
if (!res.isAdmin) {
return next(new errors.NotFoundError({
message: i18n.t('errors.middleware.themehandler.missingTheme', {theme: activeTheme.value})
}));
} else {
// At this point the activated theme is not present and the current
// request is for the admin client. In order to allow the user access
// to the admin client we set an hbs instance on the app so that middleware
// processing can continue.
blogApp.engine('hbs', hbs.express3());
logging.warn(i18n.t('errors.middleware.themehandler.missingTheme', {theme: activeTheme.value}));
return next();
}
// Check if the theme changed
if (activeTheme !== blogApp.get('activeTheme')) {
// Change theme
if (!themeList.get(activeTheme)) {
if (!res.isAdmin) {
// Trying to start up without the active theme present, setup a simple hbs instance
// and render an error page straight away.
blogApp.engine('hbs', hbs.express3());
return next(new errors.NotFoundError({
message: i18n.t('errors.middleware.themehandler.missingTheme', {theme: activeTheme})
}));
} else {
themeHandler.activateTheme(blogApp, activeTheme.value);
// At this point the activated theme is not present and the current
// request is for the admin client. In order to allow the user access
// to the admin client we set an hbs instance on the app so that middleware
// processing can continue.
blogApp.engine('hbs', hbs.express3());
logging.warn(i18n.t('errors.middleware.themehandler.missingTheme', {theme: activeTheme}));
return next();
}
} else {
themeHandler.activateTheme(blogApp, activeTheme);
}
next();
}).catch(function handleError(err) {
// Trying to start up without the active theme present, setup a simple hbs instance
// and render an error page straight away.
blogApp.engine('hbs', hbs.express3());
next(err);
});
}

next();
}
};

Expand Down
34 changes: 7 additions & 27 deletions core/test/unit/middleware/theme-handler_spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
var sinon = require('sinon'),
should = require('should'),
express = require('express'),
Promise = require('bluebird'),
fs = require('fs'),
hbs = require('express-hbs'),
themeList = require('../../../server/themes').list,
themeHandler = require('../../../server/middleware/theme-handler'),
logging = require('../../../server/logging'),
api = require('../../../server/api'),
settingsCache = require('../../../server/settings/cache'),

sandbox = sinon.sandbox.create();

describe('Theme Handler', function () {
Expand Down Expand Up @@ -96,12 +96,7 @@ describe('Theme Handler', function () {
it('updates the active theme if changed', function (done) {
var activateThemeSpy = sandbox.spy(themeHandler, 'activateTheme');

sandbox.stub(api.settings, 'read').withArgs(sandbox.match.has('key', 'activeTheme')).returns(Promise.resolve({
settings: [{
key: 'activeKey',
value: 'casper'
}]
}));
sandbox.stub(settingsCache, 'get').withArgs('activeTheme').returns('casper');
blogApp.set('activeTheme', 'not-casper');

themeHandler.updateActiveTheme(req, res, function () {
Expand All @@ -112,12 +107,8 @@ describe('Theme Handler', function () {

it('does not update the active theme if not changed', function (done) {
var activateThemeSpy = sandbox.spy(themeHandler, 'activateTheme');
sandbox.stub(api.settings, 'read').withArgs(sandbox.match.has('key', 'activeTheme')).returns(Promise.resolve({
settings: [{
key: 'activeKey',
value: 'casper'
}]
}));

sandbox.stub(settingsCache, 'get').withArgs('activeTheme').returns('casper');
blogApp.set('activeTheme', 'casper');

themeHandler.updateActiveTheme(req, res, function () {
Expand All @@ -129,13 +120,7 @@ describe('Theme Handler', function () {
it('throws error if theme is missing', function (done) {
var activateThemeSpy = sandbox.spy(themeHandler, 'activateTheme');

sandbox.stub(api.settings, 'read').withArgs(sandbox.match.has('key', 'activeTheme')).returns(Promise.resolve({
settings: [{
key: 'activeKey',
value: 'rasper'
}]
}));

sandbox.stub(settingsCache, 'get').withArgs('activeTheme').returns('rasper');
blogApp.set('activeTheme', 'not-casper');

themeHandler.updateActiveTheme(req, res, function (err) {
Expand All @@ -150,12 +135,7 @@ describe('Theme Handler', function () {
var activateThemeSpy = sandbox.spy(themeHandler, 'activateTheme'),
loggingWarnStub = sandbox.spy(logging, 'warn');

sandbox.stub(api.settings, 'read').withArgs(sandbox.match.has('key', 'activeTheme')).returns(Promise.resolve({
settings: [{
key: 'activeKey',
value: 'rasper'
}]
}));
sandbox.stub(settingsCache, 'get').withArgs('activeTheme').returns('rasper');

res.isAdmin = true;
blogApp.set('activeTheme', 'not-casper');
Expand Down

0 comments on commit e3c82c1

Please sign in to comment.