Fix for not crashing when role not found

Revvity · Jul 2, 2024 · 6a95209 · 6a95209
1 parent 2435b03
commit 6a95209
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/js/apps/admin-ui/src/realm-roles/UsersInRoleTab.tsx b/js/apps/admin-ui/src/realm-roles/UsersInRoleTab.tsx
@@ -22,7 +22,9 @@ export const UsersInRoleTab = () => {
   const { adminClient } = useAdminClient();
 
   const loader = async (first?: number, max?: number) => {
-    const role = await adminClient.roles.findOneById({ id: id });
+    const role = await adminClient.roles
+      .findOneById({ id: id })
+      .catch(() => undefined);
     if (!role) {
       throw new Error(t("common:notFound"));
     }

diff --git a/js/apps/admin-ui/src/user/EditUser.tsx b/js/apps/admin-ui/src/user/EditUser.tsx
@@ -63,9 +63,11 @@ export default function EditUser() {
       const isBruteForceProtected = currentRealm.bruteForceProtected;
       const isLocked = isBruteForceProtected && attackDetection.disabled;
 
-      const serviceUsers = await adminClient.roles.findUsersWithRole({
-        name: "service",
-      });
+      const serviceUsers = await adminClient.roles
+        .findUsersWithRole({
+          name: "service",
+        })
+        .catch(() => [] as UserRepresentation[]);
 
       return {
         user,

diff --git a/js/apps/admin-ui/src/user/UsersSection.tsx b/js/apps/admin-ui/src/user/UsersSection.tsx
@@ -144,9 +144,11 @@ export default function UsersSection() {
     }
 
     try {
-      const usersWithServiceRole = await adminClient.roles.findUsersWithRole({
-        name: "service",
-      });
+      const usersWithServiceRole = await adminClient.roles
+        .findUsersWithRole({
+          name: "service",
+        })
+        .catch(() => [] as UserRepresentation[]);
 
       return (
         await findUsers({