perf(credentials): eliminate redundant permissions query

Derive memberUserIds from wsPermissionRows + workspace owner instead
of calling getWorkspaceMemberUserIds separately. This removes a
duplicate query on the permissions table at every call site.

Author: minijeong-log

apps/sim/app/api/credentials/route.ts

@@ -22,7 +22,6 @@ import {
   normalizeAtlassianDomain,
   validateAtlassianServiceAccount,
 } from '@/lib/credentials/atlassian-service-account'
-import { getWorkspaceMemberUserIds } from '@/lib/credentials/environment'
 import { syncWorkspaceOAuthCredentialsForUser } from '@/lib/credentials/oauth'
 import { getServiceConfigByProviderId } from '@/lib/oauth'
 import {
@@ -535,18 +534,18 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       })
 
       if ((type === 'env_workspace' || type === 'service_account') && workspaceRow?.ownerId) {
-        const [workspaceUserIds, wsPermissionRows] = await Promise.all([
-          getWorkspaceMemberUserIds(workspaceId),
-          db
-            .select({ userId: permissions.userId, permissionType: permissions.permissionType })
-            .from(permissions)
-            .where(
-              and(eq(permissions.entityType, 'workspace'), eq(permissions.entityId, workspaceId))
-            ),
-        ])
+        const wsPermissionRows = await db
+          .select({ userId: permissions.userId, permissionType: permissions.permissionType })
+          .from(permissions)
+          .where(
+            and(eq(permissions.entityType, 'workspace'), eq(permissions.entityId, workspaceId))
+          )
         const wsPermissionByUser = new Map(
           wsPermissionRows.map((row) => [row.userId, row.permissionType])
         )
+        const workspaceUserIds = Array.from(
+          new Set([workspaceRow.ownerId, ...wsPermissionRows.map((row) => row.userId)])
+        )
         if (workspaceUserIds.length > 0) {
           for (const memberUserId of workspaceUserIds) {
             const wsPermission = wsPermissionByUser.get(memberUserId)

apps/sim/lib/credentials/environment.ts

@@ -128,13 +128,12 @@ export async function syncWorkspaceEnvCredentials(params: {
   actingUserId: string
 }) {
   const { workspaceId, envKeys, actingUserId } = params
-  const [[workspaceRow], memberUserIds, wsPermissionRows] = await Promise.all([
+  const [[workspaceRow], wsPermissionRows] = await Promise.all([
     db
       .select({ ownerId: workspace.ownerId })
       .from(workspace)
       .where(eq(workspace.id, workspaceId))
       .limit(1),
-    getWorkspaceMemberUserIds(workspaceId),
     db
       .select({ userId: permissions.userId, permissionType: permissions.permissionType })
       .from(permissions)
@@ -146,6 +145,9 @@ export async function syncWorkspaceEnvCredentials(params: {
   const wsPermissionByUser = new Map(
     wsPermissionRows.map((row) => [row.userId, row.permissionType])
   )
+  const memberUserIds = Array.from(
+    new Set([workspaceRow.ownerId, ...wsPermissionRows.map((row) => row.userId)])
+  )
 
   const normalizedKeys = Array.from(new Set(envKeys.filter(Boolean)))
   const existingCredentials = await db
@@ -231,13 +233,12 @@ export async function createWorkspaceEnvCredentials(params: {
   const keys = Array.from(new Set(newKeys.filter(Boolean)))
   if (keys.length === 0) return
 
-  const [[workspaceRow], memberUserIds, wsPermissionRows] = await Promise.all([
+  const [[workspaceRow], wsPermissionRows] = await Promise.all([
     db
       .select({ ownerId: workspace.ownerId })
       .from(workspace)
       .where(eq(workspace.id, workspaceId))
       .limit(1),
-    getWorkspaceMemberUserIds(workspaceId),
     db
       .select({ userId: permissions.userId, permissionType: permissions.permissionType })
       .from(permissions)
@@ -250,6 +251,9 @@ export async function createWorkspaceEnvCredentials(params: {
   const wsPermissionByUser = new Map(
     wsPermissionRows.map((row) => [row.userId, row.permissionType])
   )
+  const memberUserIds = Array.from(
+    new Set([ownerUserId, ...wsPermissionRows.map((row) => row.userId)])
+  )
   const now = new Date()
   const createdIds: string[] = []