mirror of
https://github.com/TryGhost/Ghost-Admin.git
synced 2023-12-14 02:33:04 +01:00
e4c0aaf7b9
refs https://github.com/TryGhost/Ghost/issues/6949 Handle version mismatch errors by: - displaying an alert asking the user to copy any data and refresh - disabling navigation so that unsaved data is not accidentally lost Detailed changes: - add `error` action to application route for global route-based error handling - remove 404-handler mixin, move logic into app route error handler - update `.catch` in validation-engine so that promises are rejected with the original error objects - add `VersionMismatchError` and `isVersionMismatchError` to ajax service - add `upgrade-status` service - has a method to trigger the alert and toggle the "upgrade required" mode - is injected into all routes by default so that it can be checked before transitioning - add `Route` override - updates the `willTransition` hook to check the `upgrade-status` service and abort the transition if we're in "upgrade required" mode - update notifications `showAPIError` method to handle version mismatch errors - update any areas where we were catching ajax errors manually so that the version mismatch error handling is obeyed - fix redirect tests in editor acceptance test - fix mirage's handling of 404s for unknown posts in get post requests - adjust alert z-index to to appear above modal backgrounds
69 lines
2.5 KiB
JavaScript
69 lines
2.5 KiB
JavaScript
import $ from 'jquery';
|
|
import computed from 'ember-computed';
|
|
import injectService from 'ember-service/inject';
|
|
import {htmlSafe} from 'ember-string';
|
|
import ModalComponent from 'ghost-admin/components/modals/base';
|
|
import ValidationEngine from 'ghost-admin/mixins/validation-engine';
|
|
import {isVersionMismatchError} from 'ghost-admin/services/ajax';
|
|
|
|
export default ModalComponent.extend(ValidationEngine, {
|
|
validationType: 'signin',
|
|
|
|
submitting: false,
|
|
authenticationError: null,
|
|
|
|
notifications: injectService(),
|
|
session: injectService(),
|
|
|
|
identification: computed('session.user.email', function () {
|
|
return this.get('session.user.email');
|
|
}),
|
|
|
|
_authenticate() {
|
|
let session = this.get('session');
|
|
let authStrategy = 'authenticator:oauth2';
|
|
let identification = this.get('identification');
|
|
let password = this.get('password');
|
|
|
|
session.set('skipAuthSuccessHandler', true);
|
|
|
|
this.toggleProperty('submitting');
|
|
|
|
return session.authenticate(authStrategy, identification, password).finally(() => {
|
|
this.toggleProperty('submitting');
|
|
session.set('skipAuthSuccessHandler', undefined);
|
|
});
|
|
},
|
|
|
|
actions: {
|
|
confirm() {
|
|
// Manually trigger events for input fields, ensuring legacy compatibility with
|
|
// browsers and password managers that don't send proper events on autofill
|
|
$('#login').find('input').trigger('change');
|
|
|
|
this.set('authenticationError', null);
|
|
|
|
this.validate({property: 'signin'}).then(() => {
|
|
this._authenticate().then(() => {
|
|
this.get('notifications').closeAlerts('post.save');
|
|
this.send('closeModal');
|
|
}).catch((error) => {
|
|
if (error && error.errors) {
|
|
error.errors.forEach((err) => {
|
|
if (isVersionMismatchError(err)) {
|
|
return this.get('notifications').showAPIError(error);
|
|
}
|
|
err.message = htmlSafe(err.message);
|
|
});
|
|
|
|
this.get('errors').add('password', 'Incorrect password');
|
|
this.get('hasValidated').pushObject('password');
|
|
this.set('authenticationError', error.errors[0].message);
|
|
}
|
|
});
|
|
}, () => {
|
|
this.get('hasValidated').pushObject('password');
|
|
});
|
|
}
|
|
}
|
|
});
|