diff options
author | Erik Johnston <erik@matrix.org> | 2016-04-26 11:07:22 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-04-26 11:07:22 +0100 |
commit | 3306cf45ca3532506db1eaee85f60b422a9810c9 (patch) | |
tree | 8e9e998985adb44ca1c2044f73f31a1002880e12 /synapse/rest | |
parent | Merge pull request #752 from matrix-org/markjh/more_updates (diff) | |
parent | Make pyjwt dependency optional (diff) | |
download | synapse-3306cf45ca3532506db1eaee85f60b422a9810c9.tar.xz |
Merge pull request #750 from matrix-org/erikj/jwt_optional
Make pyjwt dependency optional
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/client/v1/login.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 166a78026a..3b5544851b 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -33,9 +33,6 @@ from saml2.client import Saml2Client import xml.etree.ElementTree as ET -import jwt -from jwt.exceptions import InvalidTokenError - logger = logging.getLogger(__name__) @@ -226,8 +223,13 @@ class LoginRestServlet(ClientV1RestServlet): def do_jwt_login(self, login_submission): token = login_submission.get("token", None) if token is None: - raise LoginError(401, "Token field for JWT is missing", - errcode=Codes.UNAUTHORIZED) + raise LoginError( + 401, "Token field for JWT is missing", + errcode=Codes.UNAUTHORIZED + ) + + import jwt + from jwt.exceptions import InvalidTokenError try: payload = jwt.decode(token, self.jwt_secret, algorithms=[self.jwt_algorithm]) |