mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-21 01:41:46 +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
42 lines
1.3 KiB
JavaScript
42 lines
1.3 KiB
JavaScript
import Authenticator from 'ember-simple-auth/authenticators/base';
|
|
import RSVP from 'rsvp';
|
|
import {computed} from '@ember/object';
|
|
import {inject as service} from '@ember/service';
|
|
|
|
export default Authenticator.extend({
|
|
ajax: service(),
|
|
ghostPaths: service(),
|
|
|
|
sessionEndpoint: computed('ghostPaths.apiRoot', function () {
|
|
return `${this.ghostPaths.apiRoot}/session`;
|
|
}),
|
|
|
|
restore: function () {
|
|
return RSVP.resolve();
|
|
},
|
|
|
|
authenticate(identification, password) {
|
|
const data = {username: identification, password};
|
|
const options = {
|
|
data,
|
|
contentType: 'application/json;charset=utf-8',
|
|
// ember-ajax will try and parse the response as JSON if not explicitly set
|
|
dataType: 'text'
|
|
};
|
|
|
|
return this.ajax.post(this.sessionEndpoint, options);
|
|
},
|
|
|
|
invalidate() {
|
|
// if we're invalidating because of a 401 we can end up in an infinite
|
|
// loop if we then try to perform a DELETE /session/ request
|
|
// TODO: find a more elegant way to handle this
|
|
if (this.ajax.skipSessionDeletion) {
|
|
this.ajax.skipSessionDeletion = false;
|
|
return RSVP.resolve();
|
|
}
|
|
|
|
return this.ajax.del(this.sessionEndpoint);
|
|
}
|
|
});
|