Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move GOOGLE_OAUTH2_CLIENT_SECRET to be read in settings.py. 

(imported from commit 814dc32cd6099516486be76fa8baffbafda69596)
This commit is contained in:
Yoyo Zhou 2015-08-20 22:10:04 -07:00
parent 4b3874988f
commit bd5fc484f0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zproject/local_settings.py
View File

@ -93,11 +93,9 @@ GOOGLE_CLIENT_ID = "835904834568-77mtr5mtmpgspj9b051del9i9r5t4g4n.apps.googleuse
if DEPLOYED:
GOOGLE_OAUTH2_CLIENT_ID = '835904834568-ag4p18v0sd9a0tero14r3gekn6shoen3.apps.googleusercontent.com'
GOOGLE_OAUTH2_CLIENT_SECRET = get_secret('google_oauth2_client_secret')
else:
# Google OAUTH2 for dev with the redirect uri set to http://localhost:9991/accounts/login/google/done/
GOOGLE_OAUTH2_CLIENT_ID = '607830223128-4qgthc7ofdqce232dk690t5jgkm1ce33.apps.googleusercontent.com'
GOOGLE_OAUTH2_CLIENT_SECRET = get_secret('dev_google_oauth2_client_secret')
# Administrator domain for this install
ADMIN_DOMAIN = "zulip.com"

2
zproject/settings.py
View File

@ -431,6 +431,8 @@ S3_SECRET_KEY = get_secret("s3_secret_key")
# https://cloud.google.com/console/project/apps~zulip-android/apiui/credential
ANDROID_GCM_API_KEY = get_secret("android_gcm_api_key")
GOOGLE_OAUTH2_CLIENT_SECRET = get_secret('google_oauth2_client_secret')
DROPBOX_APP_KEY = get_secret("dropbox_app_key")
# Twitter API credentials