github-starred/better-auth
2
0
Fork 0
mirror of https://github.com/better-auth/better-auth.git synced 2026-05-23 23:52:05 -05:00
Code Issues 2.5k Packages Projects Releases 112 Wiki Activity

[BUG] MCP OAuth flow drops activeOrganizationId from session #2895

New Issue
Closed
opened 2026-03-13 10:26:07 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-03-13 10:26:07 -05:00
Owner
Copy Link

Originally created by @Bekacru on GitHub (Feb 19, 2026).

Bug Report

When a user goes through the MCP OAuth flow, the activeOrganizationId from their browser session is dropped.

Root Cause

In authorizeMCPOAuth (packages/better-auth/src/plugins/mcp/authorize.ts), the verification value is created but only stores userId:

await ctx.context.internalAdapter.createVerificationValue({
    value: JSON.stringify({
        clientId: client.clientId,
        redirectURI: query.redirect_uri,
        scope: requestScope,
        userId: session.user.id,  // ← org is lost here
        authTime: new Date(session.session.createdAt).getTime(),
        // ...
    }),
    identifier: code,
    expiresAt,
});

The activeOrganizationId from session.session.activeOrganizationId needs to be captured and stored in the verification value so it can be restored when the token is issued.

Expected Behavior

The active organization context should be preserved through the OAuth flow, similar to how the OIDC Provider plugin handles organization sessions.

Affected File

packages/better-auth/src/plugins/mcp/authorize.ts

Originally created by @Bekacru on GitHub (Feb 19, 2026). ## Bug Report When a user goes through the MCP OAuth flow, the `activeOrganizationId` from their browser session is dropped. ### Root Cause In `authorizeMCPOAuth` (`packages/better-auth/src/plugins/mcp/authorize.ts`), the verification value is created but only stores `userId`: ```javascript await ctx.context.internalAdapter.createVerificationValue({ value: JSON.stringify({ clientId: client.clientId, redirectURI: query.redirect_uri, scope: requestScope, userId: session.user.id, // ← org is lost here authTime: new Date(session.session.createdAt).getTime(), // ... }), identifier: code, expiresAt, }); ``` The `activeOrganizationId` from `session.session.activeOrganizationId` needs to be captured and stored in the verification value so it can be restored when the token is issued. ### Expected Behavior The active organization context should be preserved through the OAuth flow, similar to how the OIDC Provider plugin handles organization sessions. ### Affected File `packages/better-auth/src/plugins/mcp/authorize.ts`
GiteaMirror added the P0bug labels 2026-03-13 10:26:07 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
adapter
astro
awaiting external contributor
blocked
breaking
breaking change
bug
c-devops
core
credentials
database
dependencies
devops
devtools
docs
documentation
duplicate
elysia
enhancement
enterprise
expo
express
fastify
good first issue
help wanted
hono
identity
infra
integration
invalid
javascript
locked
maintenance
need-more-information
needs: info
needs: repro
nextjs
nuxt
oauth
organization
P0
payments
perf
platform
plugin
pull-request
Mirrored from GitHub Pull Request
 question
ready
regression
remix
security
social-provider
solid
stale
svelte
tanstack-start
tracking
version-bump
vue
wontfix
No Label bug P0
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/better-auth#2895
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?