summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-29 16:31:42 +0100
committerErik Johnston <erik@matrix.org>2016-03-29 16:31:42 +0100
commitf5bf45a2e59ced3c1413e7e14328eb665b6ecefb (patch)
treef42e1f7c81c175f24085d8e4dbf410530d80363c /synapse/config/homeserver.py
parentMerge pull request #668 from matrix-org/markjh/deduplicate (diff)
parentAdd JWT support (diff)
downloadsynapse-f5bf45a2e59ced3c1413e7e14328eb665b6ecefb.tar.xz
Merge pull request #671 from nikriek/jwt-support
Support login using Javascript Web Tokens (JWT)
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py

index a08c170f1d..acf74c8761 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -29,13 +29,14 @@ from .key import KeyConfig from .saml2 import SAML2Config from .cas import CasConfig from .password import PasswordConfig +from .jwt import JWTConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, - PasswordConfig,): + JWTConfig, PasswordConfig,): pass