code beautify
parent
77c5db5977
commit
f53bae0c19
|
@ -27,6 +27,7 @@ from .appservice import AppServiceConfig
|
|||
from .key import KeyConfig
|
||||
from .saml2 import SAML2Config
|
||||
|
||||
|
||||
class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
|
||||
RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
|
||||
VoipConfig, RegistrationConfig, MetricsConfig,
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
|
||||
from ._base import Config
|
||||
|
||||
|
||||
class SAML2Config(Config):
|
||||
def read_config(self, config):
|
||||
self.saml2_config = config["saml2_config"]
|
||||
|
@ -24,4 +25,4 @@ class SAML2Config(Config):
|
|||
saml2_config:
|
||||
config_path: "%s/sp_conf.py"
|
||||
idp_redirect_url: "http://%s/idp"
|
||||
"""%(config_dir_path, server_name)
|
||||
""" % (config_dir_path, server_name)
|
||||
|
|
|
@ -221,7 +221,6 @@ class RegistrationHandler(BaseHandler):
|
|||
logger.exception(e)
|
||||
defer.returnValue((user_id, token))
|
||||
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def register_email(self, threepidCreds):
|
||||
"""
|
||||
|
|
Loading…
Reference in New Issue