Skip to content

feat(google_drive): move credentials into keychain, add optional fallback#1603

Merged
kalvinnchau merged 4 commits intomainfrom
kalvin/google-drive-keychain
Mar 12, 2025
Merged

feat(google_drive): move credentials into keychain, add optional fallback#1603
kalvinnchau merged 4 commits intomainfrom
kalvin/google-drive-keychain

Conversation

@kalvinnchau
Copy link
Copy Markdown
Contributor

@kalvinnchau kalvinnchau commented Mar 10, 2025

move google_drive credentials storage to the keychain

  • default to using the keychain to store the credentials
    • stores it in mcp_google_drive so it does require an additional password input for keychain, wanted to keep it separate from the goose specific keychain but does add an extra step
  • add logic to compare existing oauth config with env, and ensure they match the env setup
  • for headless environments they can set GOOGLE_DRIVE_DISK_FALLBACK=true to attempt to fallback to disk

@lily-de
Copy link
Copy Markdown
Contributor

lily-de commented Mar 11, 2025

didnt try this in the UI but do you know if there's any special config that needs to change under the hood in the UI?

wendytang
wendytang reviewed Mar 11, 2025
View reviewed changes
crates/goose-mcp/src/google_drive/token_storage.rs
@@ -0,0 +1,301 @@
use anyhow::Result;
use google_drive3::yup_oauth2::storage::{TokenInfo, TokenStorage};
Copy link
Copy Markdown

@wendytang wendytang Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just for learning - how did we determine this was a good rust crate to use back when we used google_drive3 for gdrive server? is it kind of like python libraries where you look up the repo description and determine if it looks official/meets your needs

Copy link
Copy Markdown
Contributor Author

@kalvinnchau kalvinnchau Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, pretty much, didn't find any official rust sdks for the googleapis, so looked around for one that had the most feature complete / extensible one

@kalvinnchau kalvinnchau force-pushed the kalvin/google-drive-keychain branch from 2c730ec to 9a6d89e Compare March 12, 2025 16:08
@kalvinnchau
Copy link
Copy Markdown
Contributor Author

kalvinnchau commented Mar 12, 2025

didnt try this in the UI but do you know if there's any special config that needs to change under the hood in the UI?

tested via the ui and nothing changed from what i could see

@kalvinnchau kalvinnchau merged commit 22c8b32 into main Mar 12, 2025
6 checks passed
@kalvinnchau kalvinnchau deleted the kalvin/google-drive-keychain branch March 12, 2025 16:28
kalvinnchau added a commit that referenced this pull request Mar 12, 2025
@kalvinnchau
Merge branch 'main' into kalvin/google-drive-pkce
f2ab799 
* main:
  feat(google_drive): move credentials into keychain, add optional fallback (#1603)
  feat: add session list command in cli (#1586)
ahau-square pushed a commit that referenced this pull request May 2, 2025
@kalvinnchau
feat(google_drive): move credentials into keychain, add optional fall…
bb7e5bd 
…back (#1603)
cbruyndoncx pushed a commit to cbruyndoncx/goose that referenced this pull request Jul 20, 2025
@kalvinnchau
feat(google_drive): move credentials into keychain, add optional fall…
44876e8 
…back (block#1603)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@wendytang wendytang wendytang approved these changes

@lily-de lily-de lily-de approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kalvinnchau @lily-de @wendytang