Skip to content

[Fix] Linear session resumes with the wrong authorized account #889

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
mrubens merged 2 commits into from
Jul 29, 2026
Merged

[Fix] Linear session resumes with the wrong authorized account #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a641f0e
fix(web): bind Linear OAuth replay to saved identity
mrubens Jul 29, 2026
0296736
fix(web): preserve Linear links during OAuth replay
mrubens Jul 29, 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
36 changes: 28 additions & 8 deletions apps/web/src/app/api/mcp-oauth/callback/__tests__/route.test.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions apps/web/src/app/api/mcp-oauth/callback/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ import { authorize } from '@/lib/server';
import { bootstrapWebRuntimeEnv } from '@/lib/server/bootstrap-runtime-env';
import { getPublicAppUrl } from '@/lib/server/get-public-app-url';
import { logger } from '@/lib/server/logger';
import { hydrateLinearMcpConnectionAfterOauth } from '@/lib/server/mcp-linear';
import {
hydrateLinearMcpConnectionAfterOauth,
LinearReplayIdentityMismatchError,
} from '@/lib/server/mcp-linear';
import type {
McpOAuthErrorReason,
McpOAuthResult,
Expand Down Expand Up @@ -317,17 +320,17 @@ export async function GET(request: NextRequest) {
redirectUri,
);

failureStage = 'token_storage';
await storeTokens(resolvedConnectionId, tokens);

if (integration.id === 'linear') {
failureStage = 'linear_metadata';
await hydrateLinearMcpConnectionAfterOauth({
connection,
accessToken: tokens.access_token,
tokens,
replayToken: oauthState.replayToken,
enabledByUserId: userId,
});
} else {
failureStage = 'token_storage';
await storeTokens(resolvedConnectionId, tokens);
}

if (requiresOrgAdmin) {
Expand Down Expand Up @@ -365,7 +368,7 @@ export async function GET(request: NextRequest) {
'MCP OAuth callback failed',
);

if (connectionId) {
if (connectionId && !(error instanceof LinearReplayIdentityMismatchError)) {
try {
await updateAuthStatus(connectionId, 'error');
} catch (statusError) {
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/app/api/mcp-oauth/replay/[token]/__tests__/route.test.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions apps/web/src/app/api/mcp-oauth/replay/[token]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ export async function GET(
mcpConnections.connectionRole,
],
set: {
userId: targetUserId,
authConfig: null,
enabled: false,
authStatus: 'pending',
updatedAt: new Date(),
},
})
Expand Down
139 changes: 139 additions & 0 deletions apps/web/src/lib/server/mcp-linear.test.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading