paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend: Add request as parameter to json_success.

Browse Source 
Adds request as a parameter to json_success as a refactor towards
making `ignored_parameters_unsupported` functionality available
for all API endpoints.

Also, removes any data parameters that are an empty dict or
a dict with the generic success response values.
This commit is contained in:
Lauryn Menard
2022-01-31 13:44:02 +01:00
committed by Tim Abbott
parent 6f7e53c517
commit 3be622ffa7
139 changed files with 304 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zilencer/views.py
View File

@@ -84,7 +84,7 @@ def deactivate_remote_server(
remote_server: RemoteZulipServer,
) -> HttpResponse:
do_deactivate_remote_server(remote_server)
return json_success()
return json_success(request)
@csrf_exempt
@@ -146,7 +146,7 @@ def register_remote_server(
remote_server.api_key = new_org_key
remote_server.save()
return json_success({"created": created})
return json_success(request, data={"created": created})
@has_request_variables
@@ -174,7 +174,7 @@ def register_remote_push_device(
except IntegrityError:
pass
return json_success()
return json_success(request)
@has_request_variables
@@ -193,7 +193,7 @@ def unregister_remote_push_device(
if deleted[0] == 0:
raise JsonableError(err_("Token does not exist"))
return json_success()
return json_success(request)
@has_request_variables
@@ -204,7 +204,7 @@ def unregister_all_remote_push_devices(
) -> HttpResponse:
server = validate_entity(entity)
RemotePushDeviceToken.objects.filter(user_id=user_id, server=server).delete()
return json_success()
return json_success(request)
@has_request_variables
@@ -269,7 +269,11 @@ def remote_server_notify_push(
send_apple_push_notification(user_id, apple_devices, apns_payload, remote=server)
return json_success(
{"total_android_devices": len(android_devices), "total_apple_devices": len(apple_devices)}
request,
data={
"total_android_devices": len(android_devices),
"total_apple_devices": len(apple_devices),
},
)
@@ -403,7 +407,7 @@ def remote_server_post_analytics(
]
batch_create_table_data(server, RemoteRealmAuditLog, row_objects)
return json_success()
return json_success(request)
def get_last_id_from_server(server: RemoteZulipServer, model: Any) -> int:
@@ -424,4 +428,4 @@ def remote_server_check_analytics(
"last_installation_count_id": get_last_id_from_server(server, RemoteInstallationCount),
"last_realmauditlog_id": get_last_id_from_server(server, RemoteRealmAuditLog),
}
return json_success(result)
return json_success(request, data=result)