From d784d0c9f8ce330e6c79e35cfff200ededf2abf5 Mon Sep 17 00:00:00 2001
From: BearHanded <bcm3223@gmail.com>
Date: Mon, 12 Aug 2024 13:24:44 -0400
Subject: [PATCH 1/2] update roles per idm config

---
 services/ui-auth/libs/users.json   | 26 +++++++++++++-------------
 services/ui-src/src/types/users.ts | 10 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/services/ui-auth/libs/users.json b/services/ui-auth/libs/users.json
index 6453f9bf..0194cdb9 100644
--- a/services/ui-auth/libs/users.json
+++ b/services/ui-auth/libs/users.json
@@ -20,7 +20,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-bor"
+        "Value": "mdct-hcbs-bor"
       }
     ]
   },
@@ -46,7 +46,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-bor"
+        "Value": "mdct-hcbs-bor"
       }
     ]
   },
@@ -71,7 +71,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-help-desk"
+        "Value": "mdct-hcbs-hd"
       }
     ]
   },
@@ -96,7 +96,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-cms-internal-user"
+        "Value": "mdct-hcbs-internal-user"
       }
     ]
   },
@@ -121,7 +121,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-state-user"
+        "Value": "mdct-hcbs-state-user"
       },
       {
         "Name": "custom:cms_state",
@@ -150,7 +150,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-state-rep"
+        "Value": "mdct-hcbs-state-rep"
       },
       {
         "Name": "custom:cms_state",
@@ -179,7 +179,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-approver"
+        "Value": "mdct-hcbs-appr"
       },
       {
         "Name": "custom:cms_state",
@@ -208,7 +208,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-state-user"
+        "Value": "mdct-hcbs-state-user"
       },
       {
         "Name": "custom:cms_state",
@@ -237,7 +237,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-state-user"
+        "Value": "mdct-hcbs-state-user"
       },
       {
         "Name": "custom:cms_state",
@@ -266,7 +266,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-state-user"
+        "Value": "mdct-hcbs-state-user"
       },
       {
         "Name": "custom:cms_state",
@@ -295,7 +295,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-state-user"
+        "Value": "mdct-hcbs-state-user"
       },
       {
         "Name": "custom:cms_state",
@@ -324,7 +324,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-bor"
+        "Value": "mdct-hcbs-bor"
       }
     ]
   },
@@ -349,7 +349,7 @@
       },
       {
         "Name": "custom:cms_roles",
-        "Value": "mdcthcbs-state-user"
+        "Value": "mdct-hcbs-state-user"
       },
       {
         "Name": "custom:cms_state",
diff --git a/services/ui-src/src/types/users.ts b/services/ui-src/src/types/users.ts
index 537e080d..d51f6940 100644
--- a/services/ui-src/src/types/users.ts
+++ b/services/ui-src/src/types/users.ts
@@ -2,11 +2,11 @@
 
 // TODO: Finalize with IDM
 export enum UserRoles {
-  ADMIN = "mdcthcbs-bor", // "MDCT HCBS Business Owner Representative"
-  APPROVER = "mdcthcbs-approver", // "MDCT HCBS Approver"
-  HELP_DESK = "mdcthcbs-help-desk", // "MDCT HCBS Help Desk"
-  INTERNAL = "mdcthcbs-cms-internal-user", // "MDCT HCBS Internal User"
-  STATE_USER = "mdcthcbs-state-user", // "MDCT HCBS State User"
+  ADMIN = "mdct-hcbs-bor", // "MDCT HCBS Business Owner Representative"
+  APPROVER = "mdct-hcbs-appr", // "MDCT HCBS Approver"
+  HELP_DESK = "mdct-hcbs-hd", // "MDCT HCBS Help Desk"
+  INTERNAL = "mdct-hcbs-internal-user", // "MDCT HCBS Internal User"
+  STATE_USER = "mdct-hcbs-state-user", // "MDCT HCBS State User"
 }
 
 export interface HcbsUser {

From 0f5300d7ac8b5cf943e46494e1270bd613d0d20b Mon Sep 17 00:00:00 2001
From: BearHanded <bcm3223@gmail.com>
Date: Mon, 12 Aug 2024 13:28:41 -0400
Subject: [PATCH 2/2] correct roles prefix filter

---
 services/ui-src/src/utils/auth/UserProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/ui-src/src/utils/auth/UserProvider.tsx b/services/ui-src/src/utils/auth/UserProvider.tsx
index 7c3b4932..42de66c7 100644
--- a/services/ui-src/src/utils/auth/UserProvider.tsx
+++ b/services/ui-src/src/utils/auth/UserProvider.tsx
@@ -71,7 +71,7 @@ export const UserProvider = ({ children }: Props) => {
       const { email, given_name, family_name } = payload;
       // "custom:cms_roles" is an string of concat roles so we need to check for the one applicable to HCBS
       const cms_role = payload["custom:cms_roles"] as string;
-      const userRole = cms_role.split(",").find((r) => r.includes("mdcthcbs"));
+      const userRole = cms_role.split(",").find((r) => r.includes("mdct-hcbs"));
       const state = payload["custom:cms_state"] as string | undefined;
       const full_name = [given_name, " ", family_name].join("");
       const userCheck = {