CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-12 21:04:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

secrets: Make it a bit easier to do GitHub auth in development.

Browse Source
This commit is contained in:
Tim Abbott 2018-04-22 13:42:20 -07:00
parent b91de0e283
commit fb6cc4cb65
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zproject/settings.py
View File

@ -40,7 +40,9 @@ if PRODUCTION:
else:
secrets_file.read(os.path.join(DEPLOY_ROOT, "zproject/dev-secrets.conf"))
def get_secret(key: str) -> Optional[str]:
def get_secret(key: str, development_only=False) -> Optional[str]:
if development_only and PRODUCTION:
return None
if secrets_file.has_option('secrets', key):
return secrets_file.get('secrets', key)
return None
@ -134,8 +136,9 @@ DEFAULT_SETTINGS = {
'AUTH_LDAP_SERVER_URI': "",
'LDAP_EMAIL_ATTR': None,
# Social auth
'SOCIAL_AUTH_GITHUB_KEY': None,
# Social auth; we support providing values for some of these
# settings in zulip-secrets.conf instead of settings.py in development.
'SOCIAL_AUTH_GITHUB_KEY': get_secret('social_auth_github_key', development_only=True),
'SOCIAL_AUTH_GITHUB_ORG_NAME': None,
'SOCIAL_AUTH_GITHUB_TEAM_ID': None,