fde7ca365a
* ui: Acceptance test improvements to prepare for more NS tests * ui: Namespace acceptance testing (#7005) * Update api-double and consul-api-double for http.body * Adds places where we missed passing the nspace through * Hardcode nspace CRUD to use the default nspace for policies and roles * Alter test helpers to allow us to control nspaces from the outside * Amends to allow tests to account for namespace, move ns from queryParam 1. We decided to move how we pass the namespace value through to the backend when performing write actions (create, update). Previoulsy we were using the queryParam although using the post body is the preferred method to send the Namespace details through to the backend. 2. Other various amends to take into account testing across multiple namespaced scenarios * Enable nspace testing by default * Remove last few occurances of old style http assertions We had informally 'deprecated' our old style of http assertions that relied on the order of http calls (even though that order was not important for the assertion). Following on from our namespace work we removed the majority of the old occrances of these old style assertions. This commit removes the remaining few, and also then cleans up the assertions/http.js file to only include the ones we are using. This reduces our available step count further and prevents any confusion over the usage of the old types and the new types. * ui: Namespace CRUD acceptance tests (#7016) * Upgrade consul-api-double * Add all the things required for testing: 1. edit and index page objects 2. enable CONSUL_NSPACE_COUNT cookie setting 3. enable mutating HTTP response bodies based on URL * Add acceptance test for nspace edit/delete/list and searching
53 lines
2.1 KiB
JavaScript
53 lines
2.1 KiB
JavaScript
import Route from '@ember/routing/route';
|
|
import { get } from '@ember/object';
|
|
import { env } from 'consul-ui/env';
|
|
import { inject as service } from '@ember/service';
|
|
import WithBlockingActions from 'consul-ui/mixins/with-blocking-actions';
|
|
export default Route.extend(WithBlockingActions, {
|
|
router: service('router'),
|
|
settings: service('settings'),
|
|
feedback: service('feedback'),
|
|
repo: service('repository/token'),
|
|
actions: {
|
|
authorize: function(secret, nspace) {
|
|
const dc = this.modelFor('dc').dc.Name;
|
|
return this.feedback.execute(() => {
|
|
return this.repo.self(secret, dc).then(item => {
|
|
return this.settings
|
|
.persist({
|
|
token: {
|
|
Namespace: get(item, 'Namespace'),
|
|
AccessorID: get(item, 'AccessorID'),
|
|
SecretID: secret,
|
|
},
|
|
})
|
|
.then(item => {
|
|
// a null AccessorID means we are in legacy mode
|
|
// take the user to the legacy acls
|
|
// otherwise just refresh the page
|
|
if (get(item, 'token.AccessorID') === null) {
|
|
// returning false for a feedback action means even though
|
|
// its successful, please skip this notification and don't display it
|
|
return this.transitionTo('dc.acls').then(function() {
|
|
return false;
|
|
});
|
|
} else {
|
|
// TODO: Ideally we wouldn't need to use env() at a route level
|
|
// transitionTo should probably remove it instead if NSPACES aren't enabled
|
|
if (env('CONSUL_NSPACES_ENABLED') && get(item, 'token.Namespace') !== nspace) {
|
|
let routeName = this.router.currentRouteName;
|
|
if (!routeName.startsWith('nspace')) {
|
|
routeName = `nspace.${routeName}`;
|
|
}
|
|
return this.transitionTo(`${routeName}`, `~${get(item, 'token.Namespace')}`, dc);
|
|
} else {
|
|
this.refresh();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
}, 'authorize');
|
|
},
|
|
},
|
|
});
|