Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🫸 fix: Stop OAuth Sign-In After Binding Failure (#15652)

aeyeopsdevbfaecf131b85
diff --git a/client/src/components/Chat/Messages/Content/ToolCall.tsx b/client/src/components/Chat/Messages/Content/ToolCall.tsx
index 59278dcf6f..ee14b6971e 100644
--- a/client/src/components/Chat/Messages/Content/ToolCall.tsx
+++ b/client/src/components/Chat/Messages/Content/ToolCall.tsx
@@ -53,6 +53,7 @@ export default function ToolCall({
runStepDurationMs?: PartMetadata['runStepDurationMs'];
}) {
const localize = useLocalize();
+ const [oauthError, setOAuthError] = useState<string | null>(null);
const autoExpand = useRecoilValue(store.autoExpandTools);
const hasOutput = (output?.length ?? 0) > 0;
const [showInfo, setShowInfo] = useState(() => autoExpand && hasOutput);
@@ -142,6 +143,7 @@ export default function ToolCall({
if (!auth) {
return;
}
+ setOAuthError(null);
try {
if (isMCPToolCall && mcpServerName) {
await dataService.bindMCPOAuth(mcpServerName);
@@ -150,9 +152,11 @@ export default function ToolCall({
}
} catch (e) {
logger.error('Failed to bind OAuth CSRF cookie', e);
+ setOAuthError(localize('com_ui_oauth_error_generic'));
+ return;
}
window.open(auth, '_blank', 'noopener,noreferrer');
- }, [auth, isMCPToolCall, mcpServerName, actionId]);
+ }, [auth, isMCPToolCall, mcpServerName, actionId, localize]);
const hasError = (typeof output === 'string' && isError(output)) || runStepStatus === 'failed';
/**
@@ -337,6 +341,11 @@ export default function ToolCall({
{localize('com_ui_sign_in_to_domain', { 0: authDomain })}
</Button>
</div>
+ {oauthError && (
+ <p role="alert" className="text-sm text-text-destructive">
+ {oauthError}
+ </p>
+ )}
<ToolAuthWarning />
</div>
)}