fix: prevent OAuth race condition causing auth failures#70
Merged
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 047e86e880
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
047e86e to
f3c774e
Compare
Ensure waitForAuthorizationCode uses the same deferred created by redirectToAuthorization instead of creating a new one. If waitForAuthorizationCode is called before redirectToAuthorization has been invoked, it now waits for the redirect to be initiated before proceeding. This fixes the race condition where the OAuth callback could resolve a different promise than what the runtime was waiting on, causing authentication to fail with a timeout. Fixes openclaw#36
f3c774e to
cca61bb
Compare
Collaborator
|
Landed via temp rebase onto main.
Thanks @monotykamary! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes a race condition in the OAuth authorization flow that caused authentication to fail with a timeout error.
Problem
When authenticating with OAuth-based MCP servers (like Linear),
waitForAuthorizationCode()was creating a new deferred promise if one didn't exist. However,redirectToAuthorization()also creates a new deferred. If the SDK's OAuth flow calledwaitForAuthorizationCode()beforeredirectToAuthorization()completed, they would wait on different deferreds, causing the OAuth callback to resolve a promise that nothing was waiting on. This resulted in the authentication hanging until timeout.Solution
Changed
waitForAuthorizationCode()to wait forredirectToAuthorization()to be initiated before proceeding, rather than creating a new deferred. AredirectInitiatedDeferredis used to signal when the redirect has been initiated, allowingwaitForAuthorizationCode()to wait for it if called first. This ensures both methods always use the sameauthorizationDeferredpromise.Testing
mcporter auth linearnow properly waits for browser approvalFixes #36