paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

video_calls: Drop VIDEO_ZOOM_TESTING_ configurations.

Browse Source 
These are no longer needed.
This commit is contained in:
Alex Vandiver
2021-12-13 12:32:23 -08:00
committed by Tim Abbott
parent 5ccbd0eade
commit e43373cc1f
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/views/video_calls.py
View File

@@ -52,9 +52,6 @@ def get_zoom_session(user: UserProfile) -> OAuth2Session:
client_id = settings.VIDEO_ZOOM_CLIENT_ID client_id = settings.VIDEO_ZOOM_CLIENT_ID
client_secret = settings.VIDEO_ZOOM_CLIENT_SECRET client_secret = settings.VIDEO_ZOOM_CLIENT_SECRET
if user.realm.string_id in settings.VIDEO_ZOOM_TESTING_REALMS: # nocoverage
client_id = settings.VIDEO_ZOOM_TESTING_CLIENT_ID
client_secret = settings.VIDEO_ZOOM_TESTING_CLIENT_SECRET
return OAuth2Session( return OAuth2Session(
client_id, client_id,
@@ -129,8 +126,6 @@ def complete_zoom_user_in_realm(
raise JsonableError(_("Invalid Zoom session identifier")) raise JsonableError(_("Invalid Zoom session identifier"))
client_secret = settings.VIDEO_ZOOM_CLIENT_SECRET client_secret = settings.VIDEO_ZOOM_CLIENT_SECRET
if request.user.realm.string_id in settings.VIDEO_ZOOM_TESTING_REALMS: # nocoverage
client_secret = settings.VIDEO_ZOOM_TESTING_CLIENT_SECRET
oauth = get_zoom_session(request.user) oauth = get_zoom_session(request.user)
try: try:

5
zproject/default_settings.py
View File

@@ -1,5 +1,5 @@
import os import os
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set from typing import TYPE_CHECKING, Any, Dict, List, Optional
from scripts.lib.zulip_tools import deport from scripts.lib.zulip_tools import deport
@@ -110,9 +110,6 @@ SSO_APPEND_DOMAIN: Optional[str] = None
VIDEO_ZOOM_CLIENT_ID = get_secret("video_zoom_client_id", development_only=True) VIDEO_ZOOM_CLIENT_ID = get_secret("video_zoom_client_id", development_only=True)
VIDEO_ZOOM_CLIENT_SECRET = get_secret("video_zoom_client_secret") VIDEO_ZOOM_CLIENT_SECRET = get_secret("video_zoom_client_secret")
VIDEO_ZOOM_TESTING_REALMS: Set[str] = set()
VIDEO_ZOOM_TESTING_CLIENT_ID = get_secret("video_zoom_testing_client_id", development_only=True)
VIDEO_ZOOM_TESTING_CLIENT_SECRET = get_secret("video_zoom_testing_client_secret")
# Email gateway # Email gateway
EMAIL_GATEWAY_PATTERN = "" EMAIL_GATEWAY_PATTERN = ""