From cfa6c42506ff993c122e70ed33cbfe9bdca16bb0 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 29 Sep 2021 17:47:48 -0400 Subject: [PATCH 1/3] feature: add account set-password ability --- addons/api/addon/abilities/account.js | 15 +++++++++++++++ addons/api/addon/abilities/target.js | 2 +- addons/api/app/abilities/account.js | 1 + addons/api/mirage/factories/account.js | 1 + .../api/tests/unit/abilities/account-test-.js | 17 +++++++++++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 addons/api/addon/abilities/account.js create mode 100644 addons/api/app/abilities/account.js create mode 100644 addons/api/tests/unit/abilities/account-test-.js diff --git a/addons/api/addon/abilities/account.js b/addons/api/addon/abilities/account.js new file mode 100644 index 000000000..147f73b9f --- /dev/null +++ b/addons/api/addon/abilities/account.js @@ -0,0 +1,15 @@ +import ModelAbility from './model'; + +/** + * Provides abilities for accounts. + */ +export default class AccountAbility extends ModelAbility { + // =permissions + + /** + * @type {boolean} + */ + get canSetPassword() { + return this.hasAuthorizedAction('set-password'); + } +} diff --git a/addons/api/addon/abilities/target.js b/addons/api/addon/abilities/target.js index fb6b30d33..11516c3b5 100644 --- a/addons/api/addon/abilities/target.js +++ b/addons/api/addon/abilities/target.js @@ -1,7 +1,7 @@ import ModelAbility from './model'; /** - * Provides a `connect` ability for targets. + * Provides abilities for targets. */ export default class TargetAbility extends ModelAbility { // =permissions diff --git a/addons/api/app/abilities/account.js b/addons/api/app/abilities/account.js new file mode 100644 index 000000000..e64435a5e --- /dev/null +++ b/addons/api/app/abilities/account.js @@ -0,0 +1 @@ +export { default } from 'api/abilities/account'; diff --git a/addons/api/mirage/factories/account.js b/addons/api/mirage/factories/account.js index 5b7a14c09..f5da7b5af 100644 --- a/addons/api/mirage/factories/account.js +++ b/addons/api/mirage/factories/account.js @@ -9,6 +9,7 @@ export default factory.extend({ 'read', 'update', 'delete', + 'set-password', ], attributes() { switch (this.type) { diff --git a/addons/api/tests/unit/abilities/account-test-.js b/addons/api/tests/unit/abilities/account-test-.js new file mode 100644 index 000000000..afd89329d --- /dev/null +++ b/addons/api/tests/unit/abilities/account-test-.js @@ -0,0 +1,17 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Abilities | Account', function (hooks) { + setupTest(hooks); + + test('it reflects when a given account may set password based on authorized_actions', function (assert) { + assert.expect(2); + const service = this.owner.lookup('service:can'); + const model = { + authorized_actions: ['set-password'], + }; + assert.ok(service.can('setPassword target', model)); + model.authorized_actions = []; + assert.notOk(service.can('setPassword target', model)); + }); +}); From 1646132db326a6ba63133e6abb484b2eced21cb3 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 30 Sep 2021 11:17:20 -0400 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20apply=20set-password?= =?UTF-8?q?=20ability=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( From 84242dc014b6456284189603fa789ff9b80bfddb Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 4 Oct 2021 09:38:58 -0400 Subject: [PATCH 3/3] feature: apply theme-color meta for more immersive UX --- ui/admin/app/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/admin/app/index.html b/ui/admin/app/index.html index befb5d7b5..04a597a2f 100644 --- a/ui/admin/app/index.html +++ b/ui/admin/app/index.html @@ -6,6 +6,7 @@ Admin + {{content-for "head"}}