diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 4f028078fa..9c62ec4374 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -781,15 +781,11 @@ class Auth(object):
"""
if self.hs.config.hs_disabled:
raise AuthError(
- 403, self.hs.config.hs_disabled_message,
- errcode=Codes.HS_DISABLED,
- admin_email=self.hs.config.admin_email,
+ 403, self.hs.config.hs_disabled_message, errcode=Codes.HS_DISABLED
)
if self.hs.config.limit_usage_by_mau is True:
current_mau = yield self.store.get_monthly_active_count()
if current_mau >= self.hs.config.max_mau_value:
raise AuthError(
- 403, "MAU Limit Exceeded",
- admin_email=self.hs.config.admin_email,
- errcode=Codes.MAU_LIMIT_EXCEEDED
+ 403, "MAU Limit Exceeded", errcode=Codes.MAU_LIMIT_EXCEEDED
)
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index d74848159e..dc3bed5fcb 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -225,20 +225,11 @@ class NotFoundError(SynapseError):
class AuthError(SynapseError):
"""An error raised when there was a problem authorising an event."""
+
def __init__(self, *args, **kwargs):
if "errcode" not in kwargs:
kwargs["errcode"] = Codes.FORBIDDEN
- self.admin_email = kwargs.get('admin_email')
- self.msg = kwargs.get('msg')
- self.errcode = kwargs.get('errcode')
- super(AuthError, self).__init__(*args, errcode=kwargs["errcode"])
-
- def error_dict(self):
- return cs_error(
- self.msg,
- self.errcode,
- admin_email=self.admin_email,
- )
+ super(AuthError, self).__init__(*args, **kwargs)
class EventSizeError(SynapseError):
|
