Merge pull request #13321 from overleaf/tw-remove-v1-calls

Cleanup v1 subscription calls

GitOrigin-RevId: 27c1792353957a75a553b2b12dbf357be5c7e111

services/web/app/src/Features/Subscription/SubscriptionController.js

@@ -216,7 +216,6 @@ async function userSubscriptionPage(req, res) {
     currentInstitutionsWithLicence,
     managedInstitutions,
     managedPublishers,
-    v1SubscriptionStatus,
   } = results
   const hasSubscription =
     await LimitationsManager.promises.userHasV1OrV2Subscription(user)
@@ -250,7 +249,6 @@ async function userSubscriptionPage(req, res) {
     managedGroupSubscriptions,
     managedInstitutions,
     managedPublishers,
-    v1SubscriptionStatus,
     currentInstitutionsWithLicence,
     cancelButtonNewCopy,
     groupPlans: groupPlansDataForDash,

services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js

@@ -4,7 +4,6 @@ const PlansLocator = require('./PlansLocator')
 const SubscriptionFormatters = require('./SubscriptionFormatters')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const SubscriptionUpdater = require('./SubscriptionUpdater')
-const V1SubscriptionManager = require('./V1SubscriptionManager')
 const InstitutionsGetter = require('../Institutions/InstitutionsGetter')
 const InstitutionsManager = require('../Institutions/InstitutionsManager')
 const PublishersGetter = require('../Publishers/PublishersGetter')
@@ -74,7 +73,6 @@ async function buildUsersSubscriptionViewModel(user) {
     currentInstitutionsWithLicence,
     managedInstitutions,
     managedPublishers,
-    v1SubscriptionStatus,
     recurlySubscription,
     recurlyCoupons,
     plan,
@@ -151,17 +149,6 @@ async function buildUsersSubscriptionViewModel(user) {
     managedPublishers(cb) {
       PublishersGetter.getManagedPublishers(user._id, cb)
     },
-    v1SubscriptionStatus(cb) {
-      V1SubscriptionManager.getSubscriptionStatusFromV1(
-        user._id,
-        (error, status, v1Id) => {
-          if (error) {
-            return cb(error)
-          }
-          cb(null, status)
-        }
-      )
-    },
   })
 
   if (memberGroupSubscriptions == null) {
@@ -173,9 +160,6 @@ async function buildUsersSubscriptionViewModel(user) {
   if (managedInstitutions == null) {
     managedInstitutions = []
   }
-  if (v1SubscriptionStatus == null) {
-    v1SubscriptionStatus = {}
-  }
   if (recurlyCoupons == null) {
     recurlyCoupons = []
   }
@@ -345,7 +329,6 @@ async function buildUsersSubscriptionViewModel(user) {
     currentInstitutionsWithLicence,
     managedInstitutions,
     managedPublishers,
-    v1SubscriptionStatus,
   }
 }
 

services/web/app/src/Features/Subscription/V1SubscriptionManager.js

@@ -19,19 +19,6 @@ module.exports = V1SubscriptionManager = {
     )
   },
 
-  getSubscriptionStatusFromV1(userId, callback) {
-    V1SubscriptionManager._v1Request(
-      userId,
-      {
-        method: 'GET',
-        url(v1Id) {
-          return `/api/v1/sharelatex/users/${v1Id}/subscription_status`
-        },
-      },
-      callback
-    )
-  },
-
   cancelV1Subscription(userId, callback) {
     V1SubscriptionManager._v1Request(
       userId,