refactor: role param name

colorstackorg · Oct 3, 2024 · b232b6e · b232b6e
1 parent 03a18b0
commit b232b6e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/admin-dashboard/app/routes/_dashboard.admins.tsx b/apps/admin-dashboard/app/routes/_dashboard.admins.tsx
@@ -48,7 +48,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
         row.id !== admin.id &&
         doesAdminHavePermission({
           minimumRole: row.role as AdminRole,
-          role: admin.role as AdminRole,
+          actorsRole: admin.role as AdminRole,
         }),
 
       isDeleted: !!deletedAt,

diff --git a/apps/admin-dashboard/app/shared/session.server.ts b/apps/admin-dashboard/app/shared/session.server.ts
@@ -117,7 +117,7 @@ export async function getAuthenticationStatus(
 
   const hasPermission = doesAdminHavePermission({
     minimumRole: options.minimumRole || 'admin',
-    role: admin.role as AdminRole,
+    actorsRole: admin.role as AdminRole,
   });
 
   if (!hasPermission) {

diff --git a/packages/core/src/modules/admin/admin.core.ts b/packages/core/src/modules/admin/admin.core.ts
@@ -107,7 +107,7 @@ export async function addAdmin({
 
   const hasPermission = doesAdminHavePermission({
     minimumRole: role,
-    role: actingAdmin.role as AdminRole,
+    actorsRole: actingAdmin.role as AdminRole,
   });
 
   if (!hasPermission) {
@@ -199,7 +199,7 @@ export async function removeAdmin({
 
   const hasPermission = doesAdminHavePermission({
     minimumRole: adminToRemove.role as AdminRole,
-    role: actingAdmin.role as AdminRole,
+    actorsRole: actingAdmin.role as AdminRole,
   });
 
   if (!hasPermission) {
@@ -222,15 +222,15 @@ export async function removeAdmin({
 
 type DoesAdminHavePermissionInput = {
   minimumRole: AdminRole;
-  role: AdminRole;
+  actorsRole: AdminRole;
 };
 
 /**
  * Returns whether or not the given admin has the required role to perform the
  * action.
  *
  * @param minimumRole - The minimum role required to perform the action.
- * @param role - The role of the acting admin.
+ * @param actorsRole - The role of the acting admin.
  *
  * @example
  * ```ts
@@ -261,12 +261,12 @@ type DoesAdminHavePermissionInput = {
  */
 export function doesAdminHavePermission({
   minimumRole,
-  role,
+  actorsRole,
 }: DoesAdminHavePermissionInput) {
   const roles = [AdminRole.AMBASSADOR, AdminRole.ADMIN, AdminRole.OWNER];
 
   const minimumRoleIndex = roles.indexOf(minimumRole);
-  const roleIndex = roles.indexOf(role);
+  const roleIndex = roles.indexOf(actorsRole);
 
   return roleIndex >= minimumRoleIndex;
 }