Skip to content
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

Jump to bottom

fix: First OIDC account is not admin #3499

Merged
merged 6 commits into from
Jun 29, 2024
Merged

fix: First OIDC account is not admin #3499

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift click to select a range
1eebb85
Merge pull request #3323 from open-webui/dev
tjbck Jun 27, 2024
b072481
Merge pull request #3477 from open-webui/dev
tjbck Jun 27, 2024
f7da94f
Merge pull request #3485 from open-webui/dev
tjbck Jun 28, 2024
24b638f
Merge pull request #3486 from open-webui/dev
tjbck Jun 28, 2024
57c3305
Fix: admin role for OIDC signup for first user
Jun 28, 2024
7d10dac
Fix: set jwt_token to cookie (instead of token from OIDC)
Jun 28, 2024
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
9 changes: 7 additions & 2 deletions backend/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1944,14 1944,19 @@ async def oauth_callback(provider: str, request: Request, response: Response):
picture_url = ""
if not picture_url:
picture_url = "/user.png"
role = (
"admin"
if Users.get_num_users() == 0
else webui_app.state.config.DEFAULT_USER_ROLE
)
user = Auths.insert_new_auth(
email=email,
password=get_password_hash(
str(uuid.uuid4())
), # Random password, not used
name=user_data.get("name", "User"),
profile_image_url=picture_url,
role=webui_app.state.config.DEFAULT_USER_ROLE,
role=role,
oauth_sub=provider_sub,
)

Expand All @@ -1978,7 1983,7 @@ async def oauth_callback(provider: str, request: Request, response: Response):
# Set the cookie token
response.set_cookie(
key="token",
value=token,
value=jwt_token,
httponly=True, # Ensures the cookie is not accessible via JavaScript
)

Expand Down