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

Merge pull request #2052 from maxberger/removelegacy

Browse Source 
remove legacy bday sharing
This commit is contained in:
Peter Bieringer
2026-03-28 10:02:52 +01:00
committed by GitHub
parent 317fb89fbf 69a6a61ef8
commit de74d66e89
5 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
radicale/sharing/__init__.py
View File

@@ -16,11 +16,9 @@
# along with Radicale. If not, see <http://www.gnu.org/licenses/>. # along with Radicale. If not, see <http://www.gnu.org/licenses/>.
import base64 import base64
import copy # TODO: remove/3.7.0-final
import io import io
import json import json
import logging import logging
import os # TODO: remove/3.7.0-final
import re import re
import socket import socket
import uuid import uuid
@@ -82,10 +80,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 +157,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 +833,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 +864,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 +1250,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")

3
radicale/web/internal_data/js/scenes/CollectionsScene.js
View File

@@ -183,8 +183,7 @@ export class CollectionsScene {
let share_info = get_element(node, "[data-name=shared-by]"); let share_info = get_element(node, "[data-name=shared-by]");
let transformed_from = get_element(node, "[data-name=transformed-from]"); let transformed_from = get_element(node, "[data-name=transformed-from]");
let share = (shares || []).find( let share = (shares || []).find(
// TODO: Eventually remove the check for "bday" s => (s.ShareType === "map") &&
s => (s.ShareType === "map" || s.ShareType === "bday") &&
(s.PathOrToken || "").replace(/\/+$/, "") === (collection.href || "").replace(/\/+$/, "")); (s.PathOrToken || "").replace(/\/+$/, "") === (collection.href || "").replace(/\/+$/, ""));
if (share) { if (share) {
if (share.Owner !== user) { if (share.Owner !== user) {

3
radicale/web/internal_data/js/scenes/IncomingSharingScene.js
View File

@@ -99,8 +99,7 @@ export class IncomingSharingScene {
let prefix = "/" + user + "/"; let prefix = "/" + user + "/";
let filtered_shares = shares.filter( let filtered_shares = shares.filter(
// TODO: Eventually remove bday share => (share.ShareType === "map")
share => (share.ShareType === "map" || share.ShareType === "bday")
&& share.PathOrToken.startsWith(prefix)); && share.PathOrToken.startsWith(prefix));
if (filtered_shares.length === 0) { if (filtered_shares.length === 0) {

3
radicale/web/internal_data/js/scenes/ShareCollectionScene.js
View File

@@ -225,8 +225,7 @@ function add_share_rows(user, password, collection, shares, errorHandler) {
if (share["ShareType"] === "token") { if (share["ShareType"] === "token") {
add_share_row_node(user, password, collection, share, token_template, "share", delete_share_by_token, errorHandler); add_share_row_node(user, password, collection, share, token_template, "share", delete_share_by_token, errorHandler);
} }
// TODO: Eventually remove bday else if (share["ShareType"] === "map") {
else if (share["ShareType"] === "map" || share["ShareType"] === "bday") {
add_share_row_node(user, password, collection, share, map_template, "map", delete_share_by_map, errorHandler); add_share_row_node(user, password, collection, share, map_template, "map", delete_share_by_map, errorHandler);
} }
} }