Skip to content

improvement(timeouts): files/base64 should use max timeouts + auth centralization #3179

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
icecrasher321 merged 8 commits into from
Feb 10, 2026
Merged

improvement(timeouts): files/base64 should use max timeouts + auth centralization #3179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8902752
improvement(timeouts): files/base64 should use max timeouts
icecrasher321 Feb 10, 2026
0ff7e57
fix(billing): attribute cost to caller when info available"
icecrasher321 Feb 10, 2026
908f7ea
remove owner reference in billing
icecrasher321 Feb 10, 2026
b9171fa
fix auth
icecrasher321 Feb 10, 2026
c0b7ec0
update tests
icecrasher321 Feb 10, 2026
b7aa96c
fix return code
icecrasher321 Feb 10, 2026
c4d51ef
use shared types
icecrasher321 Feb 10, 2026
ab695c8
fix bugbot comment
icecrasher321 Feb 10, 2026
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
Prev Previous commit
Next Next commit
use shared types
  • Loading branch information
@icecrasher321
icecrasher321 committed Feb 10, 2026
commit c4d51efc09074f74a54379b501c91ae99e2f86ec
6 changes: 3 additions & 3 deletions apps/sim/app/api/a2a/serve/[agentId]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
isTerminalState,
parseWorkflowSSEChunk,
} from '@/lib/a2a/utils'
import { checkHybridAuth } from '@/lib/auth/hybrid'
import { type AuthResult, checkHybridAuth } from '@/lib/auth/hybrid'
import { acquireLock, getRedisClient, releaseLock } from '@/lib/core/config/redis'
import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
import { SSE_HEADERS } from '@/lib/core/utils/sse'
Expand Down Expand Up @@ -194,8 +194,8 @@ export async function POST(request: NextRequest, { params }: { params: Promise<R
const authSchemes = (agent.authentication as { schemes?: string[] })?.schemes || []
const requiresAuth = !authSchemes.includes('none')
let authenticatedUserId: string | null = null
let authenticatedAuthType: 'session' | 'api_key' | 'internal_jwt' | undefined
let authenticatedApiKeyType: 'personal' | 'workspace' | undefined
let authenticatedAuthType: AuthResult['authType']
let authenticatedApiKeyType: AuthResult['apiKeyType']

if (requiresAuth) {
const auth = await checkHybridAuth(request, { requireWorkflowId: false })
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/api/mcp/serve/[serverId]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { workflow, workflowMcpServer, workflowMcpTool } from '@sim/db/schema'
import { createLogger } from '@sim/logger'
import { and, eq } from 'drizzle-orm'
import { type NextRequest, NextResponse } from 'next/server'
import { checkHybridAuth } from '@/lib/auth/hybrid'
import { type AuthResult, checkHybridAuth } from '@/lib/auth/hybrid'
import { generateInternalToken } from '@/lib/auth/internal'
import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
import { getBaseUrl } from '@/lib/core/utils/urls'
Expand All @@ -34,7 +34,7 @@ interface RouteParams {
}

interface ExecuteAuthContext {
authType?: 'session' | 'api_key' | 'internal_jwt'
authType?: AuthResult['authType']
userId: string
apiKey?: string | null
}
Expand Down