From 1646132db326a6ba63133e6abb484b2eced21cb3 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 30 Sep 2021 11:17:20 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20apply=20set-password=20a?= =?UTF-8?q?bility=20to=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accounts/account/-navigation.hbs | 12 ++++++---- .../acceptance/accounts/set-password-test.js | 23 ++++++++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs index da08d1834..12ca372ce 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs @@ -5,10 +5,12 @@ {{t 'titles.details'}} {{#if @model.isPassword}} - - {{t 'actions.set-password'}} - + {{#if (can 'setPassword account' @model)}} + + {{t 'actions.set-password'}} + + {{/if}} {{/if}} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/accounts/set-password-test.js b/ui/admin/tests/acceptance/accounts/set-password-test.js index 677e9bd7c..89f9ce3e7 100644 --- a/ui/admin/tests/acceptance/accounts/set-password-test.js +++ b/ui/admin/tests/acceptance/accounts/set-password-test.js @@ -49,7 +49,8 @@ module('Acceptance | accounts | set password', function (hooks) { urls.authMethods = `${urls.orgScope}/auth-methods`; urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; urls.accounts = `${urls.authMethod}/accounts`; - urls.setPassword = `${urls.accounts}/${instances.account.id}/set-password`; + urls.account = `${urls.accounts}/${instances.account.id}`; + urls.setPassword = `${urls.account}/set-password`; }); test('visiting account set password', async function (assert) { @@ -59,6 +60,26 @@ module('Acceptance | accounts | set password', function (hooks) { assert.equal(currentURL(), urls.setPassword); }); + test('can navigate to route with proper authorization', async function (assert) { + assert.expect(1); + await visit(urls.account); + assert.ok( + find(`.rose-layout-page-navigation [href="${urls.setPassword}"]`) + ); + }); + + test('cannot navigate to route without proper authorization', async function (assert) { + assert.expect(1); + const authorized_actions = instances.account.authorized_actions.filter( + (item) => item !== 'set-password' + ); + instances.account.update({ authorized_actions }); + await visit(urls.account); + assert.notOk( + find(`.rose-layout-page-navigation [href="${urls.setPassword}"]`) + ); + }); + test('can set a new password for account', async function (assert) { assert.expect(1); this.server.post(