Skip to content

Fix Gemini OAuth onboarding failure #8905

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

Merged
angiejones merged 1 commit into from
Apr 30, 2026
Merged

Fix Gemini OAuth onboarding failure #8905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion crates/goose/src/providers/gemini_oauth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,15 @@ struct LoadCodeAssistResponse {
cloudaicompanion_project: Option<String>,
current_tier: Option<TierInfo>,
onboard_tiers: Option<Vec<TierInfo>>,
allowed_tiers: Option<Vec<TierInfo>>,
}

#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
struct TierInfo {
id: Option<String>,
#[serde(default)]
is_default: Option<bool>,
}

#[derive(Debug, Deserialize)]
Expand Down Expand Up @@ -424,7 +428,15 @@ async fn setup_code_assist(access_token: &str) -> Result<String> {
.as_ref()
.and_then(|tiers| tiers.first())
.and_then(|t| t.id.clone())
.unwrap_or_else(|| "FREE".to_string());
.or_else(|| {
load_resp
.allowed_tiers
.as_ref()
.and_then(|tiers| tiers.iter().find(|t| t.is_default.unwrap_or(false)))
.or_else(|| load_resp.allowed_tiers.as_ref().and_then(|t| t.first()))
.and_then(|t| t.id.clone())
})
.unwrap_or_else(|| "free-tier".to_string());

tracing::info!("Onboarding user with tier: {}", tier_id);

Expand Down
9 changes: 8 additions & 1 deletion ui/desktop/src/components/settings/providers/modal/ProviderConfigurationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,16 @@ export default function ProviderConfigurationModal({
}
}
}
await configureProviderOauth({
const oauthResult = await configureProviderOauth({
path: { name: provider.name },
});
if (oauthResult.error) {
const err = oauthResult.error as Record<string, unknown>;
const errDetail = typeof oauthResult.error === 'string'
? oauthResult.error
: (err?.message as string) ?? (err?.detail as string) ?? JSON.stringify(oauthResult.error);
throw new Error(errDetail);
}
if (onConfigured) {
onConfigured(provider);
} else {
Expand Down
Loading