Skip to content

fix(auth): include admin reports scopes #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lubrsy706 wants to merge 3 commits into
base: main
Choose a base branch
from
+55 −1
Open

fix(auth): include admin reports scopes #800

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35b4b6b
fix(auth): include admin reports scopes
Lubrsy706 May 14, 2026
df4b7e8
fix(auth): treat admin scopes consistently
Lubrsy706 May 14, 2026
14ded8c
fix(auth): classify top-level admin scope
Lubrsy706 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion crates/google-workspace-cli/src/auth_commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,8 @@ pub const FULL_SCOPES: &[&str] = &[
"https://www.googleapis.com/auth/documents",
"https://www.googleapis.com/auth/presentations",
"https://www.googleapis.com/auth/tasks",
"https://www.googleapis.com/auth/admin.reports.audit.readonly",
"https://www.googleapis.com/auth/admin.reports.usage.readonly",
"https://www.googleapis.com/auth/pubsub",
"https://www.googleapis.com/auth/cloud-platform",
];
Expand All @@ -306,6 +308,8 @@ const READONLY_SCOPES: &[&str] = &[
"https://www.googleapis.com/auth/documents.readonly",
"https://www.googleapis.com/auth/presentations.readonly",
"https://www.googleapis.com/auth/tasks.readonly",
"https://www.googleapis.com/auth/admin.reports.audit.readonly",
"https://www.googleapis.com/auth/admin.reports.usage.readonly",
];

pub fn config_dir() -> PathBuf {
Expand Down Expand Up @@ -841,6 +845,7 @@ fn map_service_to_scope_prefixes(service: &str) -> Vec<&str> {
"slides" => vec!["presentations"],
"docs" => vec!["documents"],
"people" => vec!["contacts", "directory"],
"admin-reports" => vec!["admin.reports"],
s => vec![s],
}
}
Expand Down Expand Up @@ -1565,6 +1570,14 @@ const SCOPE_ENTRIES: &[ScopeEntry] = &[
scope: "https://www.googleapis.com/auth/tasks",
label: "Google Tasks",
},
ScopeEntry {
scope: "https://www.googleapis.com/auth/admin.reports.audit.readonly",
label: "Admin Reports Audit",
},
ScopeEntry {
scope: "https://www.googleapis.com/auth/admin.reports.usage.readonly",
label: "Admin Reports Usage",
},
ScopeEntry {
scope: "https://www.googleapis.com/auth/pubsub",
label: "Cloud Pub/Sub",
Expand Down Expand Up @@ -1595,6 +1608,7 @@ fn is_app_only_scope(url: &str) -> bool {
/// They are excluded from the "Recommended" preset to avoid login failures.
///
/// Affected scope families:
/// - `admin.*` — Admin SDK APIs (Directory, Reports, etc.)
/// - `apps.*` — Alert Center, Groups Settings, Licensing, Reseller
/// - `cloud-identity.*` — Cloud Identity: devices, groups, inbound SSO, policies
/// - `ediscovery` — Google Vault
Expand All @@ -1604,7 +1618,8 @@ fn is_workspace_admin_scope(url: &str) -> bool {
let short = url
.strip_prefix("https://www.googleapis.com/auth/")
.unwrap_or(url);
short.starts_with("apps.")
short.starts_with("admin.")
|| short.starts_with("apps.")

@gemini-code-assist gemini-code-assist Bot May 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

high

The check short.starts_with("admin.") will miss the exact match for the top-level https://www.googleapis.com/auth/admin scope if it is ever encountered. Including an exact match check ensures that the entire admin scope family is correctly classified as Workspace-admin-only, preventing potential 400 invalid_scope errors for personal accounts.

    short == "admin"
        || short.starts_with("admin.")
        || short.starts_with("apps.")

|| short.starts_with("cloud-identity.")
|| short.starts_with("chat.admin.")
|| short.starts_with("classroom.")
Expand Down Expand Up @@ -1791,6 +1806,18 @@ mod tests {
assert_eq!(scopes.len(), FULL_SCOPES.len());
}

#[test]
fn admin_reports_scopes_are_available_in_presets_and_picker() {
for scope in [
"https://www.googleapis.com/auth/admin.reports.audit.readonly",
"https://www.googleapis.com/auth/admin.reports.usage.readonly",
] {
assert!(FULL_SCOPES.contains(&scope));
assert!(READONLY_SCOPES.contains(&scope));
assert!(SCOPE_ENTRIES.iter().any(|entry| entry.scope == scope));
}
}

#[test]
#[serial_test::serial]
fn resolve_client_credentials_from_env_vars() {
Expand Down Expand Up @@ -2236,6 +2263,29 @@ mod tests {
));
}

#[test]
fn scope_matches_service_admin_reports() {
let services: HashSet<String> = ["admin-reports"].iter().map(|s| s.to_string()).collect();
assert!(scope_matches_service(
"https://www.googleapis.com/auth/admin.reports.audit.readonly",
&services
));
assert!(scope_matches_service(
"https://www.googleapis.com/auth/admin.reports.usage.readonly",
&services
));
}

#[test]
fn workspace_admin_scope_detects_admin_family() {
assert!(is_workspace_admin_scope(
"https://www.googleapis.com/auth/admin.directory.user.readonly"
));
assert!(is_workspace_admin_scope(
"https://www.googleapis.com/auth/admin.reports.audit.readonly"
));
}

// ── services filter integration tests ────────────────────────────────

#[test]
Expand Down
Loading