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

dev #3621

Merged
merged 14 commits into from
Jul 4, 2024
Merged

dev #3621

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift click to select a range
0c3f9a1
custom env for set custom claims for openid
Jun 28, 2024
9f32e9e
fix username claim
Jun 28, 2024
6e934c2
Merge branch 'refs/heads/main' into custom-openid-claims
Jul 1, 2024
e475f02
fix: merge request fail (remove picture_claim)
Jul 1, 2024
a94c7e5
fix lint
Jul 1, 2024
1f026a1
i18n(de_DE): added translations for new entries, updated old entries
bannert1337 Jul 3, 2024
3cd0b10
i18n: Improve French translations
moblangeois Jul 3, 2024
2fedd91
feat: Improve French Canadian (fr-ca) translations
moblangeois Jul 3, 2024
d0e0aba
Merge pull request #3611 from bannert1337/i18n-de_DE
tjbck Jul 3, 2024
f548762
Resolve merge conflicts in French translations
moblangeois Jul 3, 2024
c83704d
refac: task flag
tjbck Jul 3, 2024
08c024d
Merge pull request #3569 from Semihal/custom-openid-claims
tjbck Jul 3, 2024
f5a33ed
Merge remote-tracking branch 'upstream/dev' into improve-fr-ca-transl…
moblangeois Jul 3, 2024
3efb8ab
Merge pull request #3617 from moblangeois/improve-fr-ca-translations
tjbck Jul 4, 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
Next Next commit
custom env for set custom claims for openid
  • Loading branch information
Sergey Mihaylin committed Jun 28, 2024
commit 0c3f9a16e3c3ecd882b69bea2363902889a3c4c8
5 changes: 5 additions & 0 deletions backend/apps/webui/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 39,8 @@
WEBUI_BANNERS,
ENABLE_COMMUNITY_SHARING,
AppConfig,
OAUTH_USERNAME_CLAIM,
OAUTH_PICTURE_CLAIM
)

import inspect
Expand Down Expand Up @@ -74,6 76,9 @@

app.state.config.ENABLE_COMMUNITY_SHARING = ENABLE_COMMUNITY_SHARING

app.state.config.OAUTH_USERNAME_CLAIM = OAUTH_USERNAME_CLAIM
app.state.config.OAUTH_PICTURE_CLAIM = OAUTH_PICTURE_CLAIM

app.state.MODELS = {}
app.state.TOOLS = {}
app.state.FUNCTIONS = {}
Expand Down
12 changes: 12 additions & 0 deletions backend/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 395,18 @@ def __getattr__(self, key):
os.environ.get("OAUTH_PROVIDER_NAME", "SSO"),
)

OAUTH_USERNAME_CLAIM = PersistentConfig(
"OAUTH_USERNAME_CLAIM",
"oauth.oidc.username_claim",
os.environ.get("OAUTH_USERNAME_CLAIM", "name"),
)

OAUTH_PICTURE_CLAIM = PersistentConfig(
"OAUTH_USERNAME_CLAIM",
"oauth.oidc.avatar_claim",
os.environ.get("OAUTH_PICTURE_CLAIM", "picture"),
)


def load_oauth_providers():
OAUTH_PROVIDERS.clear()
Expand Down
6 changes: 4 additions & 2 deletions backend/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,11 1920,13 @@ async def oauth_callback(provider: str, request: Request, response: Response):
# If the user does not exist, check if signups are enabled
if ENABLE_OAUTH_SIGNUP.value:
# Check if an existing user with the same email already exists
existing_user = Users.get_user_by_email(user_data.get("email", "").lower())
email_claim = webui_app.state.config.OAUTH_USERNAME_CLAIM
existing_user = Users.get_user_by_email(user_data.get(email_claim, "").lower())
if existing_user:
raise HTTPException(400, detail=ERROR_MESSAGES.EMAIL_TAKEN)

picture_url = user_data.get("picture", "")
picture_claim = webui_app.state.config.OAUTH_PICTURE_CLAIM
picture_url = user_data.get(picture_claim, "")
if picture_url:
# Download the profile image into a base64 string
try:
Expand Down