From c704a4b79a29421ea63efc4c8976069012924cb1 Mon Sep 17 00:00:00 2001 From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:59:24 -0600 Subject: [PATCH] Merge pull request #17257 from overleaf/jel-delete-sso-config-users-cleared [web] Clear users linking data when deleting group SSO config GitOrigin-RevId: 1c1f63a747f422a646c763f771a8237f91182c38 --- services/web/frontend/extracted-translations.json | 1 + services/web/locales/en.json | 1 + services/web/test/acceptance/src/helpers/Subscription.js | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 403458d0e7..0b2eada6c3 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -158,6 +158,7 @@ "clear_cached_files": "", "clear_search": "", "click_here_to_view_sl_in_lng": "", + "clicking_delete_will_remove_sso_config_and_clear_saml_data": "", "clone_with_git": "", "close": "", "clsi_maintenance": "", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index a8b36a482e..11bc4e317c 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -249,6 +249,7 @@ "clearing": "Clearing", "click_here_to_view_sl_in_lng": "Click here to use __appName__ in <0>__lngName__", "click_link_to_proceed": "Click __clickText__ below to proceed.", + "clicking_delete_will_remove_sso_config_and_clear_saml_data": "Clicking <0>Delete will remove your SSO configuration and clear SAML data for all linked users. You can only do this when SSO is disabled in your Group settings.", "clone_with_git": "Clone with Git", "close": "Close", "clsi_maintenance": "The compile servers are down for maintenance, and will be back shortly.", diff --git a/services/web/test/acceptance/src/helpers/Subscription.js b/services/web/test/acceptance/src/helpers/Subscription.js index 811fcbf539..1edc730b75 100644 --- a/services/web/test/acceptance/src/helpers/Subscription.js +++ b/services/web/test/acceptance/src/helpers/Subscription.js @@ -182,6 +182,14 @@ class Subscription { } ) } + + addMember(userId, callback) { + return SubscriptionModel.findOneAndUpdate( + { _id: new ObjectId(this._id) }, + { $push: { member_ids: userId } }, + callback + ) + } } Subscription.promises = class extends Subscription {}