From c12e61d6178eddce8dc168556bebddcc63a34645 Mon Sep 17 00:00:00 2001 From: Devon Anderson Date: Wed, 26 Jul 2023 15:11:47 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Create=20LDAP=20CRUD:rea?= =?UTF-8?q?d=20(#1798)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 🎸 create CRUD:read Create LDAP CRUD:read details form by adding `client_certificate_key_hmac` and `bind_password_hmac` attributes. ✅ Closes: ICU-10064 * refactor: 💡 refactor ldap details view Revert details view for LDAP to not show HMAC --- .../mirage/generated/factories/auth-method.js | 4 +- .../form/auth-method/ldap/index.hbs | 66 ++++++++++--------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/addons/api/mirage/generated/factories/auth-method.js b/addons/api/mirage/generated/factories/auth-method.js index 67bfb4196..72d7b758a 100644 --- a/addons/api/mirage/generated/factories/auth-method.js +++ b/addons/api/mirage/generated/factories/auth-method.js @@ -50,10 +50,10 @@ export default Factory.extend({ urls: [`ldap://${faker.internet.domainName()}`], certificates: [faker.random.alphaNumeric(50)], client_certificate: faker.random.alphaNumeric(50), - certificate_key: `---Begin Certificate --- ${faker.random.alphaNumeric( + client_certificate_key: `---Begin Certificate --- ${faker.random.alphaNumeric( 170 )} ---End Certificate ---`, - certificate_key_hmac: faker.random.alphaNumeric(50), + client_certificate_key_hmac: faker.random.alphaNumeric(50), enable_groups: true, start_tls: false, insecure_tls: false, diff --git a/ui/admin/app/components/form/auth-method/ldap/index.hbs b/ui/admin/app/components/form/auth-method/ldap/index.hbs index ca40e6a7f..b768bf466 100644 --- a/ui/admin/app/components/form/auth-method/ldap/index.hbs +++ b/ui/admin/app/components/form/auth-method/ldap/index.hbs @@ -160,30 +160,32 @@ {{/if}} - - {{t - 'resources.auth-method.form.client_certificate.label' - }} - {{t - 'resources.auth-method.form.client_certificate.help' - }} - {{#if @model.errors.client_certificate}} - - {{#each @model.errors.client_certificate as |error|}} - {{error.message}} - {{/each}} - - {{/if}} - - {{#if @model.isNew}} + + + {{t 'resources.auth-method.form.client_certificate.label'}} + + + {{t 'resources.auth-method.form.client_certificate.help'}} + + {{#if @model.errors.client_certificate}} + + {{#each @model.errors.client_certificate as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + - {{t - 'resources.auth-method.form.client_certificate_key.label' - }} - {{t - 'resources.auth-method.form.client_certificate_key.help' - }} + + {{t 'resources.auth-method.form.client_certificate_key.label'}} + + + {{t 'resources.auth-method.form.client_certificate_key.help'}} + {{#if @model.errors.client_certificate_key}} {{#each @model.errors.client_certificate_key as |error|}} @@ -278,9 +280,9 @@ as |F| > {{t 'resources.auth-method.form.bind_password.label'}} - {{t - 'resources.auth-method.form.bind_password.help' - }} + + {{t 'resources.auth-method.form.bind_password.help'}} + {{#if @model.errors.bind_password}} {{#each @model.errors.bind_password as |error|}}