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

Removed legacy bday sharing from backend

Browse Source
This commit is contained in:
Max Berger
2026-03-27 22:29:46 +01:00
parent ea43b98cad
commit 5ab80a8779
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
radicale/sharing/__init__.py
View File

@@ -82,10 +82,6 @@ SHARE_TYPES: Sequence[str] = ('token', 'map', 'all')
SHARE_TYPES_V1: Sequence[str] = ('token', 'map') SHARE_TYPES_V1: Sequence[str] = ('token', 'map')
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
SHARE_TYPES: Sequence[str] = ('token', 'map', 'bday', 'all') # type: ignore[no-redef] # TODO: remove/3.7.0-final
SHARE_TYPES_V1: Sequence[str] = ('token', 'map', 'bday') # type: ignore[no-redef] # TODO: remove/3.7.0-final
API_HOOKS_V1: Sequence[str] = ('list', 'create', 'delete', 'update', 'hide', 'unhide', 'enable', 'disable', 'info') API_HOOKS_V1: Sequence[str] = ('list', 'create', 'delete', 'update', 'hide', 'unhide', 'enable', 'disable', 'info')
# list : list sharings (optional filtered) # list : list sharings (optional filtered)
# create : create share by token or map # create : create share by token or map
@@ -163,12 +159,8 @@ class BaseSharing:
# Sharing # Sharing
self.sharing_collection_by_map = configuration.get("sharing", "collection_by_map") self.sharing_collection_by_map = configuration.get("sharing", "collection_by_map")
self.sharing_collection_by_token = configuration.get("sharing", "collection_by_token") self.sharing_collection_by_token = configuration.get("sharing", "collection_by_token")
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
self.sharing_collection_by_map = self.sharing_collection_by_map or configuration.get("sharing", "collection_by_bday") # TODO: remove/3.7.0-final
self.permit_create_token = configuration.get("sharing", "permit_create_token") self.permit_create_token = configuration.get("sharing", "permit_create_token")
self.permit_create_map = configuration.get("sharing", "permit_create_map") self.permit_create_map = configuration.get("sharing", "permit_create_map")
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
self.permit_create_map = self.permit_create_map or configuration.get("sharing", "permit_create_bday") # TODO: remove/3.7.0-final
self.default_permissions_create_token = configuration.get("sharing", "default_permissions_create_token") self.default_permissions_create_token = configuration.get("sharing", "default_permissions_create_token")
self.default_permissions_create_map = configuration.get("sharing", "default_permissions_create_map") self.default_permissions_create_map = configuration.get("sharing", "default_permissions_create_map")
self.permit_properties_overlay = configuration.get("sharing", "permit_properties_overlay") self.permit_properties_overlay = configuration.get("sharing", "permit_properties_overlay")
@@ -843,11 +835,6 @@ class BaseSharing:
answer['ApiVersion'] = 1 answer['ApiVersion'] = 1
Timestamp = int((datetime.now() - datetime(1970, 1, 1)).total_seconds()) Timestamp = int((datetime.now() - datetime(1970, 1, 1)).total_seconds())
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
if ShareType == "bday": # TODO: remove/3.7.0-final
ShareType = "map" # TODO: remove/3.7.0-final
Conversion = "bday" # TODO: remove/3.7.0-final
if not self.sharing_collection_by_map and not self.sharing_collection_by_token: if not self.sharing_collection_by_map and not self.sharing_collection_by_token:
if not action == 'info': if not action == 'info':
# API is not enabled # API is not enabled
@@ -879,14 +866,6 @@ class BaseSharing:
Conversion=Conversion, Conversion=Conversion,
) )
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
# check and change to legacy ShareType # TODO: remove/3.7.0-final
result_array_adj = copy.deepcopy(result_array) # TODO: remove/3.7.0-final
for index in range(0, len(result_array_adj)): # TODO: remove/3.7.0-final
if result_array_adj[index]['Conversion'] == "bday": # TODO: remove/3.7.0-final
result_array_adj[index]['ShareType'] = "bday" # TODO: remove/3.7.0-final
result_array = result_array_adj
answer['Lines'] = len(result_array) answer['Lines'] = len(result_array)
if len(result_array) == 0: if len(result_array) == 0:
answer['Status'] = "not-found" answer['Status'] = "not-found"
@@ -1273,9 +1252,6 @@ class BaseSharing:
if ShareType in ["all", "map"]: if ShareType in ["all", "map"]:
answer['FeatureEnabledCollectionByMap'] = self.sharing_collection_by_map answer['FeatureEnabledCollectionByMap'] = self.sharing_collection_by_map
answer['PermittedCreateCollectionByMap'] = self.permit_create_map answer['PermittedCreateCollectionByMap'] = self.permit_create_map
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
answer['FeatureEnabledCollectionByBday'] = self.sharing_collection_by_map # TODO: remove/3.7.0-final
answer['PermittedCreateCollectionByBday'] = self.permit_create_map # TODO: remove/3.7.0-final
if ShareType in ["all", "token"]: if ShareType in ["all", "token"]:
answer['FeatureEnabledCollectionByToken'] = self.sharing_collection_by_token answer['FeatureEnabledCollectionByToken'] = self.sharing_collection_by_token
answer['PermittedCreateCollectionByToken'] = self.permit_create_token answer['PermittedCreateCollectionByToken'] = self.permit_create_token

7
radicale/tests/test_sharing.py
View File

@@ -4359,11 +4359,8 @@ permissions: RrWw""")
assert answer_dict['Status'] == "success" assert answer_dict['Status'] == "success"
assert answer_dict['Lines'] == 1 assert answer_dict['Lines'] == 1
row = answer_dict['Content'][0] row = answer_dict['Content'][0]
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final assert row['ShareType'] == "map"
assert row['ShareType'] == "bday" # TODO: remove/3.7.0-final assert row['Conversion'] == "bday"
else: # TODO: remove/3.7.0-final
assert row['ShareType'] == "map"
assert row['Conversion'] == "bday"
# check PROPFIND item as user # check PROPFIND item as user
logging.info("\n*** PROPFIND item as user -> calendar") logging.info("\n*** PROPFIND item as user -> calendar")