From 5abb0046e33c26d66117f0854ef5a328b5c85c4e Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Fri, 31 Jul 2026 17:44:21 +0200
Subject: [PATCH] sharing/group: rename auth_type -> from_auth

---
 DOCUMENTATION.md             | 6 +++---
 config                       | 2 +-
 radicale/app/__init__.py     | 2 +-
 radicale/group/__init__.py   | 2 +-
 radicale/tests/test_group.py | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
index 77a33d33..9f210e9b 100644
--- a/DOCUMENTATION.md
+++ b/DOCUMENTATION.md
@@ -1026,7 +1026,7 @@ Available types are:
 * `ldap` _(>= 3.3.0)_  
   Use a LDAP or AD server to authenticate users by relaying credentials from clients and handle results.
 
-  User groups are supported. Requires group/type=`auth_type` _(>= 3.8.0)_.
+  User groups are supported. Requires group/type=`from_auth` _(>= 3.8.0)_.
 
 * `dovecot` _(>= 3.3.1)_  
   Use a Dovecot server to authenticate users by relaying credentials from clients and handle results.
@@ -1265,7 +1265,7 @@ They also give you access to the group calendars, if those exist.
 
 Default: (unset)
 
-Requires group lookup type set to `auth_type` _(>= 3.8.0)_
+Requires group lookup type set to `from_auth` _(>= 3.8.0)_
 
 ##### ldap_group_members_attribute
 
@@ -1513,7 +1513,7 @@ Available types are:
 * `none`
   No groups lookup at all
 
-* `auth_type`
+* `from_auth`
   Group lookup by authentication type (if supported)
 
 * `htgroup`
diff --git a/config b/config
index 01cf8046..ab212f9d 100644
--- a/config
+++ b/config
@@ -214,7 +214,7 @@
 [group]
 
 # Group lookup method
-# Value: none | auth_type | htgroup
+# Value: none | from_auth | htgroup
 type = none
 
 # Htgroup filename
diff --git a/radicale/app/__init__.py b/radicale/app/__init__.py
index ab685362..f0ce6490 100644
--- a/radicale/app/__init__.py
+++ b/radicale/app/__init__.py
@@ -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:
diff --git a/radicale/group/__init__.py b/radicale/group/__init__.py
index 92b2279b..53f387c6 100644
--- a/radicale/group/__init__.py
+++ b/radicale/group/__init__.py
@@ -29,7 +29,7 @@ from radicale import config, utils
 from radicale.log import logger
 
 INTERNAL_TYPES: Sequence[str] = ("none",
-                                 "auth_type",
+                                 "from_auth",
                                  "htgroup",
                                  )
 
diff --git a/radicale/tests/test_group.py b/radicale/tests/test_group.py
index cf4d0ee4..067996ac 100644
--- a/radicale/tests/test_group.py
+++ b/radicale/tests/test_group.py
@@ -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