NotificationsYou must be signed in to change notification settings
Fork926
Star10.1k

fix: allow orgs with default github provider (cherry-pick #16755)#16784

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.

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

Already on GitHub?Sign in to your account

Jump to bottom

Merged

stirby merged 1 commit intorelease/2.20fromcherry-pick-537e9b-release/2.20

Mar 3, 2025

Merged

fix: allow orgs with default github provider (cherry-pick #16755)#16784

stirby merged 1 commit intorelease/2.20fromcherry-pick-537e9b-release/2.20

Mar 3, 2025

Conversation

Copy link

gcp-cherry-pick-botbot commentedMar 3, 2025

Cherry-picked fix: allow orgs with default github provider (#16755)

This PR fixes 2 bugs:

Problem 1

The server would fail to start when the default github provider was
configured and the flag--oauth2-github-allowed-orgs was set. The
error was

error: configure github oauth2: allow everyone and allowed orgs cannot be used together

This PR fixes it by enabling "allow everone" with the default provider
only if "allowed orgs" isn't set.

Problem 2

The default github provider uses the device flow to authorize users, and
that's handled differently by our web UI than the standard oauth flow.
In particular, the web UI only handles JSON responses rather than HTTP
redirects. There were 2 code paths that returned redirects, and the PR
changes them to return JSON messages instead if the device flow is
configured.

fix: allow orgs with default github provider (#16755)

b7fe0ab

This PR fixes 2 bugs:## Problem 1The server would fail to start when the default github provider wasconfigured and the flag `--oauth2-github-allowed-orgs` was set. Theerror was```error: configure github oauth2: allow everyone and allowed orgs cannot be used together```This PR fixes it by enabling "allow everone" with the default provideronly if "allowed orgs" isn't set.## Problem 2The default github provider uses the device flow to authorize users, andthat's handled differently by our web UI than the standard oauth flow.In particular, the web UI only handles JSON responses rather than HTTPredirects. There were 2 code paths that returned redirects, and the PRchanges them to return JSON messages instead if the device flow isconfigured.