From 96707ebe151c3dac2eb28a28ab84d708d611e9c2 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Sat, 5 Jun 2021 12:29:12 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20read-only=20hmac=20?=
 =?UTF-8?q?field=20and=20enable=20oidc=20auth=20creation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/translations/form/en-us.yaml        |  2 ++
 addons/core/translations/resources/en-us.yaml   |  1 +
 .../components/form/auth-method/oidc/index.hbs  | 17 +++++++++++++++++
 .../scopes/scope/auth-methods/index.hbs         |  6 ++++++
 .../templates/scopes/scope/auth-methods/new.hbs |  3 +++
 5 files changed, 29 insertions(+)

diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 56af46588..5d2a58567 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -60,6 +60,8 @@ client_id:
 client_secret:
   label: Client Secret
   help: The client secret is set-only and may not be unset.
+client_secret_hmac:
+  label: Client Secret HMAC
 max_age:
   label: Maximum Age
   help: The OIDC "max_age" parameter sent to the Authorization Server indicating a maximum acceptable time in seconds since the user's last authentication before requiring the user to reauthenticate. 0 indicates an immediate need to reauthenticate.
diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 8ab5152ac..53f8090a2 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -10,6 +10,7 @@ account:
       description: Set a password for the account.
   types:
     password: Password
+    oidc: OIDC
   actions:
     create: Create Account
     delete: Delete Account
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 e1a5592c0..152c44876 100644
--- a/ui/admin/app/components/form/auth-method/oidc/index.hbs
+++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs
@@ -6,6 +6,14 @@
   @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
+
+  <form.actions
+    @disabled={{if @model.cannotSave @model.cannotSave}}
+    @enableEditText={{t 'actions.edit-form'}}
+    @submitText={{t 'actions.save'}}
+    @cancelText={{t 'actions.cancel'}}
+  />
+
   <form.input
     @value={{@model.type}}
     @label={{t 'form.type.label'}}
@@ -118,6 +126,15 @@
     {{/if}}
   </form.input>
 
+  {{#unless @model.isNew}}
+    <form.input
+      @value={{@model.attributes.client_secret_hmac}}
+      @label={{t 'form.client_secret_hmac.label'}}
+      readonly={{true}}
+      @disabled={{true}}
+    />
+  {{/unless}}
+
   {{! Signing Algorithms }}
   <Rose::Form::Fieldset>
     <:title>{{t 'form.signing_algorithms.label'}}</:title>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
index cb57f4f36..6d4460c1e 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -24,6 +24,12 @@
         >
           {{t 'resources.auth-method.types.password'}}
         </dropdown.link>
+        <dropdown.link
+          @route='scopes.scope.auth-methods.new'
+          @query={{hash type='oidc'}}
+        >
+          {{t 'resources.auth-method.types.oidc'}}
+        </dropdown.link>
       </Rose::Dropdown>
     {{/if}}
   </page.actions>
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
index d4d2aaf6f..8c87c829c 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs
@@ -14,6 +14,9 @@
       @model={{@model}}
       @submit={{route-action 'save' @model}}
       @cancel={{route-action 'cancel' @model}}
+      @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
+      @addStringItem={{route-action 'addStringItem' @model}}
+      @addAccountClaimMapItem={{route-action 'addAccountClaimMapItem' @model}}
     />
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file