MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-06-18 10:38:21 +02:00
Code Issues Projects Releases Wiki Activity

code beautify

Browse source
This commit is contained in:
Muthu Subramanian 2015-07-08 16:05:46 +05:30
parent 77c5db5977
commit f53bae0c19
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
synapse/config/homeserver.py
View file

@ -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,

3
synapse/config/saml2.py
View file

@ -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)

1
synapse/handlers/register.py
View file

@ -220,7 +220,6 @@ class RegistrationHandler(BaseHandler):
# Ignore Registration errors
logger.exception(e)
defer.returnValue((user_id, token))
@defer.inlineCallbacks
def register_email(self, threepidCreds):