Skip to content

fix(auth): stop TUI from unconditionally injecting cloud-platform scope#564

Open
anshul-garg27 wants to merge 1 commit intogoogleworkspace:mainfrom
anshul-garg27:fix/tui-cloud-platform-scope
Open

fix(auth): stop TUI from unconditionally injecting cloud-platform scope#564
anshul-garg27 wants to merge 1 commit intogoogleworkspace:mainfrom
anshul-garg27:fix/tui-cloud-platform-scope

Conversation

@anshul-garg27
Copy link
Contributor

Summary

The interactive TUI scope picker unconditionally injects cloud-platform after the user's selection (line ~835 in auth_commands.rs), even when the user only picked basic services like Drive or Gmail. This contradicts DEFAULT_SCOPES which deliberately excludes cloud-platform to avoid restricted_client / admin_policy_enforced errors on managed Workspace accounts.

Changes:

  • Remove the forced cloud-platform injection after TUI selection
  • Remove the cloud-platform auto-pass-through in scope_matches_service so it's filtered like any other scope when --services is used
  • Clean up the now-unused PLATFORM_SCOPE constant

cloud-platform remains available in the TUI picker as a selectable option and is still included when using --full. Users who need it can select it explicitly.

Closes #562

Test plan

  • cargo test — 749 pass, 0 fail
  • cargo clippy -- -D warnings — clean
  • Existing scope_matches_service test updated to verify cloud-platform is NOT auto-included
  • Services filter integration tests updated to reflect the fix

The interactive scope picker force-injected cloud-platform after every
selection, contradicting DEFAULT_SCOPES which deliberately excludes it.
This broke org-restricted accounts with admin_policy_enforced errors.

Now cloud-platform only appears when the user explicitly selects it in
the picker, uses --full, or passes it via --scopes.

Closes googleworkspace#562
@changeset-bot
Copy link

changeset-bot bot commented Mar 19, 2026

🦋 Changeset detected

Latest commit: 86df4b6

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

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! 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 addresses an issue where the cloud-platform OAuth scope was being unconditionally added by the interactive TUI scope picker, even when not explicitly selected by the user. This behavior led to restricted_client errors in managed Workspace accounts. The changes ensure that cloud-platform is only included when explicitly chosen by the user or when using the --full option, aligning with the intended scope management and preventing unintended broad permissions.

Highlights

  • TUI Scope Injection: The unconditional injection of cloud-platform scope after TUI selection has been removed, preventing restricted_client errors.
  • Scope Matching Logic: The cloud-platform scope is no longer automatically passed through in scope_matches_service when --services is used, ensuring it's filtered like other scopes.
  • Code Cleanup: The now-unused PLATFORM_SCOPE constant has been removed from the codebase.
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.

Footnotes

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

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request correctly addresses the issue of unconditionally injecting the cloud-platform scope during TUI-based authentication. The changes are well-targeted, removing the special handling for cloud-platform in scope_matches_service and the forced injection in run_discovery_scope_picker. The related tests have been updated appropriately to verify the new, correct behavior, and the unused PLATFORM_SCOPE constant has been cleaned up. The implementation is sound and effectively resolves the reported bug.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: Interactive TUI unconditionally injects cloud-platform scope, breaking org-restricted accounts

2 participants