From 66d16d84d0a9bdf8926448c86d44cd7fdfd9e90a Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Wed, 2 Jun 2021 14:23:54 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20use=20flattened=20attrs?=
 =?UTF-8?q?=20to=20capture=20oidc=20field=20errors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/api/addon/adapters/application.js      |   6 +-
 addons/api/addon/models/auth-method.js        |  21 +++
 .../form/auth-method/oidc/index.hbs           | 134 ++++++++----------
 3 files changed, 82 insertions(+), 79 deletions(-)

diff --git a/addons/api/addon/adapters/application.js b/addons/api/addon/adapters/application.js
index 279e9b73f..12112ed67 100644
--- a/addons/api/addon/adapters/application.js
+++ b/addons/api/addon/adapters/application.js
@@ -248,7 +248,11 @@ export default class ApplicationAdapter extends RESTAdapter.extend(
     // Normalize field-specific errors, if any.
     const errors = fieldErrors.map((error) => ({
       detail: error.description,
-      source: { pointer: `/data/attributes/${error.name}` },
+      // Ember Data cannot handle errors on nested attributes, so these are
+      // flattened (e.g. `attributes.foobar` becomes `attributes_foobar`).
+      // To capture these errors, add read-only fields on the model
+      // corresponding to the underscored field name.
+      source: { pointer: `/data/attributes/${error.name.replace('.', '_')}` },
     }));
     // Return a list of JSON API errors rooted under the `errors` key.
     return {
diff --git a/addons/api/addon/models/auth-method.js b/addons/api/addon/models/auth-method.js
index dc03abc0d..66f34757d 100644
--- a/addons/api/addon/models/auth-method.js
+++ b/addons/api/addon/models/auth-method.js
@@ -1,4 +1,5 @@
 import GeneratedAuthMethodModel from '../generated/models/auth-method';
+import { attr } from '@ember-data/model';
 import { fragment } from 'ember-data-model-fragments/attributes';
 import { equal } from '@ember/object/computed';
 
@@ -27,6 +28,26 @@ export const options = {
 };
 
 export default class AuthMethodModel extends GeneratedAuthMethodModel {
+  // =error attributes
+  // These attributes exist solely to capture errors on nested fields.
+  // See the application adapter's error normalization method for
+  // more information.
+
+  @attr('string', { readOnly: true }) attributes_state;
+  @attr('string', { readOnly: true }) attributes_issuer;
+  @attr('string', { readOnly: true }) attributes_client_id;
+  @attr('string', { readOnly: true }) attributes_client_secret;
+  @attr('string', { readOnly: true }) attributes_max_age;
+  @attr('string', { readOnly: true }) attributes_api_url_prefix;
+  @attr('string', { readOnly: true })
+  attributes_disable_discovered_config_validation;
+  @attr('string', { readOnly: true }) attributes_dry_run;
+  @attr('string', { readOnly: true }) attributes_account_claim_maps;
+  @attr('string', { readOnly: true }) attributes_claims_scopes;
+  @attr('string', { readOnly: true }) attributes_signing_algorithms;
+  @attr('string', { readOnly: true }) attributes_allowed_audiences;
+  @attr('string', { readOnly: true }) attributes_idp_ca_certs;
+
   // =attributes
 
   /**
diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs
index 335392e08..e1a5592c0 100644
--- a/ui/admin/app/components/form/auth-method/oidc/index.hbs
+++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs
@@ -57,13 +57,13 @@
     @value={{@model.attributes.issuer}}
     @label={{t 'form.issuer.label'}}
     @helperText={{t 'form.issuer.help'}}
-    @error={{@model.errors.attributes.issuer}}
+    @error={{@model.errors.attributes_issuer}}
     readonly={{false}}
     as |field|
   >
-    {{#if @model.errors.attributes.issuer}}
+    {{#if @model.errors.attributes_issuer}}
       <field.errors as |errors|>
-        {{#each @model.errors.attributes.issuer as |error|}}
+        {{#each @model.errors.attributes_issuer as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>
@@ -86,13 +86,13 @@
     @value={{@model.attributes.client_id}}
     @label={{t 'form.client_id.label'}}
     @helperText={{t 'form.client_id.help'}}
-    @error={{@model.errors.attributes.client_id}}
+    @error={{@model.errors.attributes_client_id}}
     readonly={{false}}
     as |field|
   >
-    {{#if @model.errors.attributes.client_id}}
+    {{#if @model.errors.attributes_client_id}}
       <field.errors as |errors|>
-        {{#each @model.errors.attributes.client_id as |error|}}
+        {{#each @model.errors.attributes_client_id as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>
@@ -105,13 +105,13 @@
     @value={{@model.attributes.client_secret}}
     @label={{t 'form.client_secret.label'}}
     @helperText={{t 'form.client_secret.help'}}
-    @error={{@model.errors.attributes.client_secret}}
+    @error={{@model.errors.attributes_client_secret}}
     readonly={{false}}
     as |field|
   >
-    {{#if @model.errors.attributes.client_secret}}
+    {{#if @model.errors.attributes_client_secret}}
       <field.errors as |errors|>
-        {{#each @model.errors.attributes.client_secret as |error|}}
+        {{#each @model.errors.attributes_client_secret as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>
@@ -123,6 +123,13 @@
     <:title>{{t 'form.signing_algorithms.label'}}</:title>
     <:description>{{t 'form.signing_algorithms.help'}}</:description>
     <:body>
+      {{#if @model.errors.attributes_signing_algorithms}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.attributes_signing_algorithms as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </Rose::Form::Errors>
+      {{/if}}
       <Rose::Table @style='condensed' as |table|>
         <table.header as |header|>
           <header.row @hidden={{true}} as |row|>
@@ -136,7 +143,7 @@
               <row.cell>
                 <form.select
                   @value={{algorithm.value}}
-                  @error={{@model.errors.attributes.signing_algorithms}}
+                  @error={{@model.errors.attributes_signing_algorithms}}
                   @contextual={{true}}
                   @onChange={{fn (mut algorithm.value)}}
                   as |field|
@@ -149,16 +156,6 @@
                       >{{algorithm}}</select.option>
                     {{/each}}
                   </field.field>
-                  {{#if @model.errors.attributes.signing_algorithms}}
-                    <field.errors as |errors|>
-                      {{#each
-                        @model.errors.attributes.signing_algorithms
-                        as |error|
-                      }}
-                        <errors.message>{{error.message}}</errors.message>
-                      {{/each}}
-                    </field.errors>
-                  {{/if}}
                 </form.select>
               </row.cell>
               <row.cell @shrink={{true}}>
@@ -225,6 +222,13 @@
     <:title>{{t 'form.allowed_audiences.label'}}</:title>
     <:description>{{t 'form.allowed_audiences.help'}}</:description>
     <:body>
+      {{#if @model.errors.attributes_allowed_audiences}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.attributes_allowed_audiences as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </Rose::Form::Errors>
+      {{/if}}
       <Rose::Table @style='condensed' as |table|>
         <table.header as |header|>
           <header.row @hidden={{true}} as |row|>
@@ -239,22 +243,12 @@
                 <form.input
                   @type='text'
                   @value={{audience.value}}
-                  @error={{@model.errors.attributes.allowed_audiences}}
+                  @error={{@model.errors.attributes_allowed_audiences}}
                   @contextual={{true}}
                   as |field|
                 >
                   <field.label>{{t 'form.claim.label'}}</field.label>
                   <field.field />
-                  {{#if @model.errors.attributes.allowed_audiences}}
-                    <field.errors as |errors|>
-                      {{#each
-                        @model.errors.attributes.allowed_audiences
-                        as |error|
-                      }}
-                        <errors.message>{{error.message}}</errors.message>
-                      {{/each}}
-                    </field.errors>
-                  {{/if}}
                 </form.input>
               </row.cell>
               <row.cell @shrink={{true}}>
@@ -310,6 +304,13 @@
     <:title>{{t 'form.claims_scopes.label'}}</:title>
     <:description>{{t 'form.claims_scopes.help'}}</:description>
     <:body>
+      {{#if @model.errors.attributes_claims_scopes}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.attributes_claims_scopes as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </Rose::Form::Errors>
+      {{/if}}
       <Rose::Table @style='condensed' as |table|>
         <table.header as |header|>
           <header.row @hidden={{true}} as |row|>
@@ -324,22 +325,12 @@
                 <form.input
                   @type='text'
                   @value={{claimsScope.value}}
-                  @error={{@model.errors.attributes.claims_scopes}}
+                  @error={{@model.errors.attributes_claims_scopes}}
                   @contextual={{true}}
                   as |field|
                 >
                   <field.label>{{t 'form.claims_scope.label'}}</field.label>
                   <field.field />
-                  {{#if @model.errors.attributes.claims_scopes}}
-                    <field.errors as |errors|>
-                      {{#each
-                        @model.errors.attributes.claims_scopes
-                        as |error|
-                      }}
-                        <errors.message>{{error.message}}</errors.message>
-                      {{/each}}
-                    </field.errors>
-                  {{/if}}
                 </form.input>
               </row.cell>
               <row.cell @shrink={{true}}>
@@ -395,6 +386,13 @@
     <:title>{{t 'form.account_claim_maps.label'}}</:title>
     <:description>{{t 'form.account_claim_maps.help'}}</:description>
     <:body>
+      {{#if @model.errors.attributes_account_claim_maps}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.attributes_account_claim_maps as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </Rose::Form::Errors>
+      {{/if}}
       <Rose::Table @style='condensed' as |table|>
         <table.header as |header|>
           <header.row as |row|>
@@ -410,28 +408,18 @@
                 <form.input
                   @type='text'
                   @value={{claimMap.from}}
-                  @error={{@model.errors.attributes.account_claim_maps}}
+                  @error={{@model.errors.attributes_account_claim_maps}}
                   @contextual={{true}}
                   as |field|
                 >
                   <field.label>{{t 'form.from_claim.label'}}</field.label>
                   <field.field />
-                  {{#if @model.errors.attributes.account_claim_maps}}
-                    <field.errors as |errors|>
-                      {{#each
-                        @model.errors.attributes.account_claim_maps
-                        as |error|
-                      }}
-                        <errors.message>{{error.message}}</errors.message>
-                      {{/each}}
-                    </field.errors>
-                  {{/if}}
                 </form.input>
               </row.cell>
               <row.cell>
                 <form.select
                   @value={{claimMap.to}}
-                  @error={{@model.errors.attributes.account_claim_maps}}
+                  @error={{@model.errors.attributes_account_claim_maps}}
                   @contextual={{true}}
                   @onChange={{fn (mut claimMap.to)}}
                   as |field|
@@ -444,16 +432,6 @@
                       >{{toClaim}}</select.option>
                     {{/each}}
                   </field.field>
-                  {{#if @model.errors.attributes.account_claim_maps}}
-                    <field.errors as |errors|>
-                      {{#each
-                        @model.errors.attributes.account_claim_maps
-                        as |error|
-                      }}
-                        <errors.message>{{error.message}}</errors.message>
-                      {{/each}}
-                    </field.errors>
-                  {{/if}}
                 </form.select>
               </row.cell>
               <row.cell @shrink={{true}}>
@@ -521,6 +499,13 @@
     <:title>{{t 'form.idp_ca_certs.label'}}</:title>
     <:description>{{t 'form.idp_ca_certs.help'}}</:description>
     <:body>
+      {{#if @model.errors.attributes_idp_ca_certs}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.attributes_idp_ca_certs as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </Rose::Form::Errors>
+      {{/if}}
       <Rose::Table @style='condensed' as |table|>
         <table.header as |header|>
           <header.row @hidden={{true}} as |row|>
@@ -534,19 +519,12 @@
               <row.cell>
                 <form.textarea
                   @value={{cert.value}}
-                  @error={{@model.errors.attributes.idp_ca_certs}}
+                  @error={{@model.errors.attributes_idp_ca_certs}}
                   @contextual={{true}}
                   as |field|
                 >
                   <field.label>{{t 'form.certificate.label'}}</field.label>
                   <field.field />
-                  {{#if @model.errors.attributes.idp_ca_certs}}
-                    <field.errors as |errors|>
-                      {{#each @model.errors.attributes.idp_ca_certs as |error|}}
-                        <errors.message>{{error.message}}</errors.message>
-                      {{/each}}
-                    </field.errors>
-                  {{/if}}
                 </form.textarea>
               </row.cell>
               <row.cell @shrink={{true}}>
@@ -600,15 +578,15 @@
     @value={{@model.attributes.max_age}}
     @label={{t 'form.max_age.label'}}
     @helperText={{t 'form.max_age.help'}}
-    @error={{@model.errors.attributes.max_age}}
+    @error={{@model.errors.attributes_max_age}}
     readonly={{false}}
     step='1'
     min='0'
     as |field|
   >
-    {{#if @model.errors.attributes.max_age}}
+    {{#if @model.errors.attributes_max_age}}
       <field.errors as |errors|>
-        {{#each @model.errors.attributes.max_age as |error|}}
+        {{#each @model.errors.attributes_max_age as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>
@@ -621,13 +599,13 @@
     @value={{@model.attributes.api_url_prefix}}
     @label={{t 'form.api_url_prefix.label'}}
     @helperText={{t 'form.api_url_prefix.help'}}
-    @error={{@model.errors.attributes.api_url_prefix}}
+    @error={{@model.errors.attributes_api_url_prefix}}
     readonly={{false}}
     as |field|
   >
-    {{#if @model.errors.attributes.api_url_prefix}}
+    {{#if @model.errors.attributes_api_url_prefix}}
       <field.errors as |errors|>
-        {{#each @model.errors.attributes.api_url_prefix as |error|}}
+        {{#each @model.errors.attributes_api_url_prefix as |error|}}
           <errors.message>{{error.message}}</errors.message>
         {{/each}}
       </field.errors>