Skip to content

fix(hf-auth): force OAuth consent prompt to expose org grants #1092

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
tfrere wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(hf-auth): force OAuth consent prompt to expose org grants #1092

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
21 changes: 16 additions & 5 deletions src/reachy_mini/apps/sources/hf_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,7 @@ def _cleanup_expired_sessions() -> None:
del _oauth_sessions[sid]


def get_oauth_redirect_uri(
wireless_version: bool, use_localhost: bool = False
) -> str:
def get_oauth_redirect_uri(wireless_version: bool, use_localhost: bool = False) -> str:
"""Get the appropriate OAuth redirect URI based on robot type.

Args:
Expand Down Expand Up @@ -181,7 +179,17 @@ def create_oauth_session(
)
_oauth_sessions[state] = session

# Build HuggingFace OAuth authorization URL with PKCE
# Build HuggingFace OAuth authorization URL with PKCE.
#
# `prompt=consent` forces HuggingFace to re-display the consent screen on
# every login, even when the app has already been authorized. This matters
# for organization access: HF lets the user pick which orgs to grant the
# `read-repos` scope to during consent, and a user who skipped that step
# the first time has no in-app way to fix it without going to
# https://huggingface.co/settings/connected-applications and revoking the
# app manually. Forcing consent makes "Logout + Login" enough to (re-)opt
# an org in or out, which is what we want for users who joined an org
# after their first login (e.g. private apps from `pollen-robotics`).
from urllib.parse import urlencode

params = {
Expand All @@ -192,6 +200,7 @@ def create_oauth_session(
"state": state,
"code_challenge": code_challenge,
"code_challenge_method": "S256",
"prompt": "consent",
}
auth_url = f"https://huggingface.co/oauth/authorize?{urlencode(params)}"

Expand Down Expand Up @@ -247,7 +256,9 @@ async def exchange_code_for_token(
session.error_message = "OAuth not configured"
return {"status": "error", "message": "OAuth not configured"}

redirect_uri = get_oauth_redirect_uri(session.wireless_version, session.use_localhost)
redirect_uri = get_oauth_redirect_uri(
session.wireless_version, session.use_localhost
)

# Exchange code for token using PKCE
token_url = "https://huggingface.co/oauth/token"
Expand Down
Loading