Merge pull request #2053 from pbiering/sharing-remove-legacy-bday-2

Sharing remove legacy bday 2

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
 
   test-python-32bit:
     name: Test Ubuntu:latest Python:32-bit
-    needs: [lint, test-ubuntu-python-newest]
+    needs: [lint, test-ubuntu-python-newest, integ-test]
     strategy:
       matrix:
         os: [ubuntu-latest]

DOCUMENTATION.md

@@ -2127,14 +2127,6 @@ Share collection by map
 
 Default: `false`
 
-##### collection_by_bday
-
-_(>= 3.7.0)_
-
-Share collection by bday (conversion on-the-fly)
-
-Default: `false`
-
 ##### permit_create_token
 
 _(>= 3.7.0)_
@@ -2157,17 +2149,6 @@ Default: `false`
 * If `False` it can be explicitly granted by *rights* permissions: `M`
 * If `True` it can be explicitly forbidden by *rights* permissions: `m`
 
-##### permit_create_bday
-
-_(>= 3.7.0)_
-
-Permit create of bday-based sharing
-
-Default: `false`
-
-* If `False` it can be explicitly granted by *rights* permissions: `B`
-* If `True` it can be explicitly forbidden by *rights* permissions: `b`
-
 ##### permit_properties_overlay
 
 _(>= 3.7.0)_
@@ -2434,8 +2415,6 @@ The following `permissions` are recognized:
 * **t:** deny create of token-based sharing of collection in case `permit_create_token=True` _(>= 3.7.0)_
 * **M:** permit create of map-based sharing of collection in case `permit_create_map= False` _(>= 3.7.0)_
 * **m:** deny create of map-based sharing of collection in case `permit_create_map=True` _(>= 3.7.0)_
-* **B:** permit create of bday-based sharing of addressbook collection in case `permit_create_bday= False` _(>= 3.7.0)_
-* **b:** deny create of bday-based sharing of addressbook collection in case `permit_create_bday=True` _(>= 3.7.0)_
 
 ### Storage
 

integ_tests/common.py

@@ -114,8 +114,6 @@ collection_by_token = true
 permit_create_token = true
 permit_create_map = true
 permit_properties_overlay = true
-collection_by_bday = true
-permit_create_bday = true
 database_path = {sharing_path}
 """
             )

radicale/config.py

@@ -487,10 +487,6 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
             "value": "false",
             "help": "enable sharing of collection by map",
             "type": bool}),
-        ("collection_by_bday", {  # TODO: remove/3.7.0-final
-            "value": "false",  # TODO: remove/3.7.0-final
-            "help": "enable sharing of collection by bday (conversion on-the-fly)",  # TODO: remove/3.7.0-final
-            "type": bool}),  # TODO: remove/3.7.0-final
         ("permit_create_token", {
             "value": "false",
             "help": "permit create of token-based sharing",
@@ -499,10 +495,6 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([
             "value": "false",
             "help": "permit create of map-based sharing",
             "type": bool}),
-        ("permit_create_bday", {  # TODO: remove/3.7.0-final
-            "value": "false",  # TODO: remove/3.7.0-final
-            "help": "permit create of bday-based sharing",  # TODO: remove/3.7.0-final
-            "type": bool}),  # TODO: remove/3.7.0-final
         ("permit_properties_overlay", {
             "value": "false",
             "help": "permit properties overlay",

radicale/tests/test_sharing.py

@@ -4796,12 +4796,10 @@ permissions: RrWw""")
                                  "htpasswd_encryption": "plain"},
                         "sharing": {
                                     "type": "csv",
-                                    "permit_create_bday": True,
                                     "permit_create_token": True,
                                     "permit_properties_overlay": "True",
                                     "enforce_properties_overlay": "True",
-                                    "collection_by_token": "True",
+                                    "collection_by_token": "True"},
-                                    "collection_by_bday": "True"},
                         "logging": {"request_header_on_debug": "False",
                                     "response_header_on_debug": "True",
                                     "response_content_on_debug": "True",
@@ -4908,12 +4906,10 @@ permissions: RrWw""")
                                  "htpasswd_encryption": "plain"},
                         "sharing": {
                                     "type": "csv",
-                                    "permit_create_bday": True,
                                     "permit_create_token": True,
                                     "permit_properties_overlay": "True",
                                     "enforce_properties_overlay": "True",
-                                    "collection_by_token": "True",
+                                    "collection_by_token": "True"},
-                                    "collection_by_bday": "True"},
                         "logging": {"request_header_on_debug": "False",
                                     "response_header_on_debug": "True",
                                     "response_content_on_debug": "True",