Merge pull request #3718 from overleaf/jel-emailHasLicence

Update emailHasLicence for reconfirmation and SAML

GitOrigin-RevId: 58daf538d9f0a7db46bb3c1e21f8ca04df095446

services/web/app/src/Features/Institutions/InstitutionsHelper.js

@@ -16,6 +16,10 @@ function emailHasLicence(emailData) {
   if (!affiliation.licence) {
     return false
   }
+  if (affiliation.pastReconfirmDate) {
+    return false
+  }
+
   return affiliation.licence !== 'free'
 }
 

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

@@ -63,9 +63,6 @@ const FeaturesUpdater = {
       bonusFeatures(cb) {
         ReferalFeatures.getBonusFeatures(userId, cb)
       },
-      samlFeatures(cb) {
-        FeaturesUpdater._getSamlFeatures(userId, cb)
-      },
       featuresOverrides(cb) {
         FeaturesUpdater._getFeaturesOverrides(userId, cb)
       }
@@ -88,7 +85,6 @@ const FeaturesUpdater = {
         institutionFeatures,
         v1Features,
         bonusFeatures,
-        samlFeatures,
         featuresOverrides
       } = results
       logger.log(
@@ -99,7 +95,6 @@ const FeaturesUpdater = {
           institutionFeatures,
           v1Features,
           bonusFeatures,
-          samlFeatures,
           featuresOverrides
         },
         'merging user features'
@@ -109,7 +104,6 @@ const FeaturesUpdater = {
         institutionFeatures,
         v1Features,
         bonusFeatures,
-        samlFeatures,
         featuresOverrides
       ])
       const features = _.reduce(
@@ -133,30 +127,6 @@ const FeaturesUpdater = {
     )
   },
 
-  _getSamlFeatures(userId, callback) {
-    UserGetter.getUser(userId, (err, user) => {
-      if (err) {
-        return callback(err)
-      }
-      if (
-        !user ||
-        !Array.isArray(user.samlIdentifiers) ||
-        !user.samlIdentifiers.length
-      ) {
-        return callback(null, {})
-      }
-      for (const samlIdentifier of user.samlIdentifiers) {
-        if (samlIdentifier && samlIdentifier.hasEntitlement) {
-          return callback(
-            null,
-            FeaturesUpdater._planCodeToFeatures('professional')
-          )
-        }
-      }
-      callback(null, {})
-    })
-  },
-
   _getFeaturesOverrides(userId, callback) {
     UserGetter.getUser(userId, { featuresOverrides: 1 }, (error, user) => {
       if (error) {