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

corporate: Fix decorators to pass arguments and update signatures.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
(cherry picked from commit 65846c8543)
This commit is contained in:
Anders Kaseorg
2024-09-24 14:27:25 -07:00
committed by Tim Abbott
parent f878ecf207
commit c6eca2cdab
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
corporate/lib/decorator.py
View File

@@ -1,3 +1,4 @@
import inspect
from collections.abc import Callable from collections.abc import Callable
from functools import wraps from functools import wraps
from typing import Concatenate from typing import Concatenate
@@ -65,7 +66,7 @@ def authenticated_remote_realm_management_endpoint(
if not is_self_hosting_management_subdomain(request): # nocoverage if not is_self_hosting_management_subdomain(request): # nocoverage
return render(request, "404.html", status=404) return render(request, "404.html", status=404)
realm_uuid = kwargs.get("realm_uuid") realm_uuid = kwargs.pop("realm_uuid")
if realm_uuid is not None and not isinstance(realm_uuid, str): # nocoverage if realm_uuid is not None and not isinstance(realm_uuid, str): # nocoverage
raise TypeError("realm_uuid must be a string or None") raise TypeError("realm_uuid must be a string or None")
@@ -124,7 +125,16 @@ def authenticated_remote_realm_management_endpoint(
billing_session = RemoteRealmBillingSession( billing_session = RemoteRealmBillingSession(
remote_realm, remote_billing_user=remote_billing_user remote_realm, remote_billing_user=remote_billing_user
) )
return view_func(request, billing_session) return view_func(request, billing_session, *args, **kwargs)
signature = inspect.signature(view_func)
request_parameter, billing_session_parameter, *other_parameters = signature.parameters.values()
_wrapped_view_func.__signature__ = signature.replace( # type: ignore[attr-defined] # too magic
parameters=[request_parameter, *other_parameters]
)
_wrapped_view_func.__annotations__ = {
k: v for k, v in view_func.__annotations__.items() if k != billing_session_parameter.name
}
return _wrapped_view_func return _wrapped_view_func
@@ -165,7 +175,7 @@ def authenticated_remote_server_management_endpoint(
if not is_self_hosting_management_subdomain(request): # nocoverage if not is_self_hosting_management_subdomain(request): # nocoverage
return render(request, "404.html", status=404) return render(request, "404.html", status=404)
server_uuid = kwargs.get("server_uuid") server_uuid = kwargs.pop("server_uuid")
if not isinstance(server_uuid, str): if not isinstance(server_uuid, str):
raise TypeError("server_uuid must be a string") # nocoverage raise TypeError("server_uuid must be a string") # nocoverage
@@ -199,6 +209,15 @@ def authenticated_remote_server_management_endpoint(
billing_session = RemoteServerBillingSession( billing_session = RemoteServerBillingSession(
remote_server, remote_billing_user=remote_billing_user remote_server, remote_billing_user=remote_billing_user
) )
return view_func(request, billing_session) return view_func(request, billing_session, *args, **kwargs)
signature = inspect.signature(view_func)
request_parameter, billing_session_parameter, *other_parameters = signature.parameters.values()
_wrapped_view_func.__signature__ = signature.replace( # type: ignore[attr-defined] # too magic
parameters=[request_parameter, *other_parameters]
)
_wrapped_view_func.__annotations__ = {
k: v for k, v in view_func.__annotations__.items() if k != billing_session_parameter.name
}
return _wrapped_view_func return _wrapped_view_func