From 6852080430f6893bc05ccde706a4c3655380eea3 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 12 Aug 2020 15:43:34 -0400 Subject: [PATCH 1/2] chore: Add authmethods list route --- ui/core/app/router.js | 1 + .../app/routes/scopes/scope/auth-methods.js | 14 ++++++++ .../routes/scopes/scope/auth-methods/index.js | 4 +++ ui/core/app/templates/scopes/scope.hbs | 3 ++ .../templates/scopes/scope/auth-methods.hbs | 1 + .../scopes/scope/auth-methods/index.hbs | 36 +++++++++++++++++++ .../routes/scopes/scope/auth-methods-test.js | 11 ++++++ .../scopes/scope/auth-methods/index-test.js | 11 ++++++ ui/core/translations/en-us.yaml | 1 + 9 files changed, 82 insertions(+) create mode 100644 ui/core/app/routes/scopes/scope/auth-methods.js create mode 100644 ui/core/app/routes/scopes/scope/auth-methods/index.js create mode 100644 ui/core/app/templates/scopes/scope/auth-methods.hbs create mode 100644 ui/core/app/templates/scopes/scope/auth-methods/index.hbs create mode 100644 ui/core/tests/unit/routes/scopes/scope/auth-methods-test.js create mode 100644 ui/core/tests/unit/routes/scopes/scope/auth-methods/index-test.js diff --git a/ui/core/app/router.js b/ui/core/app/router.js index bba93d1ad..1471216ea 100644 --- a/ui/core/app/router.js +++ b/ui/core/app/router.js @@ -35,6 +35,7 @@ Router.map(function () { }); this.route('new'); }); + this.route('auth-methods', function() {}); }); }); }); diff --git a/ui/core/app/routes/scopes/scope/auth-methods.js b/ui/core/app/routes/scopes/scope/auth-methods.js new file mode 100644 index 000000000..112c40248 --- /dev/null +++ b/ui/core/app/routes/scopes/scope/auth-methods.js @@ -0,0 +1,14 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeAuthMethodsRoute extends Route { + // =methods + + /** + * Load all auth-methods under current scope + * @return {Promise[AuthMethodModel]} + */ + async model() { + const { id: scopeID} = this.modelFor('scopes.scope'); + return this.store.findAll('auth-method', { adapterOptions: { scopeID } }); + } +} diff --git a/ui/core/app/routes/scopes/scope/auth-methods/index.js b/ui/core/app/routes/scopes/scope/auth-methods/index.js new file mode 100644 index 000000000..56fa5fabf --- /dev/null +++ b/ui/core/app/routes/scopes/scope/auth-methods/index.js @@ -0,0 +1,4 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeAuthMethodsIndexRoute extends Route { +} diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs index 62f8be2de..37530455c 100644 --- a/ui/core/app/templates/scopes/scope.hbs +++ b/ui/core/app/templates/scopes/scope.hbs @@ -18,6 +18,9 @@ {{t "resources.roles"}} + + {{t "resources.auth-methods"}} + {{outlet "sidebar"}} diff --git a/ui/core/app/templates/scopes/scope/auth-methods.hbs b/ui/core/app/templates/scopes/scope/auth-methods.hbs new file mode 100644 index 000000000..c24cd6895 --- /dev/null +++ b/ui/core/app/templates/scopes/scope/auth-methods.hbs @@ -0,0 +1 @@ +{{outlet}} diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs new file mode 100644 index 000000000..1b805f939 --- /dev/null +++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs @@ -0,0 +1,36 @@ + + +

{{t "resources.auth-methods"}}

+
+ + + {{#if @model}} + + + + {{t 'form.label.name'}} + {{t 'form.label.type'}} + {{t 'form.label.id'}} + + + + + {{#each @model as |authMethod|}} + + + {{authMethod.name}} + {{authMethod.description}} + + + + {{authMethod.type}} + + + {{authMethod.id}} + + {{/each}} + + + {{/if}} + +
\ No newline at end of file diff --git a/ui/core/tests/unit/routes/scopes/scope/auth-methods-test.js b/ui/core/tests/unit/routes/scopes/scope/auth-methods-test.js new file mode 100644 index 000000000..e5b45abad --- /dev/null +++ b/ui/core/tests/unit/routes/scopes/scope/auth-methods-test.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Route | scopes/scope/auth-methods', function(hooks) { + setupTest(hooks); + + test('it exists', function(assert) { + let route = this.owner.lookup('route:scopes/scope/auth-methods'); + assert.ok(route); + }); +}); diff --git a/ui/core/tests/unit/routes/scopes/scope/auth-methods/index-test.js b/ui/core/tests/unit/routes/scopes/scope/auth-methods/index-test.js new file mode 100644 index 000000000..eb85171ad --- /dev/null +++ b/ui/core/tests/unit/routes/scopes/scope/auth-methods/index-test.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Route | scopes/scope/auth-methods/index', function(hooks) { + setupTest(hooks); + + test('it exists', function(assert) { + let route = this.owner.lookup('route:scopes/scope/auth-methods/index'); + assert.ok(route); + }); +}); diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index 5252c7e6f..1002147e2 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -31,6 +31,7 @@ resources: project: Project host-catalog: Host Catalog host-catalogs: Host Catalogs + auth-methods: Auth Methods titles: iam: IAM new: New From 7bcc44a00ce7c0b04e7e88f0ed81f817cacd0b5c Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 13 Aug 2020 11:03:10 -0400 Subject: [PATCH 2/2] chore: Add welcome message to auth-methods --- .../templates/scopes/scope/auth-methods/index.hbs | 12 ++++++++++++ ui/core/translations/en-us.yaml | 2 ++ 2 files changed, 14 insertions(+) diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs index 1b805f939..2d5456c58 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs @@ -5,6 +5,7 @@ {{#if @model}} + @@ -31,6 +32,17 @@ {{/each}} + + {{else}} + + + + + {{t 'descriptions.auth-methods-welcome'}} + + + + {{/if}} \ No newline at end of file diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index be72ec06a..c5199e191 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -46,6 +46,7 @@ titles: users-welcome: Welcome to Users roles-welcome: Welcome to Roles groups-welcome: Welcome to Groups + auth-methods-welcome: Welcome to Auth Methods grants: Permissions new-grant: New Grant principals: Principals @@ -57,6 +58,7 @@ descriptions: users-welcome: Users are authorized to access Boundary. roles-welcome: Roles are collections of capabilities that can be granted to user and/or groups. groups-welcome: Groups are collections of users. + auth-methods-welcome: Auth methods are configurations to authenticate users. states: info: Info success: Success