9bdb25d184
refs https://github.com/TryGhost/Team/issues/2110 - dynamically defined properties on the config service did not have autotracking set up properly if they were accessed in any way before the property was defined, this caused problems in a number of areas because we have both "unauthed" and "authed" sets of config and when not logged in we had parts of the app checking for authed config properties that don't exist until after sign-in and subsequent config re-fetch - renamed `config` service to `configManager` and updated to only contain methods for fetching config data - added a `config` instance initializer that sets up a `TrackedObject` instance with some custom properties/methods and registers it on `config:main` - uses application instance initializer rather than a standard initializer because standard initializers are only called once when setting up the test suite so we'd end up with config leaking across tests - added an `@inject` decorator that when used takes the property name and injects whatever is registered at `${propertyName}:main`, this allows us to use dependency injection for any object rather than just services or controllers - using `application.inject()` in the initializer was initially used but that only works for objects that extend from `EmberObject`, the injections weren't available in native-class glimmer components so this decorator keeps the injection syntax consistent - swapped all `@service config` uses to `@inject config`
32 lines
1.0 KiB
JavaScript
32 lines
1.0 KiB
JavaScript
import Route from '@ember/routing/route';
|
|
import {inject} from 'ghost-admin/decorators/inject';
|
|
import {inject as service} from '@ember/service';
|
|
|
|
Route.reopen({
|
|
billing: service(),
|
|
router: service(),
|
|
config: inject(),
|
|
|
|
actions: {
|
|
willTransition(transition) {
|
|
if (this.get('upgradeStatus.isRequired')) {
|
|
transition.abort();
|
|
this.upgradeStatus.requireUpgrade();
|
|
return false;
|
|
} 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;
|
|
}
|
|
|
|
transition.abort();
|
|
// Catch and redirect every route in a force upgrade state
|
|
this.billing.openBillingWindow(this.router.currentURL, '/pro');
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
});
|