simstudioai · waleedlatif1 · Jun 23, 2025 · Jun 23, 2025 · Jun 23, 2025 · Jun 23, 2025
diff --git a/apps/sim/app/api/workflows/[id]/deploy/route.test.ts b/apps/sim/app/api/workflows/[id]/deploy/route.test.ts
@@ -10,22 +10,18 @@ describe('Workflow Deployment API Route', () => {
   beforeEach(() => {
     vi.resetModules()
 
-    // Mock utils
     vi.doMock('@/lib/utils', () => ({
       generateApiKey: vi.fn().mockReturnValue('sim_testkeygenerated12345'),
     }))
 
-    // Mock UUID generation
     vi.doMock('uuid', () => ({
       v4: vi.fn().mockReturnValue('mock-uuid-1234'),
     }))
 
-    // Mock crypto for request ID
     vi.stubGlobal('crypto', {
       randomUUID: vi.fn().mockReturnValue('mock-request-id'),
     })
 
-    // Mock logger
     vi.doMock('@/lib/logs/console-logger', () => ({
       createLogger: vi.fn().mockReturnValue({
         debug: vi.fn(),
@@ -35,7 +31,6 @@ describe('Workflow Deployment API Route', () => {
       }),
     }))
 
-    // Mock the middleware to pass validation
     vi.doMock('../../middleware', () => ({
       validateWorkflowAccess: vi.fn().mockResolvedValue({
         workflow: {
@@ -45,7 +40,6 @@ describe('Workflow Deployment API Route', () => {
       }),
     }))
 
-    // Mock the response utils
     vi.doMock('../../utils', () => ({
       createSuccessResponse: vi.fn().mockImplementation((data) => {
         return new Response(JSON.stringify(data), {
@@ -70,7 +64,6 @@ describe('Workflow Deployment API Route', () => {
    * Test GET deployment status
    */
   it('should fetch deployment info successfully', async () => {
-    // Mock the database with proper workflow data
     vi.doMock('@/db', () => ({
       db: {
         select: vi.fn().mockReturnValue({
@@ -89,25 +82,18 @@ describe('Workflow Deployment API Route', () => {
       },
     }))
 
-    // Create a mock request
     const req = createMockRequest('GET')
 
-    // Create params similar to what Next.js would provide
     const params = Promise.resolve({ id: 'workflow-id' })
 
-    // Import the handler after mocks are set up
     const { GET } = await import('./route')
 
-    // Call the handler
     const response = await GET(req, { params })
 
-    // Check response
     expect(response.status).toBe(200)
 
-    // Parse the response body
     const data = await response.json()
 
-    // Verify response structure
     expect(data).toHaveProperty('isDeployed', false)
     expect(data).toHaveProperty('apiKey', null)
     expect(data).toHaveProperty('deployedAt', null)
@@ -118,7 +104,6 @@ describe('Workflow Deployment API Route', () => {
    * This should generate a new API key
    */
   it('should create new API key when deploying workflow for user with no API key', async () => {
-    // Mock DB for this test
     const mockInsert = vi.fn().mockReturnValue({
       values: vi.fn().mockReturnValue(undefined),
     })
@@ -156,30 +141,22 @@ describe('Workflow Deployment API Route', () => {
       },
     }))
 
-    // Create a mock request
     const req = createMockRequest('POST')
 
-    // Create params
     const params = Promise.resolve({ id: 'workflow-id' })
 
-    // Import required modules after mocks are set up
     const { POST } = await import('./route')
 
-    // Call the handler
     const response = await POST(req, { params })
 
-    // Check response
     expect(response.status).toBe(200)
 
-    // Parse the response body
     const data = await response.json()
 
-    // Verify API key was generated
     expect(data).toHaveProperty('apiKey', 'sim_testkeygenerated12345')
     expect(data).toHaveProperty('isDeployed', true)
     expect(data).toHaveProperty('deployedAt')
 
-    // Verify database calls
     expect(mockInsert).toHaveBeenCalled()
     expect(mockUpdate).toHaveBeenCalled()
   })
@@ -189,7 +166,6 @@ describe('Workflow Deployment API Route', () => {
    * This should use the existing API key
    */
   it('should use existing API key when deploying workflow', async () => {
-    // Mock DB for this test
     const mockInsert = vi.fn()
 
     const mockUpdate = vi.fn().mockReturnValue({
@@ -229,29 +205,21 @@ describe('Workflow Deployment API Route', () => {
       },
     }))
 
-    // Create a mock request
     const req = createMockRequest('POST')
 
-    // Create params
     const params = Promise.resolve({ id: 'workflow-id' })
 
-    // Import required modules after mocks are set up
     const { POST } = await import('./route')
 
-    // Call the handler
     const response = await POST(req, { params })
 
-    // Check response
     expect(response.status).toBe(200)
 
-    // Parse the response body
     const data = await response.json()
 
-    // Verify existing API key was used
     expect(data).toHaveProperty('apiKey', 'sim_existingtestapikey12345')
     expect(data).toHaveProperty('isDeployed', true)
 
-    // Verify database calls - should NOT have inserted a new API key
     expect(mockInsert).not.toHaveBeenCalled()
     expect(mockUpdate).toHaveBeenCalled()
   })
@@ -260,7 +228,6 @@ describe('Workflow Deployment API Route', () => {
    * Test DELETE undeployment
    */
   it('should undeploy workflow successfully', async () => {
-    // Mock the DB for this test
     const mockUpdate = vi.fn().mockReturnValue({
       set: vi.fn().mockReturnValue({
         where: vi.fn().mockResolvedValue([{ id: 'workflow-id' }]),
@@ -273,38 +240,29 @@ describe('Workflow Deployment API Route', () => {
       },
     }))
 
-    // Create a mock request
     const req = createMockRequest('DELETE')
 
-    // Create params
     const params = Promise.resolve({ id: 'workflow-id' })
 
-    // Import the handler after mocks are set up
     const { DELETE } = await import('./route')
 
-    // Call the handler
     const response = await DELETE(req, { params })
 
-    // Check response
     expect(response.status).toBe(200)
 
-    // Parse the response body
     const data = await response.json()
 
-    // Verify response structure
     expect(data).toHaveProperty('isDeployed', false)
     expect(data).toHaveProperty('deployedAt', null)
     expect(data).toHaveProperty('apiKey', null)
 
-    // Verify database calls
     expect(mockUpdate).toHaveBeenCalled()
   })
 
   /**
    * Test error handling
    */
   it('should handle errors when workflow is not found', async () => {
-    // Mock middleware to simulate an error
     vi.doMock('../../middleware', () => ({
       validateWorkflowAccess: vi.fn().mockResolvedValue({
         error: {
@@ -314,33 +272,25 @@ describe('Workflow Deployment API Route', () => {
       }),
     }))
 
-    // Create a mock request
     const req = createMockRequest('POST')
 
-    // Create params with an invalid ID
     const params = Promise.resolve({ id: 'invalid-id' })
 
-    // Import the handler after mocks are set up
     const { POST } = await import('./route')
 
-    // Call the handler
     const response = await POST(req, { params })
 
-    // Check response
     expect(response.status).toBe(404)
 
-    // Parse the response body
     const data = await response.json()
 
-    // Verify error message
     expect(data).toHaveProperty('error', 'Workflow not found')
   })
 
   /**
    * Test unauthorized access
    */
   it('should handle unauthorized access to workflow', async () => {
-    // Mock middleware to simulate unauthorized access
     vi.doMock('../../middleware', () => ({
       validateWorkflowAccess: vi.fn().mockResolvedValue({
         error: {
@@ -350,25 +300,18 @@ describe('Workflow Deployment API Route', () => {
       }),
     }))
 
-    // Create a mock request
     const req = createMockRequest('POST')
 
-    // Create params
     const params = Promise.resolve({ id: 'workflow-id' })
 
-    // Import the handler after mocks are set up
     const { POST } = await import('./route')
 
-    // Call the handler
     const response = await POST(req, { params })
 
-    // Check response
     expect(response.status).toBe(403)
 
-    // Parse the response body
     const data = await response.json()
 
-    // Verify error message
     expect(data).toHaveProperty('error', 'Unauthorized access')
   })
 })
diff --git a/apps/sim/app/api/workflows/[id]/variables/route.ts b/apps/sim/app/api/workflows/[id]/variables/route.ts
@@ -9,7 +9,6 @@ import type { Variable } from '@/stores/panel/variables/types'
 
 const logger = createLogger('WorkflowVariablesAPI')
 
-// Schema for workflow variables updates
 const VariablesSchema = z.object({
   variables: z.array(
     z.object({

diff --git a/apps/sim/app/api/workspaces/[id]/permissions/route.ts b/apps/sim/app/api/workspaces/[id]/permissions/route.ts
@@ -1,10 +1,10 @@
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { getUsersWithPermissions } from '@/lib/permissions/utils'
 import { db } from '@/db'
-import { permissions, type permissionTypeEnum, user, workspaceMember } from '@/db/schema'
+import { permissions, type permissionTypeEnum, workspaceMember } from '@/db/schema'
 
-// Extract the enum type from Drizzle schema
 type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
 
 interface UpdatePermissionsRequest {
@@ -14,31 +14,6 @@ interface UpdatePermissionsRequest {
   }>
 }
 
-// Helper function to fetch users with permissions for a workspace
-async function getUsersWithPermissions(workspaceId: string) {
-  const usersWithPermissions = await db
-    .select({
-      userId: user.id,
-      email: user.email,
-      name: user.name,
-      image: user.image,
-      permissionType: permissions.permissionType,
-    })
-    .from(permissions)
-    .innerJoin(user, eq(permissions.userId, user.id))
-    .where(and(eq(permissions.entityType, 'workspace'), eq(permissions.entityId, workspaceId)))
-    .orderBy(user.email)
-
-  // Since each user has only one permission, we can use the results directly
-  return usersWithPermissions.map((row) => ({
-    userId: row.userId,
-    email: row.email,
-    name: row.name,
-    image: row.image,
-    permissionType: row.permissionType,
-  }))
-}
-
 /**
  * GET /api/workspaces/[id]/permissions
  *

diff --git a/apps/sim/app/api/workspaces/invitations/route.ts b/apps/sim/app/api/workspaces/invitations/route.ts
@@ -22,7 +22,6 @@ export const dynamic = 'force-dynamic'
 const logger = createLogger('WorkspaceInvitationsAPI')
 const resend = env.RESEND_API_KEY ? new Resend(env.RESEND_API_KEY) : null
 
-// Define the permission type
 type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
 
 // Get all invitations for the user's workspaces

diff --git a/apps/sim/app/api/workspaces/members/route.ts b/apps/sim/app/api/workspaces/members/route.ts
@@ -1,51 +1,12 @@
 import { and, eq } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { hasAdminPermission } from '@/lib/permissions/utils'
 import { db } from '@/db'
 import { permissions, type permissionTypeEnum, user, workspaceMember } from '@/db/schema'
 
-// Extract the enum type from Drizzle schema
 type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
 
-/**
- * Helper function to check if a user has admin permission for a workspace
- */
-async function hasAdminPermission(userId: string, workspaceId: string): Promise<boolean> {
-  const result = await db
-    .select()
-    .from(permissions)
-    .where(
-      and(
-        eq(permissions.userId, userId),
-        eq(permissions.entityType, 'workspace'),
-        eq(permissions.entityId, workspaceId),
-        eq(permissions.permissionType, 'admin')
-      )
-    )
-    .limit(1)
-
-  return result.length > 0
-}
-
-/**
- * Helper function to create default permissions for a new member
- */
-async function createMemberPermissions(
-  userId: string,
-  workspaceId: string,
-  memberPermission: PermissionType = 'read'
-): Promise<void> {
-  await db.insert(permissions).values({
-    id: crypto.randomUUID(),
-    userId,
-    entityType: 'workspace' as const,
-    entityId: workspaceId,
-    permissionType: memberPermission,
-    createdAt: new Date(),
-    updatedAt: new Date(),
-  })
-}
-
 // Add a member to a workspace
 export async function POST(req: Request) {
   const session = await getSession()

diff --git a/.../app/w/[id]/components/control-bar/components/deployment-controls/deployment-controls.tsx b/.../app/w/[id]/components/control-bar/components/deployment-controls/deployment-controls.tsx
@@ -66,7 +66,7 @@ export function DeploymentControls({
 
   const getTooltipText = () => {
     if (!canDeploy) {
-      return 'Admin permissions required to deploy workflows as API'
+      return 'Admin permissions required to deploy workflows'
     }
     if (isDeploying) {
       return 'Deploying...'