diff --git a/core/server/api/v2/configuration.js b/core/server/api/v2/configuration.js index 8e1e7c20f0..2a521b4a81 100644 --- a/core/server/api/v2/configuration.js +++ b/core/server/api/v2/configuration.js @@ -1,7 +1,6 @@ const Promise = require('bluebird'); const {isPlainObject} = require('lodash'); const urlService = require('../../services/url'); -const models = require('../../models'); const config = require('../../config'); const labs = require('../../services/labs'); const settingsCache = require('../../services/settings/cache'); @@ -41,15 +40,7 @@ module.exports = { ], query({data}) { if (!data.key) { - return models.Client.findOne({slug: 'ghost-admin'}) - .then((ghostAdmin) => { - const configuration = getBaseConfig(); - - configuration.clientId = ghostAdmin.get('slug'); - configuration.clientSecret = ghostAdmin.get('secret'); - - return configuration; - }); + return Promise.resolve(getBaseConfig()); } if (data.key === 'about') { diff --git a/core/test/acceptance/old/admin/configuration_spec.js b/core/test/acceptance/old/admin/configuration_spec.js index 557a80723b..cac2f0a533 100644 --- a/core/test/acceptance/old/admin/configuration_spec.js +++ b/core/test/acceptance/old/admin/configuration_spec.js @@ -37,8 +37,6 @@ describe('Configuration API', function () { props.blogUrl.should.eql('http://127.0.0.1:2369/'); props.useGravatar.should.eql(false); - props.clientId.should.eql('ghost-admin'); - props.clientSecret.should.eql('not_available'); // value not available, because settings API was not called yet props.hasOwnProperty('blogTitle').should.eql(true);