mirror of
https://github.com/open-webui/open-webui.git
synced 2026-04-30 09:18:50 -05:00
enh: OAUTH_GROUP_DEFAULT_SHARE
This commit is contained in:
@@ -573,6 +573,20 @@ ENABLE_OAUTH_GROUP_CREATION = PersistentConfig(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
oauth_group_default_share = (
|
||||||
|
os.environ.get("OAUTH_GROUP_DEFAULT_SHARE", "true").strip().lower()
|
||||||
|
)
|
||||||
|
OAUTH_GROUP_DEFAULT_SHARE = PersistentConfig(
|
||||||
|
"OAUTH_GROUP_DEFAULT_SHARE",
|
||||||
|
"oauth.group_default_share",
|
||||||
|
(
|
||||||
|
"members"
|
||||||
|
if oauth_group_default_share == "members"
|
||||||
|
else oauth_group_default_share == "true"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
OAUTH_BLOCKED_GROUPS = PersistentConfig(
|
OAUTH_BLOCKED_GROUPS = PersistentConfig(
|
||||||
"OAUTH_BLOCKED_GROUPS",
|
"OAUTH_BLOCKED_GROUPS",
|
||||||
"oauth.blocked_groups",
|
"oauth.blocked_groups",
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ from open_webui.config import (
|
|||||||
ENABLE_OAUTH_ROLE_MANAGEMENT,
|
ENABLE_OAUTH_ROLE_MANAGEMENT,
|
||||||
ENABLE_OAUTH_GROUP_MANAGEMENT,
|
ENABLE_OAUTH_GROUP_MANAGEMENT,
|
||||||
ENABLE_OAUTH_GROUP_CREATION,
|
ENABLE_OAUTH_GROUP_CREATION,
|
||||||
|
OAUTH_GROUP_DEFAULT_SHARE,
|
||||||
OAUTH_BLOCKED_GROUPS,
|
OAUTH_BLOCKED_GROUPS,
|
||||||
OAUTH_GROUPS_SEPARATOR,
|
OAUTH_GROUPS_SEPARATOR,
|
||||||
OAUTH_ROLES_SEPARATOR,
|
OAUTH_ROLES_SEPARATOR,
|
||||||
@@ -114,6 +115,7 @@ auth_manager_config.OAUTH_MERGE_ACCOUNTS_BY_EMAIL = OAUTH_MERGE_ACCOUNTS_BY_EMAI
|
|||||||
auth_manager_config.ENABLE_OAUTH_ROLE_MANAGEMENT = ENABLE_OAUTH_ROLE_MANAGEMENT
|
auth_manager_config.ENABLE_OAUTH_ROLE_MANAGEMENT = ENABLE_OAUTH_ROLE_MANAGEMENT
|
||||||
auth_manager_config.ENABLE_OAUTH_GROUP_MANAGEMENT = ENABLE_OAUTH_GROUP_MANAGEMENT
|
auth_manager_config.ENABLE_OAUTH_GROUP_MANAGEMENT = ENABLE_OAUTH_GROUP_MANAGEMENT
|
||||||
auth_manager_config.ENABLE_OAUTH_GROUP_CREATION = ENABLE_OAUTH_GROUP_CREATION
|
auth_manager_config.ENABLE_OAUTH_GROUP_CREATION = ENABLE_OAUTH_GROUP_CREATION
|
||||||
|
auth_manager_config.OAUTH_GROUP_DEFAULT_SHARE = OAUTH_GROUP_DEFAULT_SHARE
|
||||||
auth_manager_config.OAUTH_BLOCKED_GROUPS = OAUTH_BLOCKED_GROUPS
|
auth_manager_config.OAUTH_BLOCKED_GROUPS = OAUTH_BLOCKED_GROUPS
|
||||||
auth_manager_config.OAUTH_ROLES_CLAIM = OAUTH_ROLES_CLAIM
|
auth_manager_config.OAUTH_ROLES_CLAIM = OAUTH_ROLES_CLAIM
|
||||||
auth_manager_config.OAUTH_SUB_CLAIM = OAUTH_SUB_CLAIM
|
auth_manager_config.OAUTH_SUB_CLAIM = OAUTH_SUB_CLAIM
|
||||||
@@ -1246,7 +1248,7 @@ class OAuthManager:
|
|||||||
name=group_name,
|
name=group_name,
|
||||||
description=f"Group '{group_name}' created automatically via OAuth.",
|
description=f"Group '{group_name}' created automatically via OAuth.",
|
||||||
permissions=default_permissions, # Use default permissions from function args
|
permissions=default_permissions, # Use default permissions from function args
|
||||||
user_ids=[], # Start with no users, user will be added later by subsequent logic
|
data={"config": {"share": auth_manager_config.OAUTH_GROUP_DEFAULT_SHARE}},
|
||||||
)
|
)
|
||||||
# Use determined creator ID (admin or fallback to current user)
|
# Use determined creator ID (admin or fallback to current user)
|
||||||
created_group = Groups.insert_new_group(
|
created_group = Groups.insert_new_group(
|
||||||
|
|||||||
Reference in New Issue
Block a user