Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Kill off RegistrationError (#6691)

Browse Source 
This is pretty pointless. Let's just use SynapseError.
This commit is contained in:
Richard van der Hoff 2020-01-13 12:48:22 +00:00 committed by GitHub
parent 2d07c73777
commit 326c893d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6691.misc Normal file
View File

@ -0,0 +1 @@
Remove redundant RegistrationError class.

6
synapse/api/errors.py
View File

@ -158,12 +158,6 @@ class UserDeactivatedError(SynapseError):
) )
class RegistrationError(SynapseError):
"""An error raised when a registration event fails."""
pass
class FederationDeniedError(SynapseError): class FederationDeniedError(SynapseError):
"""An error raised when the server tries to federate with a server which """An error raised when the server tries to federate with a server which
is not on its federation whitelist. is not on its federation whitelist.

12
synapse/handlers/register.py
View File

@ -20,13 +20,7 @@ from twisted.internet import defer
from synapse import types from synapse import types
from synapse.api.constants import MAX_USERID_LENGTH, LoginType from synapse.api.constants import MAX_USERID_LENGTH, LoginType
from synapse.api.errors import ( from synapse.api.errors import AuthError, Codes, ConsentNotGivenError, SynapseError
AuthError,
Codes,
ConsentNotGivenError,
RegistrationError,
SynapseError,
)
from synapse.config.server import is_threepid_reserved from synapse.config.server import is_threepid_reserved
from synapse.http.servlet import assert_params_in_dict from synapse.http.servlet import assert_params_in_dict
from synapse.replication.http.login import RegisterDeviceReplicationServlet from synapse.replication.http.login import RegisterDeviceReplicationServlet
@ -165,7 +159,7 @@ class RegistrationHandler(BaseHandler):
Returns: Returns:
Deferred[str]: user_id Deferred[str]: user_id
Raises: Raises:
RegistrationError if there was a problem registering. SynapseError if there was a problem registering.
""" """
yield self.check_registration_ratelimit(address) yield self.check_registration_ratelimit(address)
@ -182,7 +176,7 @@ class RegistrationHandler(BaseHandler):
if not was_guest: if not was_guest:
try: try:
int(localpart) int(localpart)
raise RegistrationError( raise SynapseError(
400, "Numeric user IDs are reserved for guest users." 400, "Numeric user IDs are reserved for guest users."
) )
except ValueError: except ValueError:

2
tests/handlers/test_register.py
View File

@ -269,8 +269,6 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
one will be randomly generated. one will be randomly generated.
Returns: Returns:
A tuple of (user_id, access_token). A tuple of (user_id, access_token).
Raises:
RegistrationError if there was a problem registering.
""" """
if localpart is None: if localpart is None:
raise SynapseError(400, "Request must include user id") raise SynapseError(400, "Request must include user id")