Skip to content

Commit

Permalink
clear namespaces on logout and properly render nested namespaces in t…
Browse files Browse the repository at this point in the history
…he namepace picker (#7186)

* reset namespace cache when a user logs out

* fix issue where if you log in to a namespace with an initial /, nested namespaces would not show up in the navigation

* set an empty list of namespaces instead of ignoring error

* add tests for namespace bugs

* use this consistently in template
  • Loading branch information
meirish committed Aug 5, 2019
1 parent 173fdb6 commit 872fbf3
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 14 deletions.
1 change: 1 addition & 0 deletions ui/app/components/namespace-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export default Component.extend({
// gets set as 'lastMenuLeaves' in the ember concurrency task above
menuLeaves: computed('namespacePath', 'namespaceTree', function() {
let ns = this.get('namespacePath');
ns = ns.replace(/^\//, '');
let leaves = ancestorKeysForKey(ns);
leaves.push(ns);
leaves = this.maybeAddRoot(leaves);
Expand Down
14 changes: 8 additions & 6 deletions ui/app/routes/vault/cluster/logout.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@ export default Route.extend(ModelBoundaryRoute, {
flashMessages: service(),
console: service(),
permissions: service(),
namespaceService: service('namespace'),

modelTypes: computed(function() {
return ['secret', 'secret-engine'];
}),

beforeModel() {
this.get('auth').deleteCurrentToken();
this.get('controlGroup').deleteTokens();
this.get('console').set('isOpen', false);
this.get('console').clearLog(true);
this.auth.deleteCurrentToken();
this.controlGroup.deleteTokens();
this.namespaceService.reset();
this.console.set('isOpen', false);
this.console.clearLog(true);
this.clearModelCache();
this.replaceWith('vault.cluster');
this.get('flashMessages').clearMessages();
this.get('permissions').reset();
this.flashMessages.clearMessages();
this.permissions.reset();
},
});
7 changes: 6 additions & 1 deletion ui/app/services/namespace.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ export default Service.extend({
namespace: userRoot,
},
});
let keys = ns.data.keys || [];
this.set(
'accessibleNamespaces',
ns.data.keys.map(n => {
keys.map(n => {
let fullNS = n;
// if the user's root isn't '', then we need to construct
// the paths so they connect to the user root to the list
Expand All @@ -51,4 +52,8 @@ export default Service.extend({
//do nothing here
}
}).drop(),

reset() {
this.set('accessibleNamespaces', null);
},
});
12 changes: 7 additions & 5 deletions ui/app/templates/components/namespace-link.hbs
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{{#link-to "vault.cluster.secrets" (query-params namespace=normalizedNamespace)
class=(concat "is-block " class)
}}
<LinkTo
@params={{array "vault.cluster.secrets" (query-params namespace=this.normalizedNamespace)}}
class={{concat "is-block " class}}
data-test-namespace-link={{this.normalizedNamespace}}
>
{{#if (has-block)}}
{{yield}}
{{else}}
<div class="level is-mobile">
<span class="level-left">{{namespaceDisplay}}</span>
<span class="level-left">{{this.namespaceDisplay}}</span>
<span class="level-right">
<button type="button" class="button is-ghost icon">
<Chevron @isButton={{true}} class="has-text-grey" />
</button>
</span>
</div>
{{/if}}
{{/link-to}}
</LinkTo>
5 changes: 3 additions & 2 deletions ui/app/templates/components/namespace-picker.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<D.trigger
@tagName="button"
@class="button is-transparent namespace-picker-trigger has-current-color"
data-test-namespace-toggle
>
{{yield}}
{{#if namespaceDisplay}}
Expand Down Expand Up @@ -44,7 +45,7 @@
<header class="current-namespace">
<h5 class="list-header">Current namespace</h5>
<div class="level is-mobile namespace-link">
<span class="level-left">{{if namespacePath (concat namespacePath "/") "root"}}</span>
<span class="level-left" data-test-current-namespace>{{if namespacePath (concat namespacePath "/") "root"}}</span>
<span class="level-right">
<Icon @glyph="check-circle-outline" class="has-text-success" />
</span>
Expand All @@ -65,7 +66,7 @@
{{if (and isAdding (eq leaf changedLeaf)) "leaf-panel-adding"}}
{{if (and (not isAdding) (eq leaf changedLeaf)) "leaf-panel-exiting"}}
">{{~#each-in (get namespaceTree leaf) as |leafName|}}
<NamespaceLink @targetNamespace={{concat leaf "/" leafName}} @class="namespace-link" @showLastSegment={{true}} />
<NamespaceLink @targetNamespace={{concat leaf "/" leafName}} @class="namespace-link" @showLastSegment={{true}} />
{{/each-in~}}</div>
{{/each}}
</div>
Expand Down
63 changes: 63 additions & 0 deletions ui/tests/acceptance/enterprise-namespaces-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { click, currentRouteName, currentURL, visit } from '@ember/test-helpers';
import { module, test } from 'qunit';
import { setupApplicationTest } from 'ember-qunit';
import { create } from 'ember-cli-page-object';

import consoleClass from 'vault/tests/pages/components/console/ui-panel';
import authPage from 'vault/tests/pages/auth';
import logout from 'vault/tests/pages/logout';

const shell = create(consoleClass);

const createNS = async name => {
await shell.runCommands(`write sys/namespaces/${name} -force`);
};

const switchToNS = async name => {
await click('[data-test-namespace-toggle]');
await click(`[data-test-namespace-link="${name}"]`);
await click('[data-test-namespace-toggle]');
};

module('Acceptance | Enterprise | namespaces', function(hooks) {
setupApplicationTest(hooks);

hooks.beforeEach(function() {
return authPage.login();
});

test('it clears namespaces when you log out', async function(assert) {
let ns = 'foo';
await createNS(ns);
await shell.runCommands(`write -field=client_token auth/token/create policies=default`);
let token = shell.lastLogOutput;
await logout.visit();
await authPage.login(token);
assert.dom('[data-test-namespace-toggle]').doesNotExist('does not show the namespace picker');
await logout.visit();
});

test('it shows nested namespaces if you log in with a namspace starting with a /', async function(assert) {
let nses = ['beep', 'boop', 'bop'];
for (let [i, ns] of nses.entries()) {
await createNS(ns);
// this is usually triggered when creating a ns in the form, here we'll trigger a reload of the
// namespaces manually
await this.owner.lookup('service:namespace').findNamespacesForUser.perform();
if (i === nses.length - 1) {
break;
}
// the namespace path will include all of the namespaces up to this point
let targetNamespace = nses.slice(0, i + 1).join('/');
await switchToNS(targetNamespace);
}
await logout.visit();
await authPage.visit({ with: 'token', namespace: '/beep/boop' });
await authPage.tokenInput('root').submit();
await click('[data-test-namespace-toggle]');
assert.dom('[data-test-current-namespace]').hasText('/beep/boop/', 'current namespace begins with a /');
assert
.dom('[data-test-namespace-link="beep/boop/bop"]')
.exists('renders the link to the nested namespace');
});
});

0 comments on commit 872fbf3

Please sign in to comment.