From fced2f369649410d9e8ea7e4ca381fef3d0afb12 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Tue, 5 Mar 2024 09:23:48 +0000
Subject: [PATCH] Respond to PR feedback.

---
 packages/backend-core/src/security/roles.ts |  2 +-
 packages/server/src/api/controllers/role.ts | 27 +++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/backend-core/src/security/roles.ts b/packages/backend-core/src/security/roles.ts
index 01473ad991..213c65e18e 100644
--- a/packages/backend-core/src/security/roles.ts
+++ b/packages/backend-core/src/security/roles.ts
@@ -184,7 +184,7 @@ export async function getRole(
       return cloneDeep(BUILTIN_ROLES.PUBLIC)
     }
     // only throw an error if there is no role at all
-    if (!role || Object.keys(role).length === 0) {
+    if (Object.keys(role || {}).length === 0) {
       throw err
     }
   }
diff --git a/packages/server/src/api/controllers/role.ts b/packages/server/src/api/controllers/role.ts
index ffc1d74209..b3eb61a255 100644
--- a/packages/server/src/api/controllers/role.ts
+++ b/packages/server/src/api/controllers/role.ts
@@ -35,20 +35,21 @@ async function updateRolesOnUserTable(
 ) {
   const table = await sdk.tables.getTable(InternalTables.USER_METADATA)
   const constraints = table.schema.roleId?.constraints
-  if (constraints) {
-    const updatedRoleId =
-      roleVersion === roles.RoleIDVersion.NAME
-        ? roles.getExternalRoleID(roleId, roleVersion)
-        : roleId
-    const indexOfRoleId = constraints.inclusion!.indexOf(updatedRoleId)
-    const remove = updateOption === UpdateRolesOptions.REMOVED
-    if (remove && indexOfRoleId !== -1) {
-      constraints.inclusion!.splice(indexOfRoleId, 1)
-    } else if (!remove && indexOfRoleId === -1) {
-      constraints.inclusion!.push(updatedRoleId)
-    }
-    await db.put(table)
+  if (!constraints) {
+    return
   }
+  const updatedRoleId =
+    roleVersion === roles.RoleIDVersion.NAME
+      ? roles.getExternalRoleID(roleId, roleVersion)
+      : roleId
+  const indexOfRoleId = constraints.inclusion!.indexOf(updatedRoleId)
+  const remove = updateOption === UpdateRolesOptions.REMOVED
+  if (remove && indexOfRoleId !== -1) {
+    constraints.inclusion!.splice(indexOfRoleId, 1)
+  } else if (!remove && indexOfRoleId === -1) {
+    constraints.inclusion!.push(updatedRoleId)
+  }
+  await db.put(table)
 }
 
 export async function fetch(ctx: UserCtx<void, FetchRolesResponse>) {