Sfoglia il codice sorgente

[web] Remove module import from core

Replaces the imported function call with an inline check.

GitOrigin-RevId: 692af8353258b13b61104cbac775c75d3bda3528
Miguel Serrano 3 anni fa
parent
commit
1725415e31

+ 3 - 2
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()
     )

+ 4 - 4
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,
       },
     })