Skip to content

feat: make resource optional in MCP endpoint OAuth flow#5267

Merged
saifsmailbox98 merged 2 commits intomainfrom
devin/1769369953-make-mcp-resource-optional
Jan 25, 2026
Merged

feat: make resource optional in MCP endpoint OAuth flow#5267
saifsmailbox98 merged 2 commits intomainfrom
devin/1769369953-make-mcp-resource-optional

Conversation

@devin-ai-integration
Copy link
Contributor

@devin-ai-integration devin-ai-integration bot commented Jan 25, 2026 •
edited
Loading

Context

When connecting to Infisical's MCP server/endpoint, the resource parameter was required in the OAuth authorization and finalize endpoints. This caused issues for MCP clients that don't provide this parameter.

After investigation, the resource field is not actually used in the backend service logic (ai-mcp-endpoint-service.ts) - it's accepted but never processed. This PR makes resource optional across the entire OAuth flow to improve compatibility with MCP clients.

Note: The resource parameter was already optional in the token exchange endpoint, so this change makes the API more consistent.

Changes:

  • Backend router: Made resource optional in /oauth/authorize querystring and /oauth/finalize body schemas
  • Backend types: Made resource optional in TOAuthFinalizeDTO
  • Frontend types: Made resource optional in TFinalizeMcpEndpointOAuthDTO
  • Frontend route: Made resource optional in the finalize page query schema

Updates since last revision

  • Fixed prettier formatting in backend/src/db/sanitized-schema.ts (unrelated pre-existing lint issue in main branch)

Steps to verify the change

  1. Connect to an MCP endpoint without providing the resource parameter in the OAuth flow
  2. Verify the OAuth authorization and token exchange complete successfully
  3. Verify existing flows that do provide resource still work

Human Review Checklist

  • Confirm resource is not used in ai-mcp-endpoint-service.ts (grep shows no matches)
  • Verify this aligns with MCP/OAuth specifications for the resource parameter

Type

  • Fix
  • Feature
  • Improvement
  • Breaking
  • Docs
  • Chore

Checklist

Link to Devin run: https://app.devin.ai/sessions/02e7702a7b53445c94c6d6b0519aa6ef
Requested by: Saifur Rahman (saif@infisical.com)

@devin-ai-integration
feat: make resource optional in MCP endpoint OAuth flow
91602f3 
Co-Authored-By: saif@infisical.com <saif@infisical.com>
@devin-ai-integration
Copy link
Contributor Author

devin-ai-integration bot commented Jan 25, 2026

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment and CI monitoring

@maidul98
Copy link
Collaborator

maidul98 commented Jan 25, 2026 •
edited
Loading

✅ Snyk checks have passed. No issues have been found so far.

Status Scanner Critical High Medium Low Total (0)
✅ Open Source Security 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@greptile-apps
Copy link
Contributor

greptile-apps bot commented Jan 25, 2026

Greptile Overview

Greptile Summary

This PR makes the resource parameter optional across the entire MCP endpoint OAuth flow to improve compatibility with MCP clients that don't provide this parameter.

Key changes:

  • Made resource optional in /oauth/authorize querystring schema
  • Made resource optional in /oauth/finalize body schema
  • Updated TypeScript type definitions in both backend and frontend
  • Aligns with the token exchange endpoint where resource was already optional

The change is backward-compatible and safe because:

  • The resource parameter is accepted but never used in the backend service logic (ai-mcp-endpoint-service.ts)
  • Existing clients that provide the parameter will continue to work
  • New clients that omit the parameter will now also work
  • Improves API consistency across OAuth endpoints

Confidence Score: 5/5

  • This PR is safe to merge with no risk
  • The change makes an unused parameter optional across the OAuth flow, improving compatibility with MCP clients. The resource parameter was verified to not be used anywhere in the service logic, and the token exchange endpoint already had this parameter as optional. This is a backward-compatible change that doesn't affect existing functionality.
  • No files require special attention

Important Files Changed

Filename Overview
backend/src/ee/routes/v1/ai-mcp-endpoint-router.ts Made resource parameter optional in OAuth authorize and finalize endpoints to match token endpoint
backend/src/ee/services/ai-mcp-endpoint/ai-mcp-endpoint-types.ts Made resource field optional in TOAuthFinalizeDTO type definition
frontend/src/hooks/api/aiMcpEndpoints/types.ts Made resource field optional in TFinalizeMcpEndpointOAuthDTO type
frontend/src/pages/organization/McpEndpointFinalizePage/route.tsx Made resource parameter optional in finalize page query schema

@saifsmailbox98 saifsmailbox98 self-requested a review January 25, 2026 19:47
saifsmailbox98
saifsmailbox98 requested changes Jan 25, 2026
View reviewed changes
Copy link
Contributor

@saifsmailbox98 saifsmailbox98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix formatting for sanitized-schema.ts using prettier

@devin-ai-integration
fix: format sanitized-schema.ts with prettier
bcf3e39 
Co-Authored-By: saif@infisical.com <saif@infisical.com>
@saifsmailbox98
Copy link
Contributor

saifsmailbox98 commented Jan 25, 2026

Your changes work well on local! You need to return the favor later.

image

@devin-ai-integration
Copy link
Contributor Author

devin-ai-integration bot commented Jan 25, 2026

Thanks for testing! Glad it works well. Happy to help with future tasks - just tag me anytime!

@saifsmailbox98
Copy link
Contributor

saifsmailbox98 commented Jan 25, 2026

LGTM!

@saifsmailbox98 saifsmailbox98 self-assigned this Jan 25, 2026
@saifsmailbox98 saifsmailbox98 merged commit a3bc183 into main Jan 25, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@saifsmailbox98 saifsmailbox98 saifsmailbox98 approved these changes

Assignees

@saifsmailbox98 saifsmailbox98

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@maidul98 @saifsmailbox98