Merge branch 'main' into bump-changelog

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

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();
+  }
+}

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);
   }
 
   /**

ui/admin/app/templates/authentication-error.hbs

@@ -7,6 +7,14 @@
       @heading={{t "auth.titles.flow-error"}}
     >
       {{t "auth.descriptions.flow-error"}}
+      <br>
+      <Copyable
+        @text={{@model}}
+        @buttonText={{t "actions.copy-error-detail-to-clipboard"}}
+        @acknowledgeText={{t "states.copied"}}
+      >
+        {{t "actions.copy-error-detail-to-clipboard"}}
+      </Copyable>
     </Rose::Notification>
   </Rose::Layout::Centered>
 </main>

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

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);
   }
 
   /**