Merge branch 'master' into deprecate-ldap_use_ssl

radicale/config.py

@@ -3,7 +3,7 @@
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 # Copyright © 2017-2020 Unrud <unrud@outlook.com>
-# Copyright © 2024-2025 Peter Bieringer <pb@bieringer.de>
+# Copyright © 2024-2026 Peter Bieringer <pb@bieringer.de>
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ from configparser import RawConfigParser
 from typing import (Any, Callable, ClassVar, Iterable, List, Optional,
                     Sequence, Tuple, TypeVar, Union)
 
-from radicale import auth, hook, rights, storage, types, web
+from radicale import auth, hook, rights, sharing, storage, types, web
 from radicale.hook import email
 from radicale.item import check_and_sanitize_props
 
@@ -350,6 +350,14 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
             "value": "",
             "help": "OAuth2 token endpoint URL",
             "type": str}),
+        ("oauth2_client_id", {
+            "value": "radicale",
+            "help": "OAuth2 client id",
+            "type": str}),
+        ("oauth2_client_secret", {
+            "value": "",
+            "help": "OAuth2 client secret",
+            "type": str}),
         ("pam_group_membership", {
             "value": "",
             "help": "PAM group user should be member of",
@@ -450,6 +458,24 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
             "value": "",
             "help": "predefined user collections",
             "type": json_str})])),
+    ("sharing", OrderedDict([
+        ("type", {
+            "value": "none",
+            "help": "sharing database type",
+            "type": str_or_callable,
+            "internal": sharing.INTERNAL_TYPES}),
+        ("database_path", {
+            "value": "",
+            "help": "database path",
+            "type": filepath}),
+        ("collection_by_map", {
+            "value": "false",
+            "help": "enable sharing of collection by map",
+            "type": bool}),
+        ("collection_by_token", {
+            "value": "false",
+            "help": "enable sharing of collection by token",
+            "type": bool})])),
     ("hook", OrderedDict([
         ("type", {
             "value": "none",