fix: Implement a CredentialStore for auth #5741
Open
Conversation
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
alexhancock
requested review from
Copilot and
jamadeo
and removed request for
Copilot
alexhancock
commented
Nov 14, 2025
| [workspace.dependencies] | ||
| rmcp = { version = "0.8.5", features = ["schemars", "auth"] } | ||
| # rmcp = { version = "0.8.5", features = ["schemars", "auth"] } | ||
| rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", features = ["schemars", "auth"], branch = "alexhancock/credential-store" } |
Collaborator
Author
There was a problem hiding this comment.
- Will need to remove this once feat(auth): CredentialStore trait modelcontextprotocol/rust-sdk#542 is merged and upgrade to 0.8.6
Copilot finished reviewing on behalf of
alexhancock
November 14, 2025 18:11
alexhancock
force-pushed
the
alexhancock/credential-store
branch
from
6dc7144 to
d6cfc64
Compare
Copilot finished reviewing on behalf of
alexhancock
November 14, 2025 20:32
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR implements a credential store for OAuth authentication in Goose, enabling persistent storage of OAuth tokens and automatic token refresh. The implementation integrates with the rmcp SDK's new CredentialStore trait.
Key changes:
- Implements
GooseCredentialStorethat uses the Config system for secure credential storage - Updates OAuth flow to use the credential store for loading and saving tokens
- Adds
_metafield to Tool schema for MCP protocol compliance
Reviewed Changes
Copilot reviewed 11 out of 12 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| crates/goose/src/oauth/persist.rs | Implements GooseCredentialStore with async trait methods for load/save/clear operations using the Config system |
| crates/goose/src/oauth/mod.rs | Integrates credential store into OAuth flow for token persistence and refresh |
| crates/goose/src/agents/extension_manager.rs | Adds meta: None field to Tool construction for schema compatibility |
| crates/goose/Cargo.toml | Updates async-trait to 0.1.89 |
| crates/goose-server/Cargo.toml | Updates async-trait to 0.1.89 |
| crates/goose-mcp/Cargo.toml | Updates async-trait to 0.1.89 |
| crates/goose-cli/Cargo.toml | Updates async-trait to 0.1.89 |
| crates/goose-bench/Cargo.toml | Updates async-trait to 0.1.89 |
| Cargo.toml | Updates rmcp to use git branch with credential store support |
| Cargo.lock | Lock file updates for dependency changes |
| ui/desktop/openapi.json | Adds _meta field to Tool schema |
| ui/desktop/src/api/types.gen.ts | Generates TypeScript types for new _meta field |
crates/goose/src/oauth/mod.rs
Outdated
Comment on lines
101
to
102
| // Set the credential store on the manager we got from OAuthState | ||
| // The credentials were already saved during the exchange_code_for_token call |
There was a problem hiding this comment.
This comment is incorrect. Credentials haven't been saved yet because the OAuthState on line 79 was created without a credential store (second parameter is None). The old code explicitly called save_credentials() after handle_callback(), but that was removed. To fix this, pass Some(credential_store.clone()) as the second parameter to OAuthState::new() on line 79, or manually save credentials before this point. Otherwise, credentials obtained during the OAuth flow won't be persisted.
alexhancock
force-pushed
the
alexhancock/credential-store
branch
from
d6cfc64 to
2d395a2
Compare
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.
Fixes #5259
More context in modelcontextprotocol/rust-sdk#542