Skip to content

Commit

Permalink
ui: [BUGFIX] Ensure we use the ns query param name when requesting pe…
Browse files Browse the repository at this point in the history
…rmissions (#10608)

Previously when namespaces were enabled, we weren't requesting permission for the actively selected namespace, and instead always checking the permissions for the default namespace.

This commit ensures we request permissions for the actively selected namespace.
  • Loading branch information
johncowen authored Jul 15, 2021
1 parent 4a92f2d commit 0762da3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .changelog/10608.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: **(Enterprise only)** Ensure permissions are checked based on the actively selected namespace
```
2 changes: 1 addition & 1 deletion ui/packages/consul-ui/app/adapters/permission.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default class PermissionAdapter extends Adapter {
requestForAuthorize(request, { dc, ns, resources = [], index }) {
// the authorize endpoint is slightly different to all others in that it
// ignores an ns parameter, but accepts a Namespace property on each
// resource. Here we hide this different from the rest of the app as
// resource. Here we hide this difference from the rest of the app as
// currently we never need to ask for permissions/resources for multiple
// different namespaces in one call so here we use the ns param and add
// this to the resources instead of passing through on the queryParameter
Expand Down
2 changes: 1 addition & 1 deletion ui/packages/consul-ui/app/routes/dc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default class DcRoute extends Route {
// When disabled nspaces is [], so nspace is undefined
const permissions = await this.permissionsRepo.findAll({
dc: params.dc,
nspace: get(nspace || {}, 'Name'),
ns: get(nspace || {}, 'Name'),
});
// the model here is actually required for the entire application
// but we need to wait until we are in this route so we know what the dc
Expand Down
2 changes: 1 addition & 1 deletion ui/packages/consul-ui/app/routes/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class SettingsRoute extends Route {
typeof app.permissions === 'undefined'
? await this.permissionsRepo.findAll({
dc: dc.Name,
nspace: nspace.Name,
ns: nspace.Name,
})
: app.permissions;

Expand Down

0 comments on commit 0762da3

Please sign in to comment.