paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth: Allow setting GOOGLE_OAUTH2_CLIENT_ID from dev-secrets.

Browse Source 
This makes it much more convenient to use Google/GitHub authentication
in a Zulip development environment for testing; one only has to set it
up once.
This commit is contained in:
Vishnu Ks
2019-06-14 01:00:55 +05:30
committed by Tim Abbott
parent 16a345a766
commit cc91e6cb94
5 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/zerver/config_error.html
View File

@@ -49,7 +49,11 @@
{% endif %}
{% if google_error %}
{{ render_markdown_path('zerver/google-error.md', {"root_domain_uri": root_domain_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }}
{% if development_environment %}
{{ render_markdown_path('zerver/google-error.md', {"root_domain_uri": root_domain_uri, "settings_path": secrets_path, "secrets_path": secrets_path, "client_id_key_name": "google_oauth2_client_id"}) }}
{% else %}
{{ render_markdown_path('zerver/google-error.md', {"root_domain_uri": root_domain_uri, "settings_path": settings_path, "secrets_path": secrets_path, "client_id_key_name": "GOOGLE_OAUTH2_CLIENT_ID"}) }}
{% endif %}
{% endif %}
{% if github_error %}