Skip to content

fix(custom-blocks): dedupe redundant workspace lookup in POST admin check #5429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 1 commit into from
Jul 5, 2026
+5 −9
Merged

fix(custom-blocks): dedupe redundant workspace lookup in POST admin check #5429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions apps/sim/app/api/custom-blocks/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ import {
listCustomBlocksWithInputs,
publishCustomBlock,
} from '@/lib/workflows/custom-blocks/operations'
import {
checkWorkspaceAccess,
getWorkspaceWithOwner,
hasWorkspaceAdminAccess,
} from '@/lib/workspaces/permissions/utils'
import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'

const logger = createLogger('CustomBlocksAPI')

Expand Down Expand Up @@ -84,18 +80,18 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
const userId = session.user.id
const { workspaceId, workflowId, name, description, iconUrl, exposedOutputs } = parsed.data.body

if (!(await hasWorkspaceAdminAccess(userId, workspaceId))) {
const access = await checkWorkspaceAccess(workspaceId, userId)
if (!access.canAdmin) {
return NextResponse.json({ error: 'Admin permissions required' }, { status: 403 })
}

const ws = await getWorkspaceWithOwner(workspaceId)
if (!ws?.organizationId) {
const organizationId = access.workspace?.organizationId
if (!organizationId) {
return NextResponse.json(
{ error: 'Publishing a block requires the workspace to belong to an organization' },
{ status: 400 }
)
}
const organizationId = ws.organizationId

if (!(await isFeatureEnabled('deploy-as-block', { userId, orgId: organizationId }))) {
return NextResponse.json({ error: 'Deploy as block is not enabled' }, { status: 403 })
Expand Down
Loading