OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Update wording and config

pull/7067/head
Brendan Abolivier 2020-03-11 19:40:30 +00:00
parent e55a240681
commit 900bca9707
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/sample_config.yaml
View File

@ -1365,6 +1365,9 @@ saml2_config:
# If no file is provided, this defaults to some minimalistic HTML telling the # If no file is provided, this defaults to some minimalistic HTML telling the
# user that something went wrong and they should try authenticating again. # user that something went wrong and they should try authenticating again.
# #
# See https://github.com/matrix-org/synapse/blob/master/synapse/res/templates/saml_error.html
# for an example.
#
#error_html_path: /path/to/static/content/saml_error.html #error_html_path: /path/to/static/content/saml_error.html

3
synapse/config/saml2_config.py
View File

@ -343,6 +343,9 @@ class SAML2Config(Config):
# If no file is provided, this defaults to some minimalistic HTML telling the # If no file is provided, this defaults to some minimalistic HTML telling the
# user that something went wrong and they should try authenticating again. # user that something went wrong and they should try authenticating again.
# #
# See https://github.com/matrix-org/synapse/blob/master/synapse/res/templates/saml_error.html
# for an example.
#
#error_html_path: /path/to/static/content/saml_error.html #error_html_path: /path/to/static/content/saml_error.html
""" % { """ % {
"config_dir_path": config_dir_path "config_dir_path": config_dir_path

4
synapse/res/templates/saml_error.html
View File

@ -24,8 +24,8 @@
// we just don't print anything specific. // we just don't print anything specific.
let searchStr = ""; let searchStr = "";
if (window.location.search) { if (window.location.search) {
// For some reason window.location.searchParams isn't always defined when // window.location.searchParams isn't always defined when
// window.location.search is, so we can't just use it right away. // window.location.search is, so it's more reliable to parse the latter.
searchStr = window.location.search; searchStr = window.location.search;
} else if (window.location.hash) { } else if (window.location.hash) {
// Replace the # with a ? so that URLSearchParams does the right thing and // Replace the # with a ? so that URLSearchParams does the right thing and