Create and join video calls with a single click. Powered - by your choice of Zoom, Jitsi Meet, or Google Hangouts. + by your choice of Jitsi Meet or Zoom.
diff --git a/templates/zerver/help/start-a-call.md b/templates/zerver/help/start-a-call.md index 9c76023982..3441c1a34a 100644 --- a/templates/zerver/help/start-a-call.md +++ b/templates/zerver/help/start-a-call.md @@ -25,25 +25,23 @@ By default, Zulip integrates with source video conferencing solution. Organization administrators can also change the organization's video chat provider. -Note that the Google Hangouts integration requires a paid Google G -Suite account. - ### Change your organization's video chat provider {start_tabs} -{tab|google-hangouts} +{tab|jitsi-meet} -{settings_tab|organization-settings} +Zulip's default video chat provider is [Jitsi +Meet](https://meet.jit.si/). -1. Under **Other settings** set **Video chat provider** to **Google Hangouts**. - -1. Enter the domain for your [G Suite team](https://gsuite.google.com/). - -1. Click **Save changes**. +You can also use Zulip with Jitsi Meet on-premise; to configure this, +just set `JITSI_SERVER_URL` in `/etc/zulip/settings.py`. {tab|zoom} +Zulip supports Zoom as the video chat provider using an OAuth +integration. You can set it up as follows: + {settings_tab|organization-settings} 1. Under **Other settings** set **Video chat provider** to **Zoom**. @@ -61,12 +59,14 @@ If you would like to unlink Zoom from your Zulip account: 1. Click the **Uninstall** button next to the Zulip app. -{tab|jitsi-on-premise} +If you are self-hosting, you will need to [create a Zoom +application][zoom-configuration] to use this integration. -If you're running both Zulip and Jitsi Meet on-premise, just set -`JITSI_SERVER_URL` in `/etc/zulip/settings.py`. +{tab|disable} -You can also disable the video call button for your community by +You can also disable the video call button for your organization by setting the provider to "None". {end_tabs} + +[zoom-configuration]: https://zulip.readthedocs.io/en/latest/production/zoom-configuration.html diff --git a/zerver/lib/bugdown/tabbed_sections.py b/zerver/lib/bugdown/tabbed_sections.py index 3cea656852..86a488b2ec 100644 --- a/zerver/lib/bugdown/tabbed_sections.py +++ b/zerver/lib/bugdown/tabbed_sections.py @@ -65,9 +65,9 @@ TAB_DISPLAY_NAMES = { 'allow-anyone-to-join': 'Allow anyone to join', 'restrict-by-email-domain': 'Restrict by email domain', - 'google-hangouts': 'Google Hangouts', 'zoom': 'Zoom (experimental)', - 'jitsi-on-premise': 'Jitsi on-premise', + 'jitsi-meet': 'Jitsi Meet', + 'disable': 'Disabled', 'chrome': 'Chrome', 'firefox': 'Firefox', diff --git a/zerver/lib/integrations.py b/zerver/lib/integrations.py index bf3f1f4ee7..6dc18df0cd 100644 --- a/zerver/lib/integrations.py +++ b/zerver/lib/integrations.py @@ -510,8 +510,6 @@ HUBOT_INTEGRATIONS: List[HubotIntegration] = [ HubotIntegration('chartbeat', ['marketing'], display_name='Chartbeat'), HubotIntegration('darksky', ['misc'], display_name='Dark Sky', logo_alt='Dark Sky logo'), - HubotIntegration('google-hangouts', ['communication'], display_name='Google Hangouts', - logo_alt='Google Hangouts logo'), HubotIntegration('instagram', ['misc'], display_name='Instagram', # _ needed to get around adblock plus logo='images/integrations/logos/instagra_m.svg'), diff --git a/zerver/migrations/0285_remove_realm_google_hangouts_domain.py b/zerver/migrations/0285_remove_realm_google_hangouts_domain.py new file mode 100644 index 0000000000..ee0a09d84e --- /dev/null +++ b/zerver/migrations/0285_remove_realm_google_hangouts_domain.py @@ -0,0 +1,43 @@ +# Generated by Django 2.2.13 on 2020-06-14 01:58 + +from django.db import migrations +from django.db.backends.postgresql.schema import DatabaseSchemaEditor +from django.db.migrations.state import StateApps + +VIDEO_CHAT_PROVIDERS = { + 'jitsi_meet': { + 'name': "Jitsi Meet", + 'id': 1, + }, + 'google_hangouts': { + 'name': "Google Hangouts", + 'id': 2, + }, +} + +def remove_google_hangouts_provider(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None: + # We are removing the Google Hangout integration because Google has + # removed the Hangouts brand. All the realms that used Hangouts as + # their video chat provided are now setted to the default, jitsi. + Realm = apps.get_model('zerver', 'Realm') + Realm.objects.filter(video_chat_provider=VIDEO_CHAT_PROVIDERS['google_hangouts']['id']).update( + video_chat_provider=VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'] + ) + +class Migration(migrations.Migration): + + dependencies = [ + ('zerver', '0284_convert_realm_admins_to_realm_owners'), + ] + + operations = [ + migrations.RemoveField( + model_name='realm', + name='google_hangouts_domain', + ), + migrations.RunPython( + remove_google_hangouts_provider, + reverse_code=migrations.RunPython.noop, + elidable=True + ), + ] diff --git a/zerver/models.py b/zerver/models.py index 3d0126f56a..a0f9294f0a 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -168,7 +168,7 @@ def clear_supported_auth_backends_cache() -> None: class Realm(models.Model): MAX_REALM_NAME_LENGTH = 40 MAX_REALM_SUBDOMAIN_LENGTH = 40 - MAX_GOOGLE_HANGOUTS_DOMAIN_LENGTH = 255 # This is just the maximum domain length by RFC + INVITES_STANDARD_REALM_DAILY_MAX = 3000 MESSAGE_VISIBILITY_LIMITED = 10000 AUTHENTICATION_FLAGS = ['Google', 'Email', 'GitHub', 'LDAP', 'Dev', @@ -358,10 +358,8 @@ class Realm(models.Model): 'name': "Jitsi Meet", 'id': 1, }, - 'google_hangouts': { - 'name': "Google Hangouts", - 'id': 2, - }, + # ID 2 was used for the now-deleted Google Hangouts. + # ID 3 reserved for optional Zoom, see below. } if settings.VIDEO_ZOOM_CLIENT_ID is not None and settings.VIDEO_ZOOM_CLIENT_SECRET is not None: VIDEO_CHAT_PROVIDERS['zoom'] = { @@ -369,7 +367,6 @@ class Realm(models.Model): 'id': 3, } video_chat_provider = models.PositiveSmallIntegerField(default=VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']) - google_hangouts_domain = models.TextField(default="") default_code_block_language: Optional[str] = models.TextField(null=True, default=None) @@ -388,7 +385,6 @@ class Realm(models.Model): disallow_disposable_email_addresses=bool, email_address_visibility=int, email_changes_disabled=bool, - google_hangouts_domain=str, invite_required=bool, invite_by_admins_only=bool, inline_image_preview=bool, diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index d805331c9c..aa918fda7e 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -1649,9 +1649,7 @@ class EventsRegisterTest(ZulipTestCase): bot_creation_policy=[Realm.BOT_CREATION_EVERYONE], video_chat_provider=[ Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'], - Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id'], ], - google_hangouts_domain=["zulip.com", "zulip.org"], default_code_block_language=['python', 'javascript'], ) diff --git a/zerver/tests/test_home.py b/zerver/tests/test_home.py index e316228784..cd9b0b3985 100644 --- a/zerver/tests/test_home.py +++ b/zerver/tests/test_home.py @@ -159,7 +159,6 @@ class HomeTest(ZulipTestCase): "realm_embedded_bots", "realm_emoji", "realm_filters", - "realm_google_hangouts_domain", "realm_icon_source", "realm_icon_url", "realm_incoming_webhook_bots", diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py index 251b6f24ed..e909c39b80 100644 --- a/zerver/tests/test_realm.py +++ b/zerver/tests/test_realm.py @@ -551,26 +551,6 @@ class RealmTest(ZulipTestCase): self.assertEqual(get_realm('zulip').video_chat_provider, Realm.VIDEO_CHAT_PROVIDERS['disabled']['id']) - req = {"video_chat_provider": ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id'])} - result = self.client_patch('/json/realm', req) - self.assert_json_error(result, "Invalid domain: Domain can't be empty.") - - req = { - "video_chat_provider": ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id']), - "google_hangouts_domain": ujson.dumps("invaliddomain"), - } - result = self.client_patch('/json/realm', req) - self.assert_json_error(result, "Invalid domain: Domain must have at least one dot (.)") - - req = { - "video_chat_provider": ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id']), - "google_hangouts_domain": ujson.dumps("zulip.com"), - } - result = self.client_patch('/json/realm', req) - self.assert_json_success(result) - self.assertEqual(get_realm('zulip').video_chat_provider, - Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id']) - req = {"video_chat_provider": ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id'])} result = self.client_patch('/json/realm', req) self.assert_json_success(result) @@ -721,15 +701,10 @@ class RealmAPITest(ZulipTestCase): Realm.EMAIL_ADDRESS_VISIBILITY_ADMINS, Realm.EMAIL_ADDRESS_VISIBILITY_NOBODY], video_chat_provider=[ - dict( - video_chat_provider=ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id']), - google_hangouts_domain=ujson.dumps('zulip.com'), - ), dict( video_chat_provider=ujson.dumps(Realm.VIDEO_CHAT_PROVIDERS['jitsi_meet']['id']), ), ], - google_hangouts_domain=['zulip.com', 'zulip.org'], ) vals = test_values.get(name) @@ -740,8 +715,6 @@ class RealmAPITest(ZulipTestCase): if name == 'video_chat_provider': self.set_up_db(name, vals[0][name]) - realm = self.update_with_api_multiple_value(vals[1]) - self.assertEqual(getattr(realm, name), ujson.loads(vals[1][name])) realm = self.update_with_api_multiple_value(vals[0]) self.assertEqual(getattr(realm, name), ujson.loads(vals[0][name])) else: diff --git a/zerver/views/realm.py b/zerver/views/realm.py index 91cef0e71d..9619c6d767 100644 --- a/zerver/views/realm.py +++ b/zerver/views/realm.py @@ -19,7 +19,6 @@ from zerver.lib.actions import ( do_set_realm_property, do_set_realm_signup_notifications_stream, ) -from zerver.lib.domains import validate_domain from zerver.lib.exceptions import OrganizationOwnerRequired from zerver.lib.i18n import get_available_language_codes from zerver.lib.request import REQ, JsonableError, has_request_variables @@ -85,7 +84,6 @@ def update_realm( Realm.EMAIL_ADDRESS_VISIBILITY_TYPES), default=None), default_twenty_four_hour_time: Optional[bool]=REQ(validator=check_bool, default=None), video_chat_provider: Optional[int]=REQ(validator=check_int, default=None), - google_hangouts_domain: Optional[str]=REQ(validator=check_string, default=None), default_code_block_language: Optional[str]=REQ(validator=check_string, default=None), digest_weekday: Optional[int]=REQ(validator=check_int_in(Realm.DIGEST_WEEKDAY_VALUES), default=None), ) -> HttpResponse: @@ -107,11 +105,6 @@ def update_realm( if (video_chat_provider is not None and video_chat_provider not in {p['id'] for p in Realm.VIDEO_CHAT_PROVIDERS.values()}): return json_error(_("Invalid video_chat_provider {}").format(video_chat_provider)) - if video_chat_provider == Realm.VIDEO_CHAT_PROVIDERS['google_hangouts']['id']: - try: - validate_domain(google_hangouts_domain) - except ValidationError as e: - return json_error(_('Invalid domain: {}').format(e.messages[0])) if message_retention_days is not None: if not user_profile.is_realm_owner: