realm: Remove Google Hangouts integration.

Google has removed the Google Hangouts brand, thus we are removing them as video chat provider option. This commit removes Google Hangouts integration and make a migration that sets all realms that are using Hangouts as their video chat provider to the default, jitsi. With changes by tabbott to improve the overall video call documentation. Fixes: #15298.
2025-11-04 14:03:30 +00:00 · 2020-06-14 18:36:14 -03:00
parent f4ac4be851
commit ddbde66af5
17 changed files with 64 additions and 121 deletions
--- a/frontend_tests/node_tests/compose.js
+++ b/frontend_tests/node_tests/compose.js
@@ -943,10 +943,6 @@ run_test('initialize', () => {
            id: 1,
            name: "Jitsi Meet",
        },
-        google_hangouts: {
-            id: 2,
-            name: "Google Hangouts",
-        },
        zoom: {
            id: 3,
            name: "Zoom",
@@ -1447,15 +1443,6 @@ run_test('on_events', () => {
        handler(ev);
        assert(!called);

-        page_params.realm_video_chat_provider =
-            page_params.realm_available_video_chat_providers.google_hangouts.id;
-        page_params.realm_google_hangouts_domain = 'zulip';
-
-        handler(ev);
-
-        video_link_regex = /\[Click to join video call\]\(https:\/\/hangouts.google.com\/hangouts\/\_\/zulip\/\d{15}\)/;
-        assert(video_link_regex.test(syntax_to_insert));
-
        page_params.realm_video_chat_provider =
            page_params.realm_available_video_chat_providers.zoom.id;

@@ -1735,11 +1722,4 @@ run_test('test_video_chat_button_toggle', () => {
    page_params.jitsi_server_url = 'https://meet.jit.si';
    compose.initialize();
    assert.equal($("#below-compose-content .video_link").visible(), true);
-
-    reset_jquery();
-    stub_out_video_calls();
-    page_params.realm_video_chat_provider =
-        page_params.realm_available_video_chat_providers.google_hangouts.id;
-    compose.initialize();
-    assert.equal($("#below-compose-content .video_link").visible(), true);
 });
--- a/frontend_tests/node_tests/settings_org.js
+++ b/frontend_tests/node_tests/settings_org.js
@@ -755,10 +755,6 @@ run_test('set_up', () => {
            id: 1,
            name: "Jitsi Meet",
        },
-        google_hangouts: {
-            id: 2,
-            name: "Google Hangouts",
-        },
        zoom: {
            id: 3,
            name: "Zoom",
--- a/static/js/compose.js
+++ b/static/js/compose.js
@@ -1083,10 +1083,7 @@ exports.initialize = function () {
            return;
        }

-        if (page_params.realm_video_chat_provider === available_providers.google_hangouts.id) {
-            video_call_link = "https://hangouts.google.com/hangouts/_/" + page_params.realm_google_hangouts_domain + "/" + video_call_id;
-            insert_video_call_url(video_call_link, target_textarea);
-        } else if (available_providers.zoom
+        if (available_providers.zoom
            && page_params.realm_video_chat_provider === available_providers.zoom.id) {
            exports.abort_zoom(edit_message_id);
            const key = edit_message_id || "";
--- a/static/js/server_events_dispatch.js
+++ b/static/js/server_events_dispatch.js
@@ -115,7 +115,6 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
            email_address_visibility: noop,
            email_changes_disabled: settings_account.update_email_change_display,
            disallow_disposable_email_addresses: noop,
-            google_hangouts_domain: noop,
            inline_image_preview: noop,
            inline_url_embed_preview: noop,
            invite_by_admins_only: noop,
--- a/static/js/settings_org.js
+++ b/static/js/settings_org.js
@@ -213,15 +213,7 @@ function set_realm_waiting_period_dropdown() {

 function set_video_chat_provider_dropdown() {
    const chat_provider_id = page_params.realm_video_chat_provider;
-    const available_providers = page_params.realm_available_video_chat_providers;
-
    $("#id_realm_video_chat_provider").val(chat_provider_id);
-    if (chat_provider_id === available_providers.google_hangouts.id) {
-        $("#google_hangouts_domain").show();
-        $("#id_realm_google_hangouts_domain").val(page_params.realm_google_hangouts_domain);
-    } else {
-        $("#google_hangouts_domain").hide();
-    }
 }

 function set_msg_edit_limit_dropdown() {
@@ -335,7 +327,6 @@ function update_dependent_subsettings(property_name) {
    } else if (property_name === 'realm_waiting_period_threshold') {
        set_realm_waiting_period_dropdown();
    } else if (property_name === 'realm_video_chat_provider' ||
-               property_name === 'realm_google_hangouts_domain' ||
               property_name.startsWith('realm_zoom')) {
        set_video_chat_provider_dropdown();
    } else if (property_name === 'realm_msg_edit_limit_setting' ||
@@ -838,17 +829,6 @@ exports.build_page = function () {
                                              waiting_period_threshold === 'custom_days');
    });

-    $("#id_realm_video_chat_provider").change(function (e) {
-        const available_providers = page_params.realm_available_video_chat_providers;
-        const video_chat_provider_id = parseInt(e.target.value, 10);
-
-        if (video_chat_provider_id === available_providers.google_hangouts.id) {
-            $("#google_hangouts_domain").show();
-        } else {
-            $("#google_hangouts_domain").hide();
-        }
-    });
-
    $("#id_realm_org_join_restrictions").change(function (e) {
        const org_join_restrictions = e.target.value;
        const node = $("#allowed_domains_label").parent();
--- a/static/styles/settings.scss
+++ b/static/styles/settings.scss
@@ -631,7 +631,6 @@ input[type=checkbox] {
    }
 }

-#google_hangouts_domain,
 .organization-settings-parent div:first-of-type {
    margin-top: 10px;
 }
--- a/static/templates/settings/organization_settings_admin.hbs
+++ b/static/templates/settings/organization_settings_admin.hbs
@@ -191,14 +191,6 @@
                        <option value='{{this.id}}'>{{this.name}}</option>
                        {{/each}}
                    </select>
-                    <div id="google_hangouts_domain">
-                        <label>{{t 'Domain for your <a href="https://gsuite.google.com" target="_blank">G Suite team</a> (required)' }}:</label>
-                        <input type="text" id="id_realm_google_hangouts_domain"
-                          name="realm_google_hangouts_domain"
-                          autocomplete="off"
-                          class="admin-realm-google-hangouts-domain setting-widget prop-element"
-                          data-setting-widget-type="string"/>
-                    </div>
                </div>

                {{> dropdown_list_widget
--- a/templates/zerver/features.html
+++ b/templates/zerver/features.html
@@ -238,7 +238,7 @@
            <h3>VIDEO CALLS</h3>
            <p>
                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.
            </p>
        </a>
        <a class="feature-block" href="/help/configure-authentication-methods" target="_blank">
--- 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
--- 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',
--- 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'),
--- a/zerver/migrations/0285_remove_realm_google_hangouts_domain.py
+++ 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
+        ),
+    ]
--- 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,
--- 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'],
        )

--- 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",
--- 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:
--- 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: