mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-02 08:13:34 +03:00
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`
79 lines
2.7 KiB
JavaScript
79 lines
2.7 KiB
JavaScript
import ModalComponent from 'ghost-admin/components/modal-base';
|
|
import ValidationEngine from 'ghost-admin/mixins/validation-engine';
|
|
import {htmlSafe} from '@ember/template';
|
|
import {inject} from 'ghost-admin/decorators/inject';
|
|
import {isVersionMismatchError} from 'ghost-admin/services/ajax';
|
|
import {reads} from '@ember/object/computed';
|
|
import {inject as service} from '@ember/service';
|
|
import {task} from 'ember-concurrency';
|
|
|
|
export default ModalComponent.extend(ValidationEngine, {
|
|
notifications: service(),
|
|
session: service(),
|
|
|
|
validationType: 'signin',
|
|
|
|
authenticationError: null,
|
|
|
|
config: inject(),
|
|
|
|
identification: reads('session.user.email'),
|
|
|
|
actions: {
|
|
confirm() {
|
|
this.reauthenticate.perform();
|
|
}
|
|
},
|
|
|
|
_authenticate() {
|
|
let session = this.session;
|
|
let authStrategy = 'authenticator:cookie';
|
|
let identification = this.identification;
|
|
let password = this.password;
|
|
|
|
session.set('skipAuthSuccessHandler', true);
|
|
|
|
this.toggleProperty('submitting');
|
|
|
|
return session.authenticate(authStrategy, identification, password).finally(() => {
|
|
this.toggleProperty('submitting');
|
|
session.set('skipAuthSuccessHandler', undefined);
|
|
});
|
|
},
|
|
|
|
_passwordConfirm() {
|
|
// Manually trigger events for input fields, ensuring legacy compatibility with
|
|
// browsers and password managers that don't send proper events on autofill
|
|
const inputs = document.querySelectorAll('#login input');
|
|
inputs.forEach(input => input.dispatchEvent(new Event('change')));
|
|
|
|
this.set('authenticationError', null);
|
|
|
|
return this.validate({property: 'signin'}).then(() => this._authenticate().then(() => {
|
|
this.notifications.closeAlerts();
|
|
this.send('closeModal');
|
|
return true;
|
|
}).catch((error) => {
|
|
if (error && error.payload && error.payload.errors) {
|
|
error.payload.errors.forEach((err) => {
|
|
if (isVersionMismatchError(err)) {
|
|
return this.notifications.showAPIError(error);
|
|
}
|
|
err.message = htmlSafe(err.context || err.message);
|
|
});
|
|
|
|
this.errors.add('password', 'Incorrect password');
|
|
this.hasValidated.pushObject('password');
|
|
this.set('authenticationError', error.payload.errors[0].message);
|
|
}
|
|
}), () => {
|
|
this.hasValidated.pushObject('password');
|
|
return false;
|
|
});
|
|
},
|
|
|
|
reauthenticate: task(function* () {
|
|
return yield this._passwordConfirm();
|
|
}).drop()
|
|
});
|