From bfef20771182203dee49f201224cf80eb89b9a28 Mon Sep 17 00:00:00 2001
From: Kianna <30884335+kiannaquach@users.noreply.github.com>
Date: Tue, 8 Aug 2023 09:58:57 -0700
Subject: [PATCH] UI: Add missing allowed_user_ids to role form in PKI (#22191)

---
 changelog/22191.txt                       | 3 +++
 ui/app/models/pki/certificate/generate.js | 2 +-
 ui/app/models/pki/role.js                 | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelog/22191.txt

diff --git a/changelog/22191.txt b/changelog/22191.txt
new file mode 100644
index 0000000000..9fa7c85d59
--- /dev/null
+++ b/changelog/22191.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: adds allowed_user_ids field to create role form and user_ids to generate certificates form in pki
+```
\ No newline at end of file
diff --git a/ui/app/models/pki/certificate/generate.js b/ui/app/models/pki/certificate/generate.js
index cdccc2cd40..c3351c46bb 100644
--- a/ui/app/models/pki/certificate/generate.js
+++ b/ui/app/models/pki/certificate/generate.js
@@ -9,7 +9,7 @@ import PkiCertificateBaseModel from './base';
 
 const generateFromRole = [
   {
-    default: ['commonName', 'customTtl', 'format', 'privateKeyFormat'],
+    default: ['commonName', 'userIds', 'customTtl', 'format', 'privateKeyFormat'],
   },
   {
     'Subject Alternative Name (SAN) Options': [
diff --git a/ui/app/models/pki/role.js b/ui/app/models/pki/role.js
index ea74551914..78fdb44b2d 100644
--- a/ui/app/models/pki/role.js
+++ b/ui/app/models/pki/role.js
@@ -55,6 +55,7 @@ const fieldGroups = [
   },
   {
     'Additional subject fields': [
+      'allowedUserIds',
       'allowedSerialNumbers',
       'requireCn',
       'useCsrCommonName',
@@ -293,6 +294,7 @@ export default class PkiRoleModel extends Model {
   })
   extKeyUsageOids;
 
+  @attr({ editType: 'stringArray' }) allowedUserIds;
   @attr({ editType: 'stringArray' }) organization;
   @attr({ editType: 'stringArray' }) country;
   @attr({ editType: 'stringArray' }) locality;