Merge pull request #13591 from overleaf/ab-account-enrollment

[web] Managed users - account enrollment

GitOrigin-RevId: 6fc9ef8c44394eb92d3afd2022433b0b6d508503

services/web/app/src/Features/Project/ProjectListController.js

@@ -32,7 +32,6 @@ const SplitTestHandler = require('../SplitTests/SplitTestHandler')
 /** @typedef {import("../../../../types/project/dashboard/api").Sort} Sort */
 /** @typedef {import("./types").AllUsersProjects} AllUsersProjects */
 /** @typedef {import("./types").MongoProject} MongoProject */
-
 /** @typedef {import("../Tags/types").Tag} Tag */
 
 const _ssoAvailable = (affiliation, session, linkedInstitutionIds) => {
@@ -90,6 +89,10 @@ async function projectListPage(req, res, next) {
   // - object - the subscription data object
   let usersBestSubscription
   let survey
+  let userIsMemberOfGroupSubscription = false
+  let groupSubscriptionsPendingEnrollment = []
+
+  const isSaas = Features.hasFeature('saas')
 
   const userId = SessionManager.getLoggedInUserId(req.session)
   const projectsBlobPending = _getProjects(userId).catch(err => {
@@ -98,7 +101,9 @@ async function projectListPage(req, res, next) {
   })
   const user = await User.findById(
     userId,
-    'email emails features lastPrimaryEmailCheck signUpDate'
+    `email emails features lastPrimaryEmailCheck signUpDate${
+      isSaas ? ' enrollment' : ''
+    }`
   )
 
   // Handle case of deleted user
@@ -107,7 +112,7 @@ async function projectListPage(req, res, next) {
     return
   }
 
-  if (Features.hasFeature('saas')) {
+  if (isSaas) {
     try {
       usersBestSubscription =
         await SubscriptionViewModelBuilder.promises.getBestSubscription({
@@ -119,6 +124,24 @@ async function projectListPage(req, res, next) {
         "Failed to get user's best subscription"
       )
     }
+    try {
+      const { isMember, subscriptions } =
+        await LimitationsManager.promises.userIsMemberOfGroupSubscription(user)
+
+      userIsMemberOfGroupSubscription = isMember
+
+      // TODO use helper function
+      if (!user.enrollment?.managedBy) {
+        groupSubscriptionsPendingEnrollment = subscriptions.filter(
+          subscription => subscription.groupPlan && subscription.groupPolicy
+        )
+      }
+    } catch (error) {
+      logger.error(
+        { err: error },
+        'Failed to check whether user is a member of group subscription'
+      )
+    }
 
     try {
       survey = await SurveyHandler.promises.getSurvey(userId)
@@ -280,20 +303,6 @@ async function projectListPage(req, res, next) {
     status: prefetchedProjectsBlob ? 'success' : 'too-slow',
   })
 
-  let userIsMemberOfGroupSubscription = false
-  try {
-    const userIsMemberOfGroupSubscriptionPromise =
-      await LimitationsManager.promises.userIsMemberOfGroupSubscription(user)
-
-    userIsMemberOfGroupSubscription =
-      userIsMemberOfGroupSubscriptionPromise.isMember
-  } catch (error) {
-    logger.error(
-      { err: error },
-      'Failed to check whether user is a member of group subscription'
-    )
-  }
-
   // in v2 add notifications for matching university IPs
   if (Settings.overleaf != null && req.ip !== user.lastLoginIp) {
     try {
@@ -395,6 +404,11 @@ async function projectListPage(req, res, next) {
     showINRBanner,
     projectDashboardReact: true, // used in navbar
     welcomePageRedesignVariant: welcomePageRedesignAssignment.variant,
+    groupSubscriptionsPendingEnrollment:
+      groupSubscriptionsPendingEnrollment.map(subscription => ({
+        groupId: subscription._id,
+        groupName: subscription.teamName,
+      })),
   })
 }