fix: decrypt token cache before extracting refresh token

[jpoehnelt]

Fix OAuth login failing with "no refresh token" error by decrypting the token cache before parsing and supporting the HashMap token format used by EncryptedTokenStorage

[changeset-bot]

🦋 Changeset detected

Latest commit: aa068aa

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
@googleworkspace/cli	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[google-cla]

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

[gemini-code-assist]

Summary of Changes

Hello, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves a critical issue preventing successful OAuth login by ensuring the token cache is properly decrypted and parsed. It introduces logic to handle encrypted token storage and supports a new HashMap-based token format, thereby improving the robustness of refresh token extraction and overall authentication flow.

Highlights

• Token Cache Decryption: Implemented decryption of the token cache before attempting to extract the refresh token, addressing issues where encrypted storage was used by EncryptedTokenStorage.
• Refresh Token Extraction: Enhanced the extract_refresh_token function to support both the array format (yup-oauth2 default) and the HashMap format used by EncryptedTokenStorage.
• OAuth Login Reliability: Resolved an issue where OAuth login could fail with a "no refresh token" error due to incorrect handling of encrypted or HashMap-formatted token data.

Changelog

• .changeset/fix-refresh-token-extraction.md
  • Added a new changeset file documenting the fix for OAuth login and refresh token extraction.
• src/auth_commands.rs
  • Modified the handle_login function to decrypt token data read from the temporary path before parsing.
  • Updated the extract_refresh_token function to support both array and HashMap token cache formats.
  • Adjusted a test case to verify correct refresh token extraction from the new object format.

Activity

• No human activity has been recorded on this pull request yet.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-code-assist]

Code Review

This pull request fixes an OAuth login failure by decrypting the token cache before extracting the refresh token. It also adds support for the HashMap-based token format used by EncryptedTokenStorage. The changes in handle_login to decrypt the token data are correct. The modifications to extract_refresh_token correctly handle both array and object formats for the token cache. I've suggested a small refactoring to make extract_refresh_token more concise and idiomatic.