diff --git a/ui/app/controllers/vault/cluster/access/methods.js b/ui/app/controllers/vault/cluster/access/methods.js index d73bb3fe85..43cc99e378 100644 --- a/ui/app/controllers/vault/cluster/access/methods.js +++ b/ui/app/controllers/vault/cluster/access/methods.js @@ -12,6 +12,8 @@ import sortObjects from 'vault/utils/sort-objects'; export default class VaultClusterAccessMethodsController extends Controller { @service flashMessages; + @service api; + @service router; @tracked authMethodOptions = []; @tracked selectedAuthType = null; @@ -78,12 +80,12 @@ export default class VaultClusterAccessMethodsController extends Controller { *disableMethod(method) { const { type, path } = method; try { - yield method.destroyRecord(); + yield this.api.sys.authDisableMethod(path); this.flashMessages.success(`The ${type} Auth Method at ${path} has been disabled.`); + this.router.transitionTo('vault.cluster.access.methods'); } catch (err) { - this.flashMessages.danger( - `There was an error disabling Auth Method at ${path}: ${err.errors.join(' ')}.` - ); + const { message } = yield this.api.parseError(err); + this.flashMessages.danger(`There was an error disabling Auth Method at ${path}: ${message}.`); } finally { this.methodToDisable = null; } diff --git a/ui/app/templates/vault/cluster/access/methods.hbs b/ui/app/templates/vault/cluster/access/methods.hbs index f68da22694..3c2f1a37e9 100644 --- a/ui/app/templates/vault/cluster/access/methods.hbs +++ b/ui/app/templates/vault/cluster/access/methods.hbs @@ -102,7 +102,11 @@ (has-capability this.model.capabilities "delete" pathKey="authMethodDelete" params=method.id) ) }} -