mirror of
https://git.mirrors.martin98.com/https://github.com/open-webui/open-webui
synced 2025-08-15 21:26:07 +08:00
Merge pull request #13533 from TheRauch1/main
feat: handle user OAuth groups as list or string
This commit is contained in:
commit
ed210517c2
@ -158,7 +158,13 @@ class OAuthManager:
|
|||||||
nested_claims = oauth_claim.split(".")
|
nested_claims = oauth_claim.split(".")
|
||||||
for nested_claim in nested_claims:
|
for nested_claim in nested_claims:
|
||||||
claim_data = claim_data.get(nested_claim, {})
|
claim_data = claim_data.get(nested_claim, {})
|
||||||
user_oauth_groups = claim_data if isinstance(claim_data, list) else []
|
|
||||||
|
if isinstance(claim_data, list):
|
||||||
|
user_oauth_groups = claim_data
|
||||||
|
elif isinstance(claim_data, str):
|
||||||
|
user_oauth_groups = [claim_data]
|
||||||
|
else:
|
||||||
|
user_oauth_groups = []
|
||||||
|
|
||||||
user_current_groups: list[GroupModel] = Groups.get_groups_by_member_id(user.id)
|
user_current_groups: list[GroupModel] = Groups.get_groups_by_member_id(user.id)
|
||||||
all_available_groups: list[GroupModel] = Groups.get_groups()
|
all_available_groups: list[GroupModel] = Groups.get_groups()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user