Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

fix: Client OAuth async_auth_flow() method causing MCP-SDK self.context.lock error. (#2644)

Luke650b103dbf09
diff --git a/src/fastmcp/client/auth/oauth.py b/src/fastmcp/client/auth/oauth.py
index 2190b9a43..f638da5fd 100644
--- a/src/fastmcp/client/auth/oauth.py
+++ b/src/fastmcp/client/auth/oauth.py
@@ -298,13 +298,16 @@ class OAuth(OAuthClientProvider):
# First attempt with potentially cached credentials
gen = super().async_auth_flow(request)
response = None
- while True:
- try:
- # First iteration sends None, subsequent iterations send response
- yielded_request = await gen.asend(response) # ty: ignore[invalid-argument-type]
- response = yield yielded_request
- except StopAsyncIteration:
- break
+ try:
+ while True:
+ try:
+ # First iteration sends None, subsequent iterations send response
+ yielded_request = await gen.asend(response) # ty: ignore[invalid-argument-type]
+ response = yield yielded_request
+ except StopAsyncIteration:
+ break
+ finally:
+ await gen.aclose()
except ClientNotFoundError:
logger.debug(
@@ -317,9 +320,12 @@ class OAuth(OAuthClientProvider):
# Retry with fresh registration
gen = super().async_auth_flow(request)
response = None
- while True:
- try:
- yielded_request = await gen.asend(response) # ty: ignore[invalid-argument-type]
- response = yield yielded_request
- except StopAsyncIteration:
- break
+ try:
+ while True:
+ try:
+ yielded_request = await gen.asend(response) # ty: ignore[invalid-argument-type]
+ response = yield yielded_request
+ except StopAsyncIteration:
+ break
+ finally:
+ await gen.aclose()