simplified environment authority fetch

keyshade-xyz · Dec 31, 2024 · 2a9d188 · 2a9d188
1 parent 62c5751
commit 2a9d188
Showing 1 changed file with 10 additions and 27 deletions.
diff --git a/apps/api/src/common/collective-authorities.ts b/apps/api/src/common/collective-authorities.ts
@@ -118,28 +118,17 @@ export const getCollectiveEnvironmentAuthorities = async (
         workspaceMember: {
           userId,
           workspaceId: environment.project.workspaceId
-        }
-      },
-      select: {
+        },
         role: {
-          select: {
-            authorities: true
-          }
-        }
-      }
-    })
-
-  if (projectRoleAssociations.length === 0) {
-    return authorities
-  }
-
-  const environmentRoleAssociations =
-    await prisma.projectWorkspaceRoleAssociation.findMany({
-      where: {
-        projectId: environment.project.id,
-        environments: {
-          some: {
-            id: environment.id
+          projects: {
+            some: {
+              projectId: environment.project.id,
+              environments: {
+                some: {
+                  id: environment.id
+                }
+              }
+            }
           }
         }
       },
@@ -158,11 +147,5 @@ export const getCollectiveEnvironmentAuthorities = async (
     })
   })
 
-  environmentRoleAssociations.forEach((roleAssociation) => {
-    roleAssociation.role.authorities.forEach((authority) => {
-      authorities.add(authority)
-    })
-  })
-
   return authorities
 }