Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

sharing/group: rename auth_type -> from_auth

Browse Source
This commit is contained in:
Peter Bieringer
2026-07-31 17:44:21 +02:00
parent 36c459fec8
commit 5abb0046e3
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/app/__init__.py
View File

@@ -601,7 +601,7 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
group_type = self.configuration.get("group", "type")
if group_type in ["htgroup"]:
self._rights._user_groups = self._group.groups(login) if login else set([])
elif group_type in ["auth_type"]:
elif group_type in ["from_auth"]:
auth_type = self.configuration.get("auth", "type")
if auth_type in ["ldap", "pam"]:
try:

2
radicale/group/__init__.py
View File

@@ -29,7 +29,7 @@ from radicale import config, utils
from radicale.log import logger
INTERNAL_TYPES: Sequence[str] = ("none",
"auth_type",
"from_auth",
"htgroup",
)

6
radicale/tests/test_group.py
View File

@@ -107,7 +107,7 @@ class TestBaseGroupRequests(BaseTest):
or "Group memberships (htgroup) for user 'tmp': {'group1', 'group2'}" in log
]) == 0
def test_incompatible_group_auth_type(self) -> None:
def test_incompatible_group_from_auth(self) -> None:
for auth_type in ["dovecot", "imap", "remote_user", "http_remote_user", "htpasswd", "oauth2"]:
logging.info("\n*** test: auth_type=%r, group_type=%r", "dovecot", auth_type)
try:
@@ -116,7 +116,7 @@ class TestBaseGroupRequests(BaseTest):
"type": auth_type,
"oauth2_token": "dummy",
},
"group": {"type": "auth_type"}
"group": {"type": "from_auth"}
})
except RuntimeError:
pass
@@ -130,7 +130,7 @@ class TestBaseGroupRequests(BaseTest):
{"auth": {
"type": auth_type,
},
"group": {"type": "auth_type"}
"group": {"type": "from_auth"}
})
except RuntimeError:
raise