Merge pull request #318 from matrix-org/syn-502-login-bad-emails

Don't 500 on /login when the email doesn't map to a valid user ID.
This commit is contained in:
Kegsay 2015-10-21 10:16:33 +01:00
commit 8627048787

View File

@ -101,6 +101,8 @@ class LoginRestServlet(ClientV1RestServlet):
user_id = yield self.hs.get_datastore().get_user_id_by_threepid(
login_submission['medium'], login_submission['address']
)
if not user_id:
raise LoginError(403, "", errcode=Codes.FORBIDDEN)
else:
user_id = login_submission['user']