From 1725415e31518d10e2d4053c280290166a389bbd Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Mon, 14 Aug 2023 16:14:03 +0200 Subject: [PATCH] [web] Remove module import from core Replaces the imported function call with an inline check. GitOrigin-RevId: 692af8353258b13b61104cbac775c75d3bda3528 --- .../src/Features/Subscription/SubscriptionController.js | 5 +++-- .../unit/src/Subscription/SubscriptionControllerTests.js | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index 20dd3f5aa0..2fdb861457 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -22,7 +22,7 @@ const { expressify } = require('../../util/promises') const OError = require('@overleaf/o-error') const SplitTestHandler = require('../SplitTests/SplitTestHandler') const SubscriptionHelper = require('./SubscriptionHelper') -const ManagedUsersManager = require('../../../../modules/managed-users/app/src/ManagedUsersManager') +const Features = require('../../infrastructure/Features') const groupPlanModalOptions = Settings.groupPlanModalOptions const validGroupPlanModalOptions = { @@ -268,7 +268,8 @@ async function userSubscriptionPage(req, res) { const groupSettingsEnabledFor = (managedGroupSubscriptions || []) .filter( subscription => - ManagedUsersManager.hasManagedUsersFeature(subscription) && + Features.hasFeature('saas') && + subscription?.features?.managedUsers && (subscription.admin_id._id || subscription.admin_id).toString() === user._id.toString() ) diff --git a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js index 1f074b8baf..1bdeba2208 100644 --- a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js +++ b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js @@ -128,6 +128,9 @@ describe('SubscriptionController', function () { this.SubscriptionHelper = { generateInitialLocalizedGroupPrice: sinon.stub(), } + this.Features = { + hasFeature: sinon.stub().returns(false), + } this.SubscriptionController = SandboxedModule.require(modulePath, { requires: { '../SplitTests/SplitTestHandler': this.SplitTestV2Hander, @@ -158,10 +161,7 @@ describe('SubscriptionController', function () { recordEventForSession: sinon.stub(), setUserPropertyForUser: sinon.stub(), }), - '../../../../modules/managed-users/app/src/ManagedUsersManager': - (this.ManagedUsersManager = { - hasManagedUsersFeature: sinon.stub(), - }), + '../../infrastructure/Features': this.Features, }, })