mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-29 07:09:48 +03:00
c646e78fff
no issue Having `session.user` return a promise made dealing with it in components difficult because you always had to remember it returned a promise rather than a model and had to handle the async behaviour. It also meant that you couldn't use any current user properties directly inside getters which made refactors to Glimmer/Octane idioms harder to reason about. `session.user` was a cached computed property so it really made no sense for it to be a promise - it was loaded on first access and then always returned instantly but with a fulfilled promise rather than the underlying model. Refactoring to a synchronous property that is loaded as part of the authentication flows (we load the current user to check that we're logged in - we may as well make use of that!) means one less thing to be aware of/remember and provides a nicer migration process to Glimmer components. As part of the refactor, the auth flows and pre-load of required data across other services was also simplified to make it easier to find and follow. - refactored app setup and `session.user` - added `session.populateUser()` that fetches a user model from the current user endpoint and sets it on `session.user` - removed knowledge of app setup from the `cookie` authenticator and moved it into = `session.postAuthPreparation()`, this means we have the same post-authentication setup no matter which authenticator is used so we have more consistent behaviour in tests which don't use the `cookie` authenticator - switched `session` service to native class syntax to get the expected `super()` behaviour - updated `handleAuthentication()` so it populate's `session.user` and performs post-auth setup before transitioning (handles sign-in after app load) - updated `application` route to remove duplicated knowledge of app preload behaviour that now lives in `session.postAuthPreparation()` (handles already-authed app load) - removed out-of-date attempt at pre-loading data from setup controller as that's now handled automatically via `session.handleAuthentication` - updated app code to not treat `session.user` as a promise - predominant usage was router `beforeModel` hooks that transitioned users without valid permissions, this sets us up for an easier removal of the `current-user-settings` mixin in the future
74 lines
2.6 KiB
JavaScript
74 lines
2.6 KiB
JavaScript
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
|
|
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
|
|
import {inject as service} from '@ember/service';
|
|
|
|
export default AuthenticatedRoute.extend(CurrentUserSettings, {
|
|
router: service(),
|
|
|
|
init() {
|
|
this._super(...arguments);
|
|
this.router.on('routeWillChange', (transition) => {
|
|
this.showUnsavedChangesModal(transition);
|
|
if (this.controller) {
|
|
this.controller.set('selectedApiKey', null);
|
|
this.controller.set('isApiKeyRegenerated', false);
|
|
}
|
|
});
|
|
},
|
|
|
|
beforeModel() {
|
|
this._super(...arguments);
|
|
this.transitionAuthor(this.session.user);
|
|
this.transitionEditor(this.session.user);
|
|
},
|
|
|
|
model(params, transition) {
|
|
// use the integrations controller to fetch all integrations and pick
|
|
// out the one we want. Allows navigation back to integrations screen
|
|
// without a loading state
|
|
return this
|
|
.controllerFor('integrations')
|
|
.integrationModelHook('id', params.integration_id, this, transition);
|
|
},
|
|
|
|
deactivate() {
|
|
this._super(...arguments);
|
|
this.controller.set('leaveScreenTransition', null);
|
|
this.controller.set('showUnsavedChangesModal', false);
|
|
},
|
|
|
|
actions: {
|
|
save() {
|
|
this.controller.send('save');
|
|
}
|
|
},
|
|
|
|
showUnsavedChangesModal(transition) {
|
|
if (transition.from && transition.from.name.match(/^settings\.integration\./) && transition.targetName) {
|
|
let {controller} = this;
|
|
|
|
// check to see if we're navigating away from the custom integration
|
|
// route - we want to allow editing webhooks without showing the
|
|
// "unsaved changes" confirmation modal
|
|
let isExternalRoute =
|
|
// allow sub-routes of integration
|
|
!(transition.targetName || '').match(/^integration\./)
|
|
// do not allow changes in integration
|
|
// .to will be the index, so use .to.parent to get the route with the params
|
|
|| transition.to.parent.params.integration_id !== controller.integration.id;
|
|
|
|
if (isExternalRoute && !controller.integration.isDeleted && controller.integration.hasDirtyAttributes) {
|
|
transition.abort();
|
|
controller.send('toggleUnsavedChangesModal', transition);
|
|
return;
|
|
}
|
|
}
|
|
},
|
|
|
|
buildRouteInfoMetadata() {
|
|
return {
|
|
titleToken: 'Settings - Integrations'
|
|
};
|
|
}
|
|
});
|