From 1bc6d7f6af0b04bbb1b00dfde68597586d823d9f Mon Sep 17 00:00:00 2001
From: hc-github-team-secure-vault-core
 <82990506+hc-github-team-secure-vault-core@users.noreply.github.com>
Date: Thu, 1 Jun 2023 14:29:12 -0400
Subject: [PATCH] backport of commit e32cf520f43c2708a7f6833f86d4fc0bd5620b00
 (#20920)

Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
---
 changelog/20907.txt                           |  3 +
 ui/app/models/pki/role.js                     |  2 +-
 ui/lib/core/addon/components/form-field.hbs   |  2 +-
 ui/lib/core/addon/helpers/loose-equal.js      | 22 +++++++
 ui/lib/core/app/helpers/loose-equal.js        |  6 ++
 .../addon/components/pki-key-parameters.hbs   |  2 +-
 .../addon/components/pki-key-parameters.ts    |  1 -
 .../components/pki/pki-role-form-test.js      | 66 +++++++++++++++++++
 .../integration/helpers/loose-equal-test.js   | 34 ++++++++++
 ui/types/vault/models/pki/role.d.ts           |  2 +-
 10 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 changelog/20907.txt
 create mode 100644 ui/lib/core/addon/helpers/loose-equal.js
 create mode 100644 ui/lib/core/app/helpers/loose-equal.js
 create mode 100644 ui/tests/integration/helpers/loose-equal-test.js

diff --git a/changelog/20907.txt b/changelog/20907.txt
new file mode 100644
index 0000000000..3f13a659de
--- /dev/null
+++ b/changelog/20907.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: fixes key_bits and signature_bits reverting to default values when editing a pki role
+```
\ No newline at end of file
diff --git a/ui/app/models/pki/role.js b/ui/app/models/pki/role.js
index f272456139..ea74551914 100644
--- a/ui/app/models/pki/role.js
+++ b/ui/app/models/pki/role.js
@@ -184,7 +184,7 @@ export default class PkiRoleModel extends Model {
   })
   keyBits; // no possibleValues because options are dependent on selected key type
 
-  @attr('number', {
+  @attr('string', {
     label: 'Signature bits',
     subText: `Only applicable for key_type 'RSA'. Ignore for other key types.`,
     defaultValue: '0',
diff --git a/ui/lib/core/addon/components/form-field.hbs b/ui/lib/core/addon/components/form-field.hbs
index 126ef28f70..38b520aac8 100644
--- a/ui/lib/core/addon/components/form-field.hbs
+++ b/ui/lib/core/addon/components/form-field.hbs
@@ -46,7 +46,7 @@
               </option>
             {{/if}}
             {{#each (path-or-array @attr.options.possibleValues @model) as |val|}}
-              <option selected={{eq (get @model this.valuePath) (or val.value val)}} value={{or val.value val}}>
+              <option selected={{loose-equal (get @model this.valuePath) (or val.value val)}} value={{or val.value val}}>
                 {{or val.displayName val}}
               </option>
             {{/each}}
diff --git a/ui/lib/core/addon/helpers/loose-equal.js b/ui/lib/core/addon/helpers/loose-equal.js
new file mode 100644
index 0000000000..78767fe552
--- /dev/null
+++ b/ui/lib/core/addon/helpers/loose-equal.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import { helper } from '@ember/component/helper';
+
+/* 
+ * use sparingly *
+  ex: logic for an HTML element's selected boolean because <select> values are strings
+  strict equal (===) will fail if the API param is a number
+  <option selected={{loose-equal model.someAttr someOption)}} value={{someOption}}>
+*/
+export function looseEqual([a, b]) {
+  // loose equal 0 == '' returns true, we don't want that
+  if ((a === 0 && b === '') || (a === '' && b === 0)) {
+    return false;
+  }
+  return a == b;
+}
+
+export default helper(looseEqual);
diff --git a/ui/lib/core/app/helpers/loose-equal.js b/ui/lib/core/app/helpers/loose-equal.js
new file mode 100644
index 0000000000..9e6cc0f2bc
--- /dev/null
+++ b/ui/lib/core/app/helpers/loose-equal.js
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+export { default } from 'core/helpers/loose-equal';
diff --git a/ui/lib/pki/addon/components/pki-key-parameters.hbs b/ui/lib/pki/addon/components/pki-key-parameters.hbs
index 6ec310124a..d4435b273f 100644
--- a/ui/lib/pki/addon/components/pki-key-parameters.hbs
+++ b/ui/lib/pki/addon/components/pki-key-parameters.hbs
@@ -24,7 +24,7 @@
                   </option>
                 {{/if}}
                 {{#each this.keyBitOptions as |val|}}
-                  <option selected={{eq (get @model "keyBits") val}} value={{val}}>
+                  <option selected={{loose-equal (get @model "keyBits") val}} value={{val}}>
                     {{val}}
                   </option>
                 {{/each}}
diff --git a/ui/lib/pki/addon/components/pki-key-parameters.ts b/ui/lib/pki/addon/components/pki-key-parameters.ts
index 0041f4ba86..3313dc7251 100644
--- a/ui/lib/pki/addon/components/pki-key-parameters.ts
+++ b/ui/lib/pki/addon/components/pki-key-parameters.ts
@@ -48,7 +48,6 @@ const KEY_BITS_OPTIONS: BitOptions = {
 export default class PkiKeyParameters extends Component<Args> {
   get keyBitOptions() {
     if (!this.args.model.keyType) return [];
-
     return KEY_BITS_OPTIONS[this.args.model.keyType];
   }
 
diff --git a/ui/tests/integration/components/pki/pki-role-form-test.js b/ui/tests/integration/components/pki/pki-role-form-test.js
index f84b3009b7..df2049413d 100644
--- a/ui/tests/integration/components/pki/pki-role-form-test.js
+++ b/ui/tests/integration/components/pki/pki-role-form-test.js
@@ -145,4 +145,70 @@ module('Integration | Component | pki-role-form', function (hooks) {
     await click(SELECTORS.roleCreateButton);
     assert.strictEqual(this.role.issuerRef, 'issuer-1', 'Issuer Ref correctly saved on create');
   });
+
+  test('it should edit a role', async function (assert) {
+    assert.expect(8);
+    this.server.post(`/pki-test/roles/test-role`, (schema, req) => {
+      assert.ok(true, 'Request made to correct endpoint to update role');
+      const request = JSON.parse(req.requestBody);
+      assert.propEqual(
+        request,
+        {
+          allow_ip_sans: true,
+          issuer_ref: 'issuer-1',
+          key_bits: '224',
+          key_type: 'ec',
+          key_usage: ['DigitalSignature', 'KeyAgreement', 'KeyEncipherment'],
+          not_before_duration: '30s',
+          require_cn: true,
+          signature_bits: '384',
+          use_csr_common_name: true,
+          use_csr_sans: true,
+        },
+        'sends role params in correct type'
+      );
+      return {};
+    });
+
+    this.store.pushPayload('pki/role', {
+      modelName: 'pki/role',
+      name: 'test-role',
+      backend: 'pki-test',
+      id: 'role-id',
+      key_type: 'rsa',
+      key_bits: 3072, // string type in dropdown, API returns as numbers
+      signature_bits: 512, // string type in dropdown, API returns as numbers
+    });
+
+    this.role = this.store.peekRecord('pki/role', 'role-id');
+
+    await render(
+      hbs`
+      <PkiRoleForm
+        @role={{this.role}}
+        @issuers={{this.issuers}}
+        @onCancel={{this.onCancel}}
+        @onSave={{this.onSave}}
+      />
+      `,
+      { owner: this.engine }
+    );
+
+    await click(SELECTORS.issuerRefToggle);
+    await fillIn(SELECTORS.issuerRefSelect, 'issuer-1');
+
+    await click(SELECTORS.keyParams);
+    assert.dom(SELECTORS.keyType).hasValue('rsa');
+    assert.dom(SELECTORS.keyBits).hasValue('3072', 'dropdown has model value, not default value (2048)');
+    assert.dom(SELECTORS.signatureBits).hasValue('512', 'dropdown has model value, not default value (0)');
+
+    await fillIn(SELECTORS.keyType, 'ec');
+    await fillIn(SELECTORS.keyBits, '224');
+    assert.dom(SELECTORS.keyBits).hasValue('224', 'dropdown has selected value, not default value (256)');
+    await fillIn(SELECTORS.signatureBits, '384');
+    assert.dom(SELECTORS.signatureBits).hasValue('384', 'dropdown has selected value, not default value (0)');
+
+    await click(SELECTORS.roleCreateButton);
+    assert.strictEqual(this.role.issuerRef, 'issuer-1', 'Issuer Ref correctly saved on create');
+  });
 });
diff --git a/ui/tests/integration/helpers/loose-equal-test.js b/ui/tests/integration/helpers/loose-equal-test.js
new file mode 100644
index 0000000000..a8068f00aa
--- /dev/null
+++ b/ui/tests/integration/helpers/loose-equal-test.js
@@ -0,0 +1,34 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'vault/tests/helpers';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import { looseEqual } from 'core/helpers/loose-equal';
+
+module('Integration | Helper | loose-equal', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    this.inputValue = 1234;
+    await render(hbs`{{if (loose-equal "1234" 1234) "true" "false"}}`);
+    assert.dom(this.element).hasText('true');
+
+    this.inputValue = '4567';
+    await render(hbs`{{if (loose-equal "1234" "4567") "true" "false"}}`);
+    assert.dom(this.element).hasText('false');
+  });
+
+  test('it compares values as expected', async function (assert) {
+    assert.true(looseEqual([0, '0']));
+    assert.true(looseEqual([0, 0]));
+    assert.true(looseEqual(['0', '0']));
+    assert.true(looseEqual(['1234', 1234]));
+    assert.true(looseEqual(['1234', '1234']));
+    assert.true(looseEqual([1234, 1234]));
+    assert.true(looseEqual(['abc', 'abc']));
+    assert.true(looseEqual(['', '']));
+
+    // == normally returns true for this comparison, we intercept and return false
+    assert.false(looseEqual(['', 0]));
+    assert.false(looseEqual([0, '']));
+  });
+});
diff --git a/ui/types/vault/models/pki/role.d.ts b/ui/types/vault/models/pki/role.d.ts
index db059b1f52..31cc3d5899 100644
--- a/ui/types/vault/models/pki/role.d.ts
+++ b/ui/types/vault/models/pki/role.d.ts
@@ -1,5 +1,5 @@
 import Model from '@ember-data/model';
-import { FModelValidations } from 'vault/app-types';
+import { ModelValidations } from 'vault/app-types';
 
 export default class PkiRoleModel extends Model {
   get useOpenAPI(): boolean;