From 288a38f6ea2ca9a0d95afb6cb2dfa3f25d8f7525 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 14 Apr 2021 15:13:39 -0400 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20do=20not=20load=20sin?= =?UTF-8?q?gular=20auth=20methods=20in=20auth=20form?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/routes/scopes/scope/authenticate/method.js | 2 +- ui/desktop/app/routes/scopes/scope/authenticate/method.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/admin/app/routes/scopes/scope/authenticate/method.js b/ui/admin/app/routes/scopes/scope/authenticate/method.js index 33dec88f9..2261c90f2 100644 --- a/ui/admin/app/routes/scopes/scope/authenticate/method.js +++ b/ui/admin/app/routes/scopes/scope/authenticate/method.js @@ -21,7 +21,7 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route { */ model({ auth_method_id: id }) { const adapterOptions = { scopeID: this.modelFor('scopes.scope').id }; - return this.store.findRecord('auth-method', id, adapterOptions); + return this.store.peekRecord('auth-method', id, adapterOptions); } /** diff --git a/ui/desktop/app/routes/scopes/scope/authenticate/method.js b/ui/desktop/app/routes/scopes/scope/authenticate/method.js index 66fc52286..1b679119c 100644 --- a/ui/desktop/app/routes/scopes/scope/authenticate/method.js +++ b/ui/desktop/app/routes/scopes/scope/authenticate/method.js @@ -22,7 +22,7 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route { */ model({ auth_method_id: id }) { const adapterOptions = { scopeID: this.modelFor('scopes.scope').id }; - return this.store.findRecord('auth-method', id, adapterOptions); + return this.store.peekRecord('auth-method', id, adapterOptions); } /** From 38366560426a5b6a6ce4fed647f25dbe04112d6d Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 14 Apr 2021 16:11:13 -0400 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20show=20copyable=20er?= =?UTF-8?q?ror=20details=20in=20error=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/actions/en-us.yaml | 1 + ui/admin/app/routes/authentication-error.js | 11 ++++++++++- ui/admin/app/templates/authentication-error.hbs | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml index 2fd069dae..1e9b159e0 100644 --- a/addons/core/translations/actions/en-us.yaml +++ b/addons/core/translations/actions/en-us.yaml @@ -16,6 +16,7 @@ back: Back retry: Retry get-topic-help: Get help for this topic copy-to-clipboard: Copy to Clipboard +copy-error-detail-to-clipboard: Copy Error Detail to Clipboard authenticate: Authenticate deauthenticate: Deauthenticate choose-org: Choose Scope diff --git a/ui/admin/app/routes/authentication-error.js b/ui/admin/app/routes/authentication-error.js index e7eba2739..382741c74 100644 --- a/ui/admin/app/routes/authentication-error.js +++ b/ui/admin/app/routes/authentication-error.js @@ -1,3 +1,12 @@ import Route from '@ember/routing/route'; -export default class AuthenticationErrorRoute extends Route {} +export default class AuthenticationErrorRoute extends Route { + // =methods + + /** + * @return {string} + */ + model() { + return window.location.toString(); + } +} diff --git a/ui/admin/app/templates/authentication-error.hbs b/ui/admin/app/templates/authentication-error.hbs index 477f35d3f..eac628eab 100644 --- a/ui/admin/app/templates/authentication-error.hbs +++ b/ui/admin/app/templates/authentication-error.hbs @@ -7,6 +7,14 @@ @heading={{t "auth.titles.flow-error"}} > {{t "auth.descriptions.flow-error"}} +
+ + {{t "actions.copy-error-detail-to-clipboard"}} + From b13befaff2f816c063c08aa5befcc093c88b3aaf Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 14 Apr 2021 16:16:22 -0400 Subject: [PATCH 3/4] chore: teak capitalization --- addons/core/translations/actions/en-us.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml index 1e9b159e0..eccbad6eb 100644 --- a/addons/core/translations/actions/en-us.yaml +++ b/addons/core/translations/actions/en-us.yaml @@ -16,7 +16,7 @@ back: Back retry: Retry get-topic-help: Get help for this topic copy-to-clipboard: Copy to Clipboard -copy-error-detail-to-clipboard: Copy Error Detail to Clipboard +copy-error-detail-to-clipboard: Copy error detail to clipboard authenticate: Authenticate deauthenticate: Deauthenticate choose-org: Choose Scope From 4d4affe6d7db8ad6575f763db37d489b47b8b905 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 14 Apr 2021 16:22:25 -0400 Subject: [PATCH 4/4] docs: add OIDC to changelog --- ui/desktop/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/desktop/CHANGELOG.md b/ui/desktop/CHANGELOG.md index 60c9f6fe7..fdfbe899f 100644 --- a/ui/desktop/CHANGELOG.md +++ b/ui/desktop/CHANGELOG.md @@ -6,6 +6,7 @@ Canonical reference for changes, improvements, and bugfixes for Boundary Desktop ### New +- OIDC authentication support. ([PR](https://github.com/hashicorp/boundary-ui/pull/429)) - Check for client updates and update on-demand using new menu option. ([PR](https://github.com/hashicorp/boundary-ui/pull/522)) ### Bug Fixes