751f8552b2
In order to continue supporting the legacy ACL system, we replace the 500 error from a non-existent `self` endpoint with a response of a `null` `AccessorID` - which makes sense (a null AccessorID means old API) We then redirect the user to the old ACL pages which then gives a 403 if their token was wrong which then redirects them back to the login page. Due to the multiple redirects and not wanting to test the validity of the token before redirecting (thus calling the same API endpoint twice), it is not straightforwards to turn the 'faked' response from the `self` endpoint into an error (flash messages are 'lost' through multiple redirects). In order to make this a slightly better experience, you can now return a `false` during execution of an action requiring success/failure feedback, this essentially skips the notification, so if the action is 'successful' but you don't want to show the notification, you can. This resolves showing a successful notification when the `self` endpoint response is faked. The last part of the puzzle is to make sure that the global 403 catching error in the application Route also produces an erroneous notification. Please note this can only happen with a ui client using the new ACL system when communicating with a cluster using the old ACL system, and only when you enter the wrong token. Lastly, further acceptance tests have been added around this This commit also adds functionality to avoid any possible double notification messages, to avoid UI overlapping
67 lines
2 KiB
JavaScript
67 lines
2 KiB
JavaScript
import Service, { inject as service } from '@ember/service';
|
|
import { get, set } from '@ember/object';
|
|
import callableType from 'consul-ui/utils/callable-type';
|
|
|
|
const TYPE_SUCCESS = 'success';
|
|
const TYPE_ERROR = 'error';
|
|
const defaultStatus = function(type, obj) {
|
|
return type;
|
|
};
|
|
const notificationDefaults = function() {
|
|
return {
|
|
timeout: 6000,
|
|
extendedTimeout: 300,
|
|
};
|
|
};
|
|
export default Service.extend({
|
|
notify: service('flashMessages'),
|
|
logger: service('logger'),
|
|
execute: function(handle, action, status = defaultStatus, controller) {
|
|
set(controller, 'isLoading', true);
|
|
const getAction = callableType(action);
|
|
const getStatus = callableType(status);
|
|
const notify = get(this, 'notify');
|
|
return (
|
|
handle()
|
|
//TODO: pass this through to getAction..
|
|
.then(item => {
|
|
// returning exactly `false` for a feedback action means even though
|
|
// its successful, please skip this notification and don't display it
|
|
if (item !== false) {
|
|
notify.clearMessages();
|
|
// TODO right now the majority of `item` is a Transition
|
|
// but you can resolve an object
|
|
notify.add({
|
|
...notificationDefaults(),
|
|
type: getStatus(TYPE_SUCCESS),
|
|
// here..
|
|
action: getAction(),
|
|
item: item,
|
|
});
|
|
}
|
|
})
|
|
.catch(e => {
|
|
notify.clearMessages();
|
|
get(this, 'logger').execute(e);
|
|
if (e.name === 'TransitionAborted') {
|
|
notify.add({
|
|
...notificationDefaults(),
|
|
type: getStatus(TYPE_SUCCESS),
|
|
// and here
|
|
action: getAction(),
|
|
});
|
|
} else {
|
|
notify.add({
|
|
...notificationDefaults(),
|
|
type: getStatus(TYPE_ERROR, e),
|
|
action: getAction(),
|
|
});
|
|
}
|
|
})
|
|
.finally(function() {
|
|
set(controller, 'isLoading', false);
|
|
})
|
|
);
|
|
},
|
|
});
|