From e9581521721521be5811e75dca9fe6cdfaaaacd8 Mon Sep 17 00:00:00 2001 From: Marcus Schopen Date: Wed, 4 Nov 2020 16:09:24 +0100 Subject: [PATCH 1/8] add saml element examples --- docs/sample_config.yaml | 18 ++++++++++++++++++ synapse/config/saml2_config.py | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 7e2cf97c3efc..0107adeb82f6 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1559,6 +1559,24 @@ saml2_config: #description: ["My awesome SP", "en"] #name: ["Test SP", "en"] + + #ui_info: + # display_name: + # - lang: en + # text: "Display Name is the descriptive name of your service." + # description: + # - lang: en + # text: "Description should be a short paragraph explaining the purpose of the service." + # information_url: + # - lang: en + # text: "https://example.com/terms-of-service" + # privacy_statement_url: + # - lang: en + # text: "https://example.com/privacy-policy" + # logo: + # text: "https://example.com/logo.svg" + # width: "200" + # height: "80" #organization: # name: Example com diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index 778750f43be0..e0dd9a040cd6 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -271,6 +271,24 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs): #description: ["My awesome SP", "en"] #name: ["Test SP", "en"] + #ui_info: + # display_name: + # - lang: en + # text: "Display Name is the descriptive name of your service." + # description: + # - lang: en + # text: "Description should be a short paragraph explaining the purpose of the service." + # information_url: + # - lang: en + # text: "https://example.com/terms-of-service" + # privacy_statement_url: + # - lang: en + # text: "https://example.com/privacy-policy" + # logo: + # text: "https://example.com/logo.svg" + # width: "200" + # height: "80" + #organization: # name: Example com # display_name: From 01f4f325f262218e702e031bd578dd7b16f3cf45 Mon Sep 17 00:00:00 2001 From: Marcus Schopen Date: Wed, 4 Nov 2020 16:16:14 +0100 Subject: [PATCH 2/8] add changelog file --- changelog.d/8718.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/8718.misc diff --git a/changelog.d/8718.misc b/changelog.d/8718.misc new file mode 100644 index 000000000000..d2640bb2f474 --- /dev/null +++ b/changelog.d/8718.misc @@ -0,0 +1 @@ +add some mdui:UIInfo element examples for saml2_config in homeserver.yaml. \ No newline at end of file From 9c63ea49fb54fcbffc254c3c578678e90d2af07a Mon Sep 17 00:00:00 2001 From: Marcus Schopen Date: Wed, 4 Nov 2020 16:18:27 +0100 Subject: [PATCH 3/8] missing new line in changelog file --- changelog.d/8718.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/8718.misc b/changelog.d/8718.misc index d2640bb2f474..93d12ade03a9 100644 --- a/changelog.d/8718.misc +++ b/changelog.d/8718.misc @@ -1 +1 @@ -add some mdui:UIInfo element examples for saml2_config in homeserver.yaml. \ No newline at end of file +add some mdui:UIInfo element examples for saml2_config in homeserver.yaml. From 4778520ad157dbfa57a3b643a1a8ec9ac2ffd308 Mon Sep 17 00:00:00 2001 From: Marcus Schopen Date: Wed, 4 Nov 2020 16:52:16 +0100 Subject: [PATCH 4/8] blank line contains whitespace --- synapse/config/saml2_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index e0dd9a040cd6..bfbd988bd2bf 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -288,7 +288,7 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs): # text: "https://example.com/logo.svg" # width: "200" # height: "80" - + #organization: # name: Example com # display_name: From 9bd83451ebd705883d3a94528653d454c1b66d56 Mon Sep 17 00:00:00 2001 From: Marcus Schopen Date: Wed, 4 Nov 2020 17:18:01 +0100 Subject: [PATCH 5/8] again blank line contains whitespace --- docs/sample_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 0107adeb82f6..360a1df1357f 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1559,7 +1559,7 @@ saml2_config: #description: ["My awesome SP", "en"] #name: ["Test SP", "en"] - + #ui_info: # display_name: # - lang: en From 8b67770a5fe323e47e1ea00df806aa5eac86510c Mon Sep 17 00:00:00 2001 From: Marcus Schopen Date: Sat, 7 Nov 2020 13:13:39 +0100 Subject: [PATCH 6/8] add list of dict for ui_info: logo --- docs/sample_config.yaml | 7 ++++--- synapse/config/saml2_config.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 360a1df1357f..0ac3eabf2f33 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1574,9 +1574,10 @@ saml2_config: # - lang: en # text: "https://example.com/privacy-policy" # logo: - # text: "https://example.com/logo.svg" - # width: "200" - # height: "80" + # - lang: en + # text: "https://example.com/logo.svg" + # width: "200" + # height: "80" #organization: # name: Example com diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index bfbd988bd2bf..bdfef765e8d5 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -285,9 +285,10 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs): # - lang: en # text: "https://example.com/privacy-policy" # logo: - # text: "https://example.com/logo.svg" - # width: "200" - # height: "80" + # - lang: en + # text: "https://example.com/logo.svg" + # width: "200" + # height: "80" #organization: # name: Example com From 8d91039fb472e8b5301a8deb22574ce14e79644a Mon Sep 17 00:00:00 2001 From: Marcus Schopen Date: Sat, 7 Nov 2020 13:18:19 +0100 Subject: [PATCH 7/8] add keywords element for ui_info: --- docs/sample_config.yaml | 3 +++ synapse/config/saml2_config.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 0ac3eabf2f33..c0cd0092309a 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1573,6 +1573,9 @@ saml2_config: # privacy_statement_url: # - lang: en # text: "https://example.com/privacy-policy" + # keywords: + # - lang: en + # text: ["Matrix", "Element"] # logo: # - lang: en # text: "https://example.com/logo.svg" diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index bdfef765e8d5..2ff7dfb311c8 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -284,6 +284,9 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs): # privacy_statement_url: # - lang: en # text: "https://example.com/privacy-policy" + # keywords: + # - lang: en + # text: ["Matrix", "Element"] # logo: # - lang: en # text: "https://example.com/logo.svg" From 5c1c0215b42e1825c4346e01b77df1228f35ad0c Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Fri, 13 Nov 2020 11:50:31 +0000 Subject: [PATCH 8/8] Update changelog.d/8718.misc --- changelog.d/8718.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/8718.misc b/changelog.d/8718.misc index 93d12ade03a9..f1868ce7091a 100644 --- a/changelog.d/8718.misc +++ b/changelog.d/8718.misc @@ -1 +1 @@ -add some mdui:UIInfo element examples for saml2_config in homeserver.yaml. +Add some `mdui:UIInfo` element examples for `saml2_config` in the homeserver config.