diff --git a/core/server/apps/members/index.js b/core/server/apps/members/index.js deleted file mode 100644 index b6aae16e0e..0000000000 --- a/core/server/apps/members/index.js +++ /dev/null @@ -1,12 +0,0 @@ -const membersService = require('../../services/members'); -const labs = require('../../services/labs'); - -module.exports = { - activate() {}, - - setupMiddleware(router) { - if (labs.isSet('members')) { - router.use('/members', membersService.api.staticRouter); - } - } -}; diff --git a/core/server/config/overrides.json b/core/server/config/overrides.json index b0d38d9c2f..a73e2faf1f 100644 --- a/core/server/config/overrides.json +++ b/core/server/config/overrides.json @@ -17,8 +17,7 @@ "internal": [ "private-blogging", "subscribers", - "amp", - "members" + "amp" ] }, "slugs": { diff --git a/core/server/web/parent-app.js b/core/server/web/parent-app.js index 4a718f82bb..b9b28bef5a 100644 --- a/core/server/web/parent-app.js +++ b/core/server/web/parent-app.js @@ -4,6 +4,8 @@ const config = require('../config'); const compress = require('compression'); const netjet = require('netjet'); const shared = require('./shared'); +const labs = require('../services/labs'); +const membersService = require('../services/members'); module.exports = function setupParentApp(options = {}) { debug('ParentApp setup start'); @@ -46,6 +48,11 @@ module.exports = function setupParentApp(options = {}) { // ADMIN parentApp.use('/ghost', require('./admin')()); + // MEMBERS + if (labs.isSet('members')) { + parentApp.use('/members', membersService.api.staticRouter); + } + // BLOG parentApp.use(require('./site')(options)); diff --git a/core/test/unit/services/apps/lifecycle_spec.js b/core/test/unit/services/apps/lifecycle_spec.js index b78c2cd25d..16b8c33540 100644 --- a/core/test/unit/services/apps/lifecycle_spec.js +++ b/core/test/unit/services/apps/lifecycle_spec.js @@ -47,15 +47,14 @@ describe('Apps', function () { settingsEditStub.callCount.should.eql(0); // Test that activate is called 4 times, and install 0 time - loaderActivateStub.callCount.should.eql(4); + loaderActivateStub.callCount.should.eql(3); loaderInstallStub.callCount.should.eql(0); // Test that the 4 internal apps are loaded as expected - availableApps.should.be.an.Array().with.lengthOf(4); + availableApps.should.be.an.Array().with.lengthOf(3); availableApps.should.containEql('amp'); availableApps.should.containEql('private-blogging'); availableApps.should.containEql('subscribers'); - availableApps.should.containEql('members'); done(); }) @@ -81,15 +80,14 @@ describe('Apps', function () { settingsEditStub.firstCall.args[0].settings[0].value.should.eql(['testA', 'testB']); // Test that activate is called 6 times, and install only 1 time - loaderActivateStub.callCount.should.eql(6); + loaderActivateStub.callCount.should.eql(5); loaderInstallStub.callCount.should.eql(1); - // Test that the 4 internal apps are loaded as expected - availableApps.should.be.an.Array().with.lengthOf(6); + // Test that the 5 internal apps are loaded as expected + availableApps.should.be.an.Array().with.lengthOf(5); availableApps.should.containEql('amp'); availableApps.should.containEql('private-blogging'); availableApps.should.containEql('subscribers'); - availableApps.should.containEql('members'); availableApps.should.containEql('testA'); availableApps.should.containEql('testB');