Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-12 01:44:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix escaping of braces in OIDC sample config. (#9317)

Browse Source 
This fixes the Jinja2 templates for the mapping provider.
This commit is contained in:
Patrick Cloke 2021-02-04 09:06:20 -05:00 committed by GitHub
parent 2814028ce5
commit 2ab6e67ab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9317.doc Normal file
View File

@ -0,0 +1 @@
Fix the braces in the `oidc_providers` section of the sample config.

10
docs/sample_config.yaml
View File

@ -1872,9 +1872,9 @@ oidc_providers:
# user_mapping_provider: # user_mapping_provider:
# config: # config:
# subject_claim: "id" # subject_claim: "id"
# localpart_template: "{ user.login }" # localpart_template: "{{ user.login }}"
# display_name_template: "{ user.name }" # display_name_template: "{{ user.name }}"
# email_template: "{ user.email }" # email_template: "{{ user.email }}"
# For use with Keycloak # For use with Keycloak
# #
@ -1901,8 +1901,8 @@ oidc_providers:
# user_mapping_provider: # user_mapping_provider:
# config: # config:
# subject_claim: "id" # subject_claim: "id"
# localpart_template: "{ user.login }" # localpart_template: "{{ user.login }}"
# display_name_template: "{ user.name }" # display_name_template: "{{ user.name }}"
# Enable Central Authentication Service (CAS) for registration and login. # Enable Central Authentication Service (CAS) for registration and login.

10
synapse/config/oidc_config.py
View File

@ -198,9 +198,9 @@ class OIDCConfig(Config):
# user_mapping_provider: # user_mapping_provider:
# config: # config:
# subject_claim: "id" # subject_claim: "id"
# localpart_template: "{{ user.login }}" # localpart_template: "{{{{ user.login }}}}"
# display_name_template: "{{ user.name }}" # display_name_template: "{{{{ user.name }}}}"
# email_template: "{{ user.email }}" # email_template: "{{{{ user.email }}}}"
# For use with Keycloak # For use with Keycloak
# #
@ -227,8 +227,8 @@ class OIDCConfig(Config):
# user_mapping_provider: # user_mapping_provider:
# config: # config:
# subject_claim: "id" # subject_claim: "id"
# localpart_template: "{{ user.login }}" # localpart_template: "{{{{ user.login }}}}"
# display_name_template: "{{ user.name }}" # display_name_template: "{{{{ user.name }}}}"
""".format( """.format(
mapping_provider=DEFAULT_USER_MAPPING_PROVIDER mapping_provider=DEFAULT_USER_MAPPING_PROVIDER
) )