fix(auth): format and deduplicate dynamic scope fallback

[jpoehnelt]

Summary

Follow-up to #246 — fixes two issues:

1. cargo fmt — breaks the long method chain in extract_scopes_from_doc() that was failing the Lint CI check
2. Dedup dynamic scopes — augment_with_dynamic_scopes() now checks for duplicates before extending the result vec, preventing duplicate entries if dynamic scopes overlap with static ones

Changes

• extract_scopes_from_doc(): reformatted doc.auth.as_ref().and_then(...) chain across multiple lines
• augment_with_dynamic_scopes(): replaced result.extend(dynamic) with a loop that skips scopes already present

Verification

• cargo fmt --all — clean
• cargo clippy -- -D warnings — zero warnings
• cargo test — 467 passed, 0 failed

Stacked on #246

Closes #236, #310, #316

[changeset-bot]

🦋 Changeset detected

Latest commit: 878f7dd

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]

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 refines the authentication scope resolution logic by addressing code formatting and preventing redundant scope entries. It ensures that dynamically fetched scopes are correctly integrated without introducing duplicates and improves code readability by reformatting a complex method chain, building upon previous work related to dynamic scope fetching.

Highlights

• Code Formatting: Reformatted a long method chain in extract_scopes_from_doc() to comply with cargo fmt and pass CI checks, improving code readability.
• Dynamic Scope Deduplication: Implemented deduplication logic in augment_with_dynamic_scopes() to prevent duplicate entries when dynamically fetched scopes overlap with static ones.

Changelog

• .changeset/fix-236-scope-fallback.md
  • Added a new changeset file documenting the dynamic scope fallback feature.
• .changeset/fix-246-fmt-dedup.md
  • Added a new changeset file documenting the formatting and deduplication fixes.
• src/auth_commands.rs
  • Refactored resolve_scopes to incorporate dynamic scope augmentation for --readonly, --full, and default cases.
  • Extracted the service-to-scope prefix mapping into a dedicated map_service_to_scope_prefix helper function.
  • Introduced find_unmatched_services to identify services from a filter that lack matching scopes in a given list.
  • Added extract_scopes_from_doc to parse OAuth scopes from Discovery documents, including filtering for app-only and readonly scopes.
  • Implemented fetch_scopes_for_unmatched_services for asynchronous retrieval of dynamic scopes for unmatched services.
  • Created augment_with_dynamic_scopes to merge dynamically fetched scopes into an existing list, ensuring no duplicates are added.
  • Included new unit tests for find_unmatched_services and extract_scopes_from_doc to validate the new logic.

Activity

• The author indicated this pull request is a follow-up to fix(auth): fall back to Discovery docs when -s specifies services not in static scope lists #246.
• The author performed verification steps including cargo fmt --all, cargo clippy -- -D warnings, and cargo test to ensure code quality and correctness.
• The PR is stacked on fix(auth): fall back to Discovery docs when -s specifies services not in static scope lists #246, suggesting a sequential development or dependency.

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 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. ↩

[gemini-code-assist]

Code Review

This pull request successfully formats the code and adds a deduplication mechanism for dynamic scopes. The changes are logical and include relevant tests for the new functions. I have one suggestion to improve the performance of the scope deduplication logic.

_{Note: Security Review did not run due to the size of the PR.}

[codecov]

Codecov Report

❌ Patch coverage is 96.29630% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 62.11%. Comparing base (f07dd2b) to head (878f7dd).
⚠️ Report is 32 commits behind head on main.

Files with missing lines	Patch %	Lines
src/auth_commands.rs	96.29%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #352      +/-   ##
==========================================
+ Coverage   57.69%   62.11%   +4.41%     
==========================================
  Files          38       38              
  Lines       14328    14760     +432     
==========================================
+ Hits         8267     9168     +901     
+ Misses       6061     5592     -469     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.