diff --git a/ghost/admin/app/authenticators/oauth2.js b/ghost/admin/app/authenticators/oauth2.js index ada73d8eda..49bf6bf77d 100644 --- a/ghost/admin/app/authenticators/oauth2.js +++ b/ghost/admin/app/authenticators/oauth2.js @@ -1,8 +1,11 @@ +import Ember from 'ember'; import Authenticator from 'simple-auth-oauth2/authenticators/oauth2'; export default Authenticator.extend({ + config: Ember.inject.service(), makeRequest: function (url, data) { - data.client_id = 'ghost-admin'; + data.client_id = this.get('config.clientId'); + data.client_secret = this.get('config.clientSecret'); return this._super(url, data); } }); diff --git a/ghost/admin/app/routes/settings/general.js b/ghost/admin/app/routes/settings/general.js index 7c563ec5fd..2d1246314d 100644 --- a/ghost/admin/app/routes/settings/general.js +++ b/ghost/admin/app/routes/settings/general.js @@ -15,7 +15,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, { }, model: function () { - return this.store.find('setting', {type: 'blog,theme'}).then(function (records) { + return this.store.find('setting', {type: 'blog,theme,private'}).then(function (records) { return records.get('firstObject'); }); },