Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"

This reverts commit 0d43f991a1.
This commit is contained in:
Neil Johnson 2018-08-13 18:06:18 +01:00
parent 0d43f991a1
commit ce7de9ae6b
7 changed files with 22 additions and 45 deletions

View file

@ -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
)