Fix JWT login with new users (#5586)

matrix-org · Feb 14, 2020 · 047abb9 · 047abb9
2 parents f7a85a4 + 948488e
commit 047abb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/changelog.d/5586.bugfix b/changelog.d/5586.bugfix
@@ -0,0 +1 @@
+Fixed m.login.jwt using unregistred user_id and added pyjwt>=1.6.4 as jwt conditional dependencies. Contributed by Pau Rodriguez-Estivill.
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
@@ -319,12 +319,12 @@ def do_jwt_login(self, login_submission):
  raise LoginError(401, "Invalid JWT", errcode=Codes.UNAUTHORIZED)
 
  user_id = UserID(user, self.hs.hostname).to_string()
+ device_id = login_submission.get("device_id")
+ initial_display_name = login_submission.get("initial_device_display_name")
 
  auth_handler = self.auth_handler
  registered_user_id = yield auth_handler.check_user_exists(user_id)
  if registered_user_id:
- device_id = login_submission.get("device_id")
- initial_display_name = login_submission.get("initial_device_display_name")
  device_id, access_token = yield self.registration_handler.register_device(
  registered_user_id, device_id, initial_display_name
  )
@@ -338,11 +338,8 @@ def do_jwt_login(self, login_submission):
  user_id, access_token = (
  yield self.registration_handler.register(localpart=user)
  )
-
- device_id = login_submission.get("device_id")
- initial_display_name = login_submission.get("initial_device_display_name")
  device_id, access_token = yield self.registration_handler.register_device(
- registered_user_id, device_id, initial_display_name
+ user_id, device_id, initial_display_name
  )
 
  result = {