mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-05 04:04:59 -04:00
hs: Make /login accept full user IDs or just local parts. webclient: Only enable Register button when both password fields match.
This commit is contained in:
parent
53147e5ae4
commit
ca3747fb2f
3 changed files with 6 additions and 8 deletions
|
@ -16,6 +16,7 @@
|
|||
from twisted.internet import defer
|
||||
|
||||
from ._base import BaseHandler
|
||||
from synapse.types import UserID
|
||||
from synapse.api.errors import LoginError, Codes
|
||||
|
||||
import bcrypt
|
||||
|
@ -35,7 +36,7 @@ class LoginHandler(BaseHandler):
|
|||
"""Login as the specified user with the specified password.
|
||||
|
||||
Args:
|
||||
user (str): The user ID.
|
||||
user (str): The user ID or username.
|
||||
password (str): The password.
|
||||
Returns:
|
||||
The newly allocated access token.
|
||||
|
@ -47,6 +48,9 @@ class LoginHandler(BaseHandler):
|
|||
if not hasattr(self, "reg_handler"):
|
||||
self.reg_handler = self.hs.get_handlers().registration_handler
|
||||
|
||||
if not user.startswith('@'):
|
||||
user = UserID.create_local(user, self.hs).to_string()
|
||||
|
||||
# pull out the hash for this user if they exist
|
||||
user_info = yield self.store.get_user_by_id(user_id=user)
|
||||
if not user_info:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue