From 7b443d4b6377f4f46b0ca452734500851f06a556 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Fri, 7 Oct 2022 15:24:03 +0100 Subject: [PATCH] Removed need for `.get()` with config service no issue The `config` service has been a source of confusion when writing with modern Ember patterns because it's use of the deprecated `ProxyMixin` forced all property access/setting to go via `.get()` and `.set()` whereas the rest of the system has mostly (there are a few other uses of ProxyObjects remaining) eliminated the use of the non-native get/set methods. - removed use of `ProxyMixin` in the `config` service by grabbing the API response after fetching and using `Object.defineProperty()` to add native getters/setters that pass through to a tracked object holding the API response data. Ember's autotracking automatically works across the native getters/setters so we can then use the service as if it was any other native object - updated all code to use `config.{attrName}` directly for getting/setting instead of `.get()` and `.set()` - removed unnecessary async around `config.availableTimezones` which wasn't making any async calls --- .../components/editor/modals/preview/email.js | 2 +- .../editor/modals/preview/social.js | 2 +- .../admin/app/components/gh-billing-iframe.js | 6 +- ghost/admin/app/components/gh-portal-links.js | 2 +- .../app/components/gh-post-settings-menu.js | 2 +- .../components/gh-post-settings-menu/email.js | 2 +- ghost/admin/app/components/gh-site-iframe.js | 2 +- ghost/admin/app/components/gh-url-preview.js | 2 +- .../app/components/koenig-lexical-editor.js | 6 +- .../modal-free-membership-settings.js | 2 +- .../app/components/modal-portal-settings.js | 2 +- ghost/admin/app/components/modal-tier.js | 2 +- .../app/components/modals/offers/link.js | 2 +- .../app/components/modals/settings/about.js | 8 +- .../settings/members/stripe-settings-form.js | 2 +- ghost/admin/app/components/tags/tag-form.js | 2 +- ghost/admin/app/controllers/offer.js | 4 +- .../admin/app/controllers/settings/general.js | 4 +- .../app/controllers/settings/integrations.js | 2 +- .../app/controllers/settings/membership.js | 6 +- .../app/controllers/settings/navigation.js | 2 +- ghost/admin/app/controllers/settings/tier.js | 2 +- ghost/admin/app/controllers/settings/tiers.js | 2 +- .../app/helpers/accent-color-background.js | 4 +- .../helpers/enable-developer-experiments.js | 2 +- ghost/admin/app/helpers/site-icon-style.js | 4 +- ghost/admin/app/models/post.js | 2 +- ghost/admin/app/routes/application.js | 10 +-- ghost/admin/app/routes/designsandbox.js | 2 +- ghost/admin/app/routes/lexical-editor.js | 2 +- ghost/admin/app/routes/pro.js | 2 +- ghost/admin/app/routes/settings/general.js | 7 +- .../routes/settings/integrations/zapier.js | 2 +- ghost/admin/app/routes/signup.js | 2 +- ghost/admin/app/services/ajax.js | 4 +- ghost/admin/app/services/billing.js | 4 +- ghost/admin/app/services/config.js | 84 +++++++++---------- ghost/admin/app/services/frontend.js | 2 +- ghost/admin/app/services/limit.js | 10 +-- ghost/admin/app/services/members-utils.js | 6 +- ghost/admin/app/services/notifications.js | 4 +- ghost/admin/app/services/session.js | 4 +- ghost/admin/app/services/tenor.js | 4 +- ghost/admin/app/services/ui.js | 2 +- ghost/admin/app/utils/publish-options.js | 4 +- ghost/admin/app/utils/route.js | 2 +- .../addon/components/koenig-link-input.js | 2 +- .../addon/components/koenig-link-toolbar.js | 2 +- .../addon/helpers/card-is-available.js | 2 +- .../tests/integration/services/config-test.js | 18 ++-- 50 files changed, 125 insertions(+), 136 deletions(-) diff --git a/ghost/admin/app/components/editor/modals/preview/email.js b/ghost/admin/app/components/editor/modals/preview/email.js index 4c161e1732..a957902583 100644 --- a/ghost/admin/app/components/editor/modals/preview/email.js +++ b/ghost/admin/app/components/editor/modals/preview/email.js @@ -38,7 +38,7 @@ export default class ModalPostPreviewEmailComponent extends Component { } get mailgunIsEnabled() { - return this.config.get('mailgunIsConfigured') || + return this.config.mailgunIsConfigured || !!(this.settings.mailgunApiKey && this.settings.mailgunDomain && this.settings.mailgunBaseUrl); } diff --git a/ghost/admin/app/components/editor/modals/preview/social.js b/ghost/admin/app/components/editor/modals/preview/social.js index 3f265dc4f8..f3d768e291 100644 --- a/ghost/admin/app/components/editor/modals/preview/social.js +++ b/ghost/admin/app/components/editor/modals/preview/social.js @@ -57,7 +57,7 @@ export default class ModalPostPreviewSocialComponent extends Component { urlParts.push(canonicalUrl.host); urlParts.push(...canonicalUrl.pathname.split('/').reject(p => !p)); } else { - const blogUrl = new URL(this.config.get('blogUrl')); + const blogUrl = new URL(this.config.blogUrl); urlParts.push(blogUrl.host); urlParts.push(...blogUrl.pathname.split('/').reject(p => !p)); urlParts.push(this.args.post.slug); diff --git a/ghost/admin/app/components/gh-billing-iframe.js b/ghost/admin/app/components/gh-billing-iframe.js index e27e4e6bc0..c807fc4bcb 100644 --- a/ghost/admin/app/components/gh-billing-iframe.js +++ b/ghost/admin/app/components/gh-billing-iframe.js @@ -89,7 +89,7 @@ export default class GhBillingIframe extends Component { this.billing.getBillingIframe().contentWindow.postMessage({ request: 'forceUpgradeInfo', response: { - forceUpgrade: this.config.get('hostSettings.forceUpgrade'), + forceUpgrade: this.config.hostSettings?.forceUpgrade, isOwner: this.isOwner, ownerUser } @@ -100,11 +100,11 @@ export default class GhBillingIframe extends Component { this.billing.set('subscription', data.subscription); this.billing.set('checkoutRoute', data?.checkoutRoute || '/plans'); - if (data.subscription.status === 'active' && this.config.get('hostSettings.forceUpgrade')) { + if (data.subscription.status === 'active' && this.config.hostSettings?.forceUpgrade) { // config might not be updated after a subscription has been set to active. // Until then assume the forceUpgrade is over and the subscription // was activated successfully. - this.config.set('hostSettings.forceUpgrade', false); + this.config.hostSettings.forceUpgrade = false; } // Detect if the current subscription is in a grace state and render a notification diff --git a/ghost/admin/app/components/gh-portal-links.js b/ghost/admin/app/components/gh-portal-links.js index 457f3766d1..1a3d4159c3 100644 --- a/ghost/admin/app/components/gh-portal-links.js +++ b/ghost/admin/app/components/gh-portal-links.js @@ -54,7 +54,7 @@ export default class GhPortalLinks extends Component { init() { super.init(...arguments); - this.siteUrl = this.config.get('blogUrl'); + this.siteUrl = this.config.blogUrl; } @action diff --git a/ghost/admin/app/components/gh-post-settings-menu.js b/ghost/admin/app/components/gh-post-settings-menu.js index 0b088472b2..c979a1cabb 100644 --- a/ghost/admin/app/components/gh-post-settings-menu.js +++ b/ghost/admin/app/components/gh-post-settings-menu.js @@ -137,7 +137,7 @@ export default class GhPostSettingsMenu extends Component { // no-op, invalid URL } } else { - const blogUrl = new URL(this.config.get('blogUrl')); + const blogUrl = new URL(this.config.blogUrl); urlParts.push(blogUrl.host); urlParts.push(...blogUrl.pathname.split('/').reject(p => !p)); urlParts.push(this.post.slug); diff --git a/ghost/admin/app/components/gh-post-settings-menu/email.js b/ghost/admin/app/components/gh-post-settings-menu/email.js index d6feda3a99..8d855b8e20 100644 --- a/ghost/admin/app/components/gh-post-settings-menu/email.js +++ b/ghost/admin/app/components/gh-post-settings-menu/email.js @@ -42,7 +42,7 @@ export default class Email extends Component { 'config.mailgunIsConfigured' ) get mailgunIsEnabled() { - return this.settings.mailgunApiKey && this.settings.mailgunDomain && this.settings.mailgunBaseUrl || this.get('config.mailgunIsConfigured'); + return this.settings.mailgunApiKey && this.settings.mailgunDomain && this.settings.mailgunBaseUrl || this.config.mailgunIsConfigured; } @action diff --git a/ghost/admin/app/components/gh-site-iframe.js b/ghost/admin/app/components/gh-site-iframe.js index 5a9e95272c..e0fcf79d7f 100644 --- a/ghost/admin/app/components/gh-site-iframe.js +++ b/ghost/admin/app/components/gh-site-iframe.js @@ -19,7 +19,7 @@ export default class GhSiteIframeComponent extends Component { } get srcUrl() { - const srcUrl = new URL(this.args.src || `${this.config.get('blogUrl')}/`); + const srcUrl = new URL(this.args.src || `${this.config.blogUrl}/`); if (this.args.guid) { srcUrl.searchParams.set('v', this.args.guid); diff --git a/ghost/admin/app/components/gh-url-preview.js b/ghost/admin/app/components/gh-url-preview.js index 3e9b4197d0..f2e92a8c60 100644 --- a/ghost/admin/app/components/gh-url-preview.js +++ b/ghost/admin/app/components/gh-url-preview.js @@ -19,7 +19,7 @@ export default class GhUrlPreview extends Component { @computed('slug') get url() { // Get the blog URL and strip the scheme - let blogUrl = this.get('config.blogUrl'); + let blogUrl = this.config.blogUrl; // Remove `http[s]://` let noSchemeBlogUrl = blogUrl.substr(blogUrl.indexOf('://') + 3); diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js index ef7b081c8f..4aa23059f9 100644 --- a/ghost/admin/app/components/koenig-lexical-editor.js +++ b/ghost/admin/app/components/koenig-lexical-editor.js @@ -37,8 +37,8 @@ const fetchKoenig = function () { // required to work around ember-auto-import complaining about an unknown dynamic import // during the build step const GhostAdmin = window.GhostAdmin || window.Ember.Namespace.NAMESPACES.find(ns => ns.name === 'ghost-admin'); - const urlTemplate = GhostAdmin.__container__.lookup('service:config').get('editor.url'); - const urlVersion = GhostAdmin.__container__.lookup('service:config').get('editor.version'); + const urlTemplate = GhostAdmin.__container__.lookup('service:config').editor?.url; + const urlVersion = GhostAdmin.__container__.lookup('service:config').editor?.version; const url = new URL(urlTemplate.replace('{version}', urlVersion)); @@ -96,7 +96,7 @@ export default class KoenigLexicalEditor extends Component { // ensure we're still showing errors in development console.error(error); // eslint-disable-line - if (this.config.get('sentry_dsn')) { + if (this.config.sentry_dsn) { Sentry.captureException(error, { tags: { lexical: true diff --git a/ghost/admin/app/components/modal-free-membership-settings.js b/ghost/admin/app/components/modal-free-membership-settings.js index bbaf692665..4a66e34e96 100644 --- a/ghost/admin/app/components/modal-free-membership-settings.js +++ b/ghost/admin/app/components/modal-free-membership-settings.js @@ -15,7 +15,7 @@ export default class ModalFreeMembershipSettings extends ModalBase { @tracked siteUrl; init() { super.init(...arguments); - this.siteUrl = this.config.get('blogUrl'); + this.siteUrl = this.config.blogUrl; } @action diff --git a/ghost/admin/app/components/modal-portal-settings.js b/ghost/admin/app/components/modal-portal-settings.js index 76fe1c9bde..8535971ce3 100644 --- a/ghost/admin/app/components/modal-portal-settings.js +++ b/ghost/admin/app/components/modal-portal-settings.js @@ -335,7 +335,7 @@ export default ModalComponent.extend({ this.set('customIcon', this.settings.portalButtonIcon); } - this.siteUrl = this.config.get('blogUrl'); + this.siteUrl = this.config.blogUrl; this.set('isPreloading', false); }), diff --git a/ghost/admin/app/components/modal-tier.js b/ghost/admin/app/components/modal-tier.js index 37ccdd1d85..4a9a59724d 100644 --- a/ghost/admin/app/components/modal-tier.js +++ b/ghost/admin/app/components/modal-tier.js @@ -107,7 +107,7 @@ export default class ModalTierPrice extends ModalBase { } get siteUrl() { - return this.config.get('blogUrl'); + return this.config.blogUrl; } // eslint-disable-next-line no-dupe-class-members diff --git a/ghost/admin/app/components/modals/offers/link.js b/ghost/admin/app/components/modals/offers/link.js index c82ce300af..1bd296e4f9 100644 --- a/ghost/admin/app/components/modals/offers/link.js +++ b/ghost/admin/app/components/modals/offers/link.js @@ -17,7 +17,7 @@ export default class LinkOfferModal extends Component { get offerUrl() { const code = this.args.data.offer?.code || ''; if (code) { - const siteUrl = this.config.get('blogUrl'); + const siteUrl = this.config.blogUrl; return `${siteUrl}/${code}`; } return ''; diff --git a/ghost/admin/app/components/modals/settings/about.js b/ghost/admin/app/components/modals/settings/about.js index 079d82e7a2..a26be47ca7 100644 --- a/ghost/admin/app/components/modals/settings/about.js +++ b/ghost/admin/app/components/modals/settings/about.js @@ -21,11 +21,11 @@ export default class AboutModal extends Component { get linkToGitHubReleases() { // Don't link to GitHub Releases if the version contains the // pre-release identifier - return !this.config.get('version').includes('-pre.'); + return !this.config.version.includes('-pre.'); } get showSystemInfo() { - const isPro = !!this.config.get('hostSettings')?.siteId; + const isPro = !!this.config.hostSettings?.siteId; // Don't show any system info for Pro if (isPro) { @@ -36,8 +36,8 @@ export default class AboutModal extends Component { } get showDatabaseWarning() { - const isProduction = !!this.config.get('environment').match?.(/production/i); - const database = this.config.get('database'); + const isProduction = !!this.config.environment.match?.(/production/i); + const database = this.config.database; // Show a warning if we're in production and not using MySQL 8 if (isProduction && database !== 'mysql8') { diff --git a/ghost/admin/app/components/settings/members/stripe-settings-form.js b/ghost/admin/app/components/settings/members/stripe-settings-form.js index bd09d7f076..37b963dbf0 100644 --- a/ghost/admin/app/components/settings/members/stripe-settings-form.js +++ b/ghost/admin/app/components/settings/members/stripe-settings-form.js @@ -182,7 +182,7 @@ export default class StripeSettingsForm extends Component { @action updateStripeDirect() { // Allow disabling stripe direct keys if stripe is still enabled, while the config is disabled - this.stripeDirect = this.config.get('stripeDirect') + this.stripeDirect = this.config.stripeDirect || (this.membersUtils.isStripeEnabled && !this.settings.stripeConnectAccountId); } diff --git a/ghost/admin/app/components/tags/tag-form.js b/ghost/admin/app/components/tags/tag-form.js index 75eb1f0274..219e463b17 100644 --- a/ghost/admin/app/components/tags/tag-form.js +++ b/ghost/admin/app/components/tags/tag-form.js @@ -49,7 +49,7 @@ export default class TagForm extends Component { } get seoURL() { - const blogUrl = this.config.get('blogUrl'); + const blogUrl = this.config.blogUrl; const seoSlug = this.args.tag.slug || ''; let seoURL = this.args.tag.canonicalUrl || `${blogUrl}/tag/${seoSlug}`; diff --git a/ghost/admin/app/controllers/offer.js b/ghost/admin/app/controllers/offer.js index 4cdc8c6489..18feacafc8 100644 --- a/ghost/admin/app/controllers/offer.js +++ b/ghost/admin/app/controllers/offer.js @@ -25,7 +25,7 @@ export default class OffersController extends Controller { @tracked tiers = []; @tracked portalPreviewUrl = ''; - @tracked defaultSiteUrl = this.config.get('blogUrl'); + @tracked defaultSiteUrl = this.config.blogUrl; @tracked durations = [ { @@ -350,7 +350,7 @@ export default class OffersController extends Controller { get offerUrl() { const code = this.offer?.code || ''; if (code) { - const siteUrl = this.config.get('blogUrl'); + const siteUrl = this.config.blogUrl; return `${siteUrl}/${slugify(code)}`; } return ''; diff --git a/ghost/admin/app/controllers/settings/general.js b/ghost/admin/app/controllers/settings/general.js index d37c2c7967..1523660070 100644 --- a/ghost/admin/app/controllers/settings/general.js +++ b/ghost/admin/app/controllers/settings/general.js @@ -32,13 +32,13 @@ export default class GeneralController extends Controller { @tracked scratchValues = new TrackedObject(); - availableTimezones = null; + availableTimezones = this.config.availableTimezones; imageExtensions = IMAGE_EXTENSIONS; imageMimeTypes = IMAGE_MIME_TYPES; @computed('config.blogUrl', 'settings.publicHash') get privateRSSUrl() { - let blogUrl = this.get('config.blogUrl'); + let blogUrl = this.config.blogUrl; let publicHash = this.settings.publicHash; return `${blogUrl}/${publicHash}/rss`; diff --git a/ghost/admin/app/controllers/settings/integrations.js b/ghost/admin/app/controllers/settings/integrations.js index 00a7678135..ccfed274a3 100644 --- a/ghost/admin/app/controllers/settings/integrations.js +++ b/ghost/admin/app/controllers/settings/integrations.js @@ -10,7 +10,7 @@ export default class IntegrationsController extends Controller { _allIntegrations = this.store.peekAll('integration'); get zapierDisabled() { - return this.config.get('hostSettings.limits.customIntegrations.disabled'); + return this.config.hostSettings?.limits?.customIntegrations?.disabled; } // filter over the live query so that the list is automatically updated diff --git a/ghost/admin/app/controllers/settings/membership.js b/ghost/admin/app/controllers/settings/membership.js index d44bd0416d..13530fe7c1 100644 --- a/ghost/admin/app/controllers/settings/membership.js +++ b/ghost/admin/app/controllers/settings/membership.js @@ -59,7 +59,7 @@ export default class MembersAccessController extends Controller { } get siteUrl() { - return this.config.get('blogUrl'); + return this.config.blogUrl; } get selectedCurrency() { @@ -67,7 +67,7 @@ export default class MembersAccessController extends Controller { } get isConnectDisallowed() { - const siteUrl = this.config.get('blogUrl'); + const siteUrl = this.config.blogUrl; return envConfig.environment !== 'development' && !/^https:/.test(siteUrl); } @@ -383,7 +383,7 @@ export default class MembersAccessController extends Controller { } _validateSignupRedirect(url, type) { - const siteUrl = this.config.get('blogUrl'); + const siteUrl = this.config.blogUrl; let errMessage = `Please enter a valid URL`; this.settings.errors.remove(type); this.settings.hasValidated.removeObject(type); diff --git a/ghost/admin/app/controllers/settings/navigation.js b/ghost/admin/app/controllers/settings/navigation.js index 87abef3e82..ffa69f52ed 100644 --- a/ghost/admin/app/controllers/settings/navigation.js +++ b/ghost/admin/app/controllers/settings/navigation.js @@ -28,7 +28,7 @@ export default class NavigationController extends Controller { @computed('config.blogUrl') get blogUrl() { - let url = this.get('config.blogUrl'); + let url = this.config.blogUrl; return url.slice(-1) !== '/' ? `${url}/` : url; } diff --git a/ghost/admin/app/controllers/settings/tier.js b/ghost/admin/app/controllers/settings/tier.js index 7265b208da..83096af6d0 100644 --- a/ghost/admin/app/controllers/settings/tier.js +++ b/ghost/admin/app/controllers/settings/tier.js @@ -17,7 +17,7 @@ export default class TierController extends Controller { constructor() { super(...arguments); - this.siteUrl = this.config.get('blogUrl'); + this.siteUrl = this.config.blogUrl; } get tier() { diff --git a/ghost/admin/app/controllers/settings/tiers.js b/ghost/admin/app/controllers/settings/tiers.js index db6af7eb8d..57c2dc1a94 100644 --- a/ghost/admin/app/controllers/settings/tiers.js +++ b/ghost/admin/app/controllers/settings/tiers.js @@ -21,7 +21,7 @@ export default class TiersController extends Controller { } setIconStyle() { - let icon = this.config.get('icon'); + let icon = this.config.icon; if (icon) { return htmlSafe(`background-image: url(${icon})`); } diff --git a/ghost/admin/app/helpers/accent-color-background.js b/ghost/admin/app/helpers/accent-color-background.js index b5dcb85206..4f9cb21ddc 100644 --- a/ghost/admin/app/helpers/accent-color-background.js +++ b/ghost/admin/app/helpers/accent-color-background.js @@ -8,7 +8,7 @@ export default class AccentColorBackgroundHelper extends Helper { @service config; compute() { - const color = this.get('config.accent_color'); + const color = this.config.accent_color; return htmlSafe(`background: ${color};`); } -} \ No newline at end of file +} diff --git a/ghost/admin/app/helpers/enable-developer-experiments.js b/ghost/admin/app/helpers/enable-developer-experiments.js index 685ed105a1..04b3ef7e12 100644 --- a/ghost/admin/app/helpers/enable-developer-experiments.js +++ b/ghost/admin/app/helpers/enable-developer-experiments.js @@ -5,6 +5,6 @@ export default class EnableDeveloperExperimentsHelper extends Helper { @service config; compute() { - return this.config.get('enableDeveloperExperiments'); + return this.config.enableDeveloperExperiments; } } diff --git a/ghost/admin/app/helpers/site-icon-style.js b/ghost/admin/app/helpers/site-icon-style.js index 7842aa1035..3a337a6c4e 100644 --- a/ghost/admin/app/helpers/site-icon-style.js +++ b/ghost/admin/app/helpers/site-icon-style.js @@ -8,7 +8,7 @@ export default class SiteIconStyleHelper extends Helper { @service config; compute() { - const icon = this.get('config.icon') || 'https://static.ghost.org/v4.0.0/images/ghost-orb-2.png'; + const icon = this.config.icon || 'https://static.ghost.org/v4.0.0/images/ghost-orb-2.png'; return htmlSafe(`background-image: url(${icon})`); } -} \ No newline at end of file +} diff --git a/ghost/admin/app/models/post.js b/ghost/admin/app/models/post.js index 1826c6c69b..4e59ecf704 100644 --- a/ghost/admin/app/models/post.js +++ b/ghost/admin/app/models/post.js @@ -235,7 +235,7 @@ export default Model.extend(Comparable, ValidationEngine, { }), previewUrl: computed('uuid', 'ghostPaths.url', 'config.blogUrl', function () { - let blogUrl = this.get('config.blogUrl'); + let blogUrl = this.config.blogUrl; let uuid = this.uuid; // routeKeywords.preview: 'p' let previewKeyword = 'p'; diff --git a/ghost/admin/app/routes/application.js b/ghost/admin/app/routes/application.js index 0bb0822c34..71d6f50e82 100644 --- a/ghost/admin/app/routes/application.js +++ b/ghost/admin/app/routes/application.js @@ -157,11 +157,11 @@ export default Route.extend(ShortcutsRoute, { // init Sentry here rather than app.js so that we can use API-supplied // sentry_dsn and sentry_env rather than building it into release assets - if (this.config.get('sentry_dsn')) { + if (this.config.sentry_dsn) { InitSentryForEmber({ - dsn: this.config.get('sentry_dsn'), - environment: this.config.get('sentry_env'), - release: `ghost@${this.config.get('version')}`, + dsn: this.config.sentry_dsn, + environment: this.config.sentry_env, + release: `ghost@${this.config.version}`, beforeSend(event) { event.tags = event.tags || {}; event.tags.shown_to_user = event.tags.shown_to_user || false; @@ -181,7 +181,7 @@ export default Route.extend(ShortcutsRoute, { await this.session.postAuthPreparation(); } - if (this.config.get('hostSettings.forceUpgrade')) { + if (this.config.hostSettings?.forceUpgrade) { // enforce opening the BMA in a force upgrade state this.billing.openBillingWindow(this.router.currentURL, '/pro'); } diff --git a/ghost/admin/app/routes/designsandbox.js b/ghost/admin/app/routes/designsandbox.js index 97a34698db..9994dba541 100644 --- a/ghost/admin/app/routes/designsandbox.js +++ b/ghost/admin/app/routes/designsandbox.js @@ -7,7 +7,7 @@ export default class DesignsandboxRoute extends Route { beforeModel() { super.beforeModel(...arguments); - if (!this.config.get('enableDeveloperExperiments')) { + if (!this.config.enableDeveloperExperiments) { return this.transitionTo('home'); } } diff --git a/ghost/admin/app/routes/lexical-editor.js b/ghost/admin/app/routes/lexical-editor.js index 085739ac8b..3556426106 100644 --- a/ghost/admin/app/routes/lexical-editor.js +++ b/ghost/admin/app/routes/lexical-editor.js @@ -13,7 +13,7 @@ export default AuthenticatedRoute.extend({ classNames: ['editor'], beforeModel() { - if (!this.config.get('editor.url')) { + if (!this.config.editor?.url) { return this.router.transitionTo('posts'); } }, diff --git a/ghost/admin/app/routes/pro.js b/ghost/admin/app/routes/pro.js index 78c41ae600..d00d03db28 100644 --- a/ghost/admin/app/routes/pro.js +++ b/ghost/admin/app/routes/pro.js @@ -15,7 +15,7 @@ export default class ProRoute extends AuthenticatedRoute { super.beforeModel(...arguments); // allow non-owner users to access the BMA when we're in a force upgrade state - if (!this.session.user.isOwnerOnly && !this.config.get('hostSettings.forceUpgrade')) { + if (!this.session.user.isOwnerOnly && !this.config.hostSettings?.forceUpgrade) { return this.transitionTo('home'); } diff --git a/ghost/admin/app/routes/settings/general.js b/ghost/admin/app/routes/settings/general.js index ed750c1cff..0bc41001a0 100644 --- a/ghost/admin/app/routes/settings/general.js +++ b/ghost/admin/app/routes/settings/general.js @@ -11,15 +11,10 @@ export default class GeneralSettingsRoute extends AdminRoute { model() { return RSVP.hash({ - settings: this.settings.reload(), - availableTimezones: this.config.get('availableTimezones') + settings: this.settings.reload() }); } - setupController(controller, models) { - controller.set('availableTimezones', models.availableTimezones); - } - deactivate() { this.confirmModal = null; this.hasConfirmed = false; diff --git a/ghost/admin/app/routes/settings/integrations/zapier.js b/ghost/admin/app/routes/settings/integrations/zapier.js index a80eac66aa..b8233c0509 100644 --- a/ghost/admin/app/routes/settings/integrations/zapier.js +++ b/ghost/admin/app/routes/settings/integrations/zapier.js @@ -18,7 +18,7 @@ export default class ZapierRoute extends AdminRoute { beforeModel() { super.beforeModel(...arguments); - if (this.config.get('hostSettings.limits.customIntegrations.disabled')) { + if (this.config.hostSettings?.limits?.customIntegrations?.disabled) { return this.transitionTo('settings.integrations'); } } diff --git a/ghost/admin/app/routes/signup.js b/ghost/admin/app/routes/signup.js index 4067fd2a0f..2263f39fe8 100644 --- a/ghost/admin/app/routes/signup.js +++ b/ghost/admin/app/routes/signup.js @@ -72,7 +72,7 @@ export default class SignupRoute extends UnauthenticatedRoute { } // set blogTitle, so password validation has access to it - signupDetails.blogTitle = this.config.get('blogTitle'); + signupDetails.blogTitle = this.config.blogTitle; resolve(signupDetails); }).catch(() => { diff --git a/ghost/admin/app/services/ajax.js b/ghost/admin/app/services/ajax.js index 1a06926d58..b22b0ab2f2 100644 --- a/ghost/admin/app/services/ajax.js +++ b/ghost/admin/app/services/ajax.js @@ -236,7 +236,7 @@ class ajaxService extends AjaxService { const result = await makeRequest(hash); success = true; - if (attempts !== 0 && this.config.get('sentry_dsn')) { + if (attempts !== 0 && this.config.sentry_dsn) { captureMessage('Request took multiple attempts', {extra: getErrorData()}); } @@ -254,7 +254,7 @@ class ajaxService extends AjaxService { if (retryErrorChecks.some(check => check(error.response)) && retryingMs <= maxRetryingMs) { await timeout(retryPeriods[attempts] || retryPeriods[retryPeriods.length - 1]); attempts += 1; - } else if (attempts > 0 && this.config.get('sentry_dsn')) { + } else if (attempts > 0 && this.config.sentry_dsn) { captureMessage('Request failed after multiple attempts', {extra: getErrorData()}); throw error; } else { diff --git a/ghost/admin/app/services/billing.js b/ghost/admin/app/services/billing.js index 20875e1a93..6e15996e54 100644 --- a/ghost/admin/app/services/billing.js +++ b/ghost/admin/app/services/billing.js @@ -19,7 +19,7 @@ export default class BillingService extends Service { init() { super.init(...arguments); - if (this.config.get('hostSettings.billing.url')) { + if (this.config.hostSettings?.billing?.url) { window.addEventListener('message', (event) => { if (event && event.data && event.data.route) { this.handleRouteChangeInIframe(event.data.route); @@ -46,7 +46,7 @@ export default class BillingService extends Service { // initiate getting owner user in the background this.getOwnerUser(); - let url = this.config.get('hostSettings.billing.url'); + let url = this.config.hostSettings?.billing?.url; if (window.location.hash && window.location.hash.includes(this.billingRouteRoot)) { let destinationRoute = window.location.hash.replace(this.billingRouteRoot, ''); diff --git a/ghost/admin/app/services/config.js b/ghost/admin/app/services/config.js index 208cf19ee1..d91ad25de0 100644 --- a/ghost/admin/app/services/config.js +++ b/ghost/admin/app/services/config.js @@ -1,26 +1,17 @@ -import Ember from 'ember'; import RSVP from 'rsvp'; import Service, {inject as service} from '@ember/service'; -import classic from 'ember-classic-decorator'; import timezoneData from '@tryghost/timezone-data'; -import {computed} from '@ember/object'; +import {TrackedObject} from 'tracked-built-ins'; +import {tracked} from '@glimmer/tracking'; -// ember-cli-shims doesn't export _ProxyMixin -const {_ProxyMixin} = Ember; - -@classic -export default class ConfigService extends Service.extend(_ProxyMixin) { +export default class ConfigService extends Service { @service ajax; @service ghostPaths; - @service session; - content = null; + @tracked content = new TrackedObject(); - init() { - super.init(...arguments); - this.content = {}; - } + availableTimezones = timezoneData; fetch() { let promises = []; @@ -34,48 +25,38 @@ export default class ConfigService extends Service.extend(_ProxyMixin) { return RSVP.all(promises); } - fetchUnauthenticated() { - let siteUrl = this.ghostPaths.url.api('site'); - return this.ajax.request(siteUrl).then(({site}) => { - // normalize url to non-trailing-slash - site.blogUrl = site.url.replace(/\/$/, ''); - site.blogTitle = site.title; - delete site.url; - delete site.title; + async fetchUnauthenticated() { + const siteUrl = this.ghostPaths.url.api('site'); + const {site} = await this.ajax.request(siteUrl); - Object.assign(this.content, site); - }).then(() => { - this.notifyPropertyChange('content'); - }); + // normalize url to non-trailing-slash + site.blogUrl = site.url.replace(/\/$/, ''); + site.blogTitle = site.title; + delete site.url; + delete site.title; + + Object.assign(this.content, site); + this._defineProperties(site); } - fetchAuthenticated() { - let configUrl = this.ghostPaths.url.api('config'); - return this.ajax.request(configUrl).then(({config}) => { - Object.assign(this.content, config); - }).then(() => { - this.notifyPropertyChange('content'); - }); + async fetchAuthenticated() { + const configUrl = this.ghostPaths.url.api('config'); + const {config} = await this.ajax.request(configUrl); + + Object.assign(this.content, config); + this._defineProperties(config); } - @computed - get availableTimezones() { - return RSVP.resolve(timezoneData); - } - - @computed('blogUrl') get blogDomain() { - let blogUrl = this.get('blogUrl'); - let blogDomain = blogUrl + const blogDomain = this.blogUrl .replace(/^https?:\/\//, '') .replace(/\/?$/, ''); return blogDomain; } - @computed('blogDomain') get emailDomain() { - let blogDomain = this.blogDomain || ''; + const blogDomain = this.blogDomain || ''; const domainExp = blogDomain.match(new RegExp('^([^/:?#]+)(?:[/:?#]|$)', 'i')); const domain = (domainExp && domainExp[1]) || ''; if (domain.startsWith('www.')) { @@ -85,10 +66,25 @@ export default class ConfigService extends Service.extend(_ProxyMixin) { } getSiteUrl(path) { - const siteUrl = new URL(this.get('blogUrl')); + const siteUrl = new URL(this.blogUrl); const subdir = siteUrl.pathname.endsWith('/') ? siteUrl.pathname : `${siteUrl.pathname}/`; const fullPath = `${subdir}${path.replace(/^\//, '')}`; return `${siteUrl.origin}${fullPath}`; } + + _defineProperties(obj) { + for (const name of Object.keys(obj)) { + if (!Object.prototype.hasOwnProperty.call(this, name)) { + Object.defineProperty(this, name, { + get() { + return this.content[name]; + }, + set(newValue) { + this.content[name] = newValue; + } + }); + } + } + } } diff --git a/ghost/admin/app/services/frontend.js b/ghost/admin/app/services/frontend.js index aac277161d..594c76eabe 100644 --- a/ghost/admin/app/services/frontend.js +++ b/ghost/admin/app/services/frontend.js @@ -15,7 +15,7 @@ export default class FrontendService extends Service { } getUrl(path) { - const siteUrl = new URL(this.config.get('blogUrl')); + const siteUrl = new URL(this.config.blogUrl); const subdir = siteUrl.pathname.endsWith('/') ? siteUrl.pathname : `${siteUrl.pathname}/`; const fullPath = `${subdir}${path.replace(/^\//, '')}`; diff --git a/ghost/admin/app/services/limit.js b/ghost/admin/app/services/limit.js index e495bd9b14..6db6933ff7 100644 --- a/ghost/admin/app/services/limit.js +++ b/ghost/admin/app/services/limit.js @@ -31,7 +31,7 @@ export default class LimitsService extends Service { constructor() { super(...arguments); - let limits = this.config.get('hostSettings.limits'); + let limits = this.config.hostSettings?.limits; this.limiter = new LimitService(); @@ -41,10 +41,10 @@ export default class LimitsService extends Service { let helpLink; - if (this.config.get('hostSettings.billing.enabled') - && this.config.get('hostSettings.billing.enabled') === true - && this.config.get('hostSettings.billing.url')) { - helpLink = this.config.get('hostSettings.billing.url'); + if (this.config.hostSettings?.billing?.enabled === true + && this.config.hostSettings?.billing?.url + ) { + helpLink = this.config.hostSettings.billing?.url; } else { helpLink = 'https://ghost.org/help/'; } diff --git a/ghost/admin/app/services/members-utils.js b/ghost/admin/app/services/members-utils.js index 97df368357..eabe4df7cf 100644 --- a/ghost/admin/app/services/members-utils.js +++ b/ghost/admin/app/services/members-utils.js @@ -22,7 +22,7 @@ export default class MembersUtilsService extends Service { * Note: always use paidMembersEnabled! Only use this getter for the Stripe Connection UI. */ get isStripeEnabled() { - const stripeDirect = this.config.get('stripeDirect'); + const stripeDirect = this.config.stripeDirect; const hasDirectKeys = !!this.settings.stripeSecretKey && !!this.settings.stripePublishableKey; const hasConnectKeys = !!this.settings.stripeConnectSecretKey && !!this.settings.stripeConnectPublishableKey; @@ -111,7 +111,7 @@ export default class MembersUtilsService extends Service { return t.visibility === 'public' && t.type === 'paid'; }).map(t => t.id); - const baseUrl = this.config.get('blogUrl'); + const baseUrl = this.config.blogUrl; const portalBase = '/#/portal/preview'; const settingsParam = new URLSearchParams(); const signupButtonText = this.settings.portalButtonSignupText || ''; @@ -177,7 +177,7 @@ export default class MembersUtilsService extends Service { tierId } = overrides; - const baseUrl = this.config.get('blogUrl'); + const baseUrl = this.config.blogUrl; const portalBase = '/#/portal/preview/offer'; const settingsParam = new URLSearchParams(); diff --git a/ghost/admin/app/services/notifications.js b/ghost/admin/app/services/notifications.js index e4700952d5..ee0622bbab 100644 --- a/ghost/admin/app/services/notifications.js +++ b/ghost/admin/app/services/notifications.js @@ -95,7 +95,7 @@ export default class NotificationsService extends Service { options = options || {}; if (!options.isApiError && (!options.type || options.type === 'error')) { - if (this.config.get('sentry_dsn')) { + if (this.config.sentry_dsn) { // message could be a htmlSafe object rather than a string const displayedMessage = message.string || message; @@ -188,7 +188,7 @@ export default class NotificationsService extends Service { msg = `${msg} ${resp.context}`; } - if (this.config.get('sentry_dsn')) { + if (this.config.sentry_dsn) { const reportedError = resp instanceof Error ? resp : msg; Sentry.captureException(reportedError, { diff --git a/ghost/admin/app/services/session.js b/ghost/admin/app/services/session.js index a62c560852..cc6f31df91 100644 --- a/ghost/admin/app/services/session.js +++ b/ghost/admin/app/services/session.js @@ -43,13 +43,13 @@ export default class SessionService extends ESASessionService { await this.frontend.loginIfNeeded(); // update Sentry with the full Ghost version which we only get after authentication - if (this.config.get('sentry_dsn')) { + if (this.config.sentry_dsn) { configureScope((scope) => { scope.addEventProcessor((event) => { return new Promise((resolve) => { resolve({ ...event, - release: `ghost@${this.config.get('version')}` + release: `ghost@${this.config.version}` }); }); }); diff --git a/ghost/admin/app/services/tenor.js b/ghost/admin/app/services/tenor.js index 186d0e7b6b..6e8f7267ea 100644 --- a/ghost/admin/app/services/tenor.js +++ b/ghost/admin/app/services/tenor.js @@ -25,11 +25,11 @@ export default class TenorService extends Service { _nextPos = null; get apiKey() { - return this.config.get('tenor.googleApiKey'); + return this.config.tenor.googleApiKey; } get contentfilter() { - return this.config.get('tenor.contentFilter') || 'off'; + return this.config.tenor.contentFilter || 'off'; } get isLoading() { diff --git a/ghost/admin/app/services/ui.js b/ghost/admin/app/services/ui.js index 92b5bfad82..9c17cb2931 100644 --- a/ghost/admin/app/services/ui.js +++ b/ghost/admin/app/services/ui.js @@ -144,7 +144,7 @@ export default class UiService extends Service { currentRoute = currentRoute.parent; } - let blogTitle = this.config.get('blogTitle'); + let blogTitle = this.config.blogTitle; if (!isEmpty(tokens)) { window.document.title = `${tokens.join(' - ')} - ${blogTitle}`; diff --git a/ghost/admin/app/utils/publish-options.js b/ghost/admin/app/utils/publish-options.js index 3a43fba62f..69f0933258 100644 --- a/ghost/admin/app/utils/publish-options.js +++ b/ghost/admin/app/utils/publish-options.js @@ -1,5 +1,5 @@ import moment from 'moment-timezone'; -import {action, get} from '@ember/object'; +import {action} from '@ember/object'; import {htmlSafe} from '@ember/template'; import {task} from 'ember-concurrency'; import {tracked} from '@glimmer/tracking'; @@ -131,7 +131,7 @@ export default class PublishOptions { get mailgunIsConfigured() { return this.settings.mailgunIsConfigured - || get(this.config, 'mailgunIsConfigured'); + || this.config.mailgunIsConfigured; } @action diff --git a/ghost/admin/app/utils/route.js b/ghost/admin/app/utils/route.js index 71b4176b8b..d24a91b32f 100644 --- a/ghost/admin/app/utils/route.js +++ b/ghost/admin/app/utils/route.js @@ -12,7 +12,7 @@ Route.reopen({ transition.abort(); this.upgradeStatus.requireUpgrade(); return false; - } else if (this.config.get('hostSettings.forceUpgrade')) { + } else if (this.config.hostSettings?.forceUpgrade) { // Do not prevent transitions to the BMA or to signout if (transition.to?.name === 'pro.index' || transition.to?.name === 'signout') { return true; diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js index a0e00b9312..5b8befd965 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-input.js @@ -123,7 +123,7 @@ export default class KoenigLinkInput extends Component { // prevent Enter from triggering in the editor and removing text event.preventDefault(); - let href = relativeToAbsolute(this._href, this.config.get('blogUrl')); + let href = relativeToAbsolute(this._href, this.config.blogUrl); this.set('_href', href); if (this.source === 'direct') { diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js index c0fe4e069e..40fdbe5088 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-link-toolbar.js @@ -169,7 +169,7 @@ export default class KoenigLinkToolbar extends Component { // on the configured blog url this._target = target; let href = target.getAttribute('href'); - let blogUrl = this.config.get('blogUrl'); + let blogUrl = this.config.blogUrl; this.set('url', relativeToAbsolute(href, blogUrl)); this.set('showToolbar', true); run.schedule('afterRender', this, function () { diff --git a/ghost/admin/lib/koenig-editor/addon/helpers/card-is-available.js b/ghost/admin/lib/koenig-editor/addon/helpers/card-is-available.js index aac6508e95..6fccade1c8 100644 --- a/ghost/admin/lib/koenig-editor/addon/helpers/card-is-available.js +++ b/ghost/admin/lib/koenig-editor/addon/helpers/card-is-available.js @@ -22,7 +22,7 @@ export default class CardIsAvailableHelper extends Helper { } if (card.developerExperiment) { - cardIsAvailable = cardIsAvailable && this.config.get('enableDeveloperExperiments'); + cardIsAvailable = cardIsAvailable && this.config.enableDeveloperExperiments; } if (postType && card.postType) { diff --git a/ghost/admin/tests/integration/services/config-test.js b/ghost/admin/tests/integration/services/config-test.js index f541049486..d8eac78282 100644 --- a/ghost/admin/tests/integration/services/config-test.js +++ b/ghost/admin/tests/integration/services/config-test.js @@ -18,17 +18,15 @@ describe('Integration: Service: config', function () { server.shutdown(); }); - it('returns a list of timezones in the expected format', function (done) { - let service = this.owner.lookup('service:config'); + it('returns a list of timezones in the expected format', function () { + const service = this.owner.lookup('service:config'); + const timezones = service.availableTimezones; - service.get('availableTimezones').then(function (timezones) { - expect(timezones.length).to.equal(66); - expect(timezones[0].name).to.equal('Pacific/Pago_Pago'); - expect(timezones[0].label).to.equal('(GMT -11:00) Midway Island, Samoa'); - expect(timezones[1].name).to.equal('Pacific/Honolulu'); - expect(timezones[1].label).to.equal('(GMT -10:00) Hawaii'); - done(); - }); + expect(timezones.length).to.equal(66); + expect(timezones[0].name).to.equal('Pacific/Pago_Pago'); + expect(timezones[0].label).to.equal('(GMT -11:00) Midway Island, Samoa'); + expect(timezones[1].name).to.equal('Pacific/Honolulu'); + expect(timezones[1].label).to.equal('(GMT -10:00) Hawaii'); }); it('normalizes blogUrl to non-trailing-slash', function (done) {