feat: add is_enterprise boolean

app/controllers/api/v1/enforce-enterprise-plan.js

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Forward Email LLC
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+const Boom = require('@hapi/boom');
+const config = require('#config');
+
+async function enforceEnterprisePlan(ctx, next) {
+  if (!ctx.isAuthenticated())
+    throw Boom.unauthorized(ctx.translateError('LOGIN_REQUIRED'));
+
+  if (config.isSelfHosted) return next();
+
+  // Check if user or domain has enterprise plan
+  const hasEnterprisePlan =
+    ctx.state.user.plan === 'enterprise' ||
+    ctx.state?.domain?.plan === 'enterprise';
+
+  if (!hasEnterprisePlan)
+    throw Boom.paymentRequired(
+      ctx.translateError(
+        'ENTERPRISE_PLAN_REQUIRED',
+        ctx.state.l('/my-account/billing/upgrade?plan=enterprise')
+      )
+    );
+
+  return next();
+}
+
+module.exports = enforceEnterprisePlan;

app/controllers/api/v1/enforce-paid-plan.js

@@ -13,7 +13,8 @@ async function enforcePaidPlan(ctx, next) {
   // if the user is a member of a team plan and in the admin group, continue
   if (
     ctx.state?.domain?.group === 'admin' &&
-    ctx.state?.domain?.plan === 'team'
+    (ctx.state?.domain?.plan === 'team' ||
+      ctx.state?.domain?.plan === 'enterprise')
   )
     return next();
 

app/controllers/api/v1/index.js

@@ -10,6 +10,7 @@ const calendars = require('./calendars');
 const contacts = require('./contacts');
 const domains = require('./domains');
 const enforcePaidPlan = require('./enforce-paid-plan');
+const enforceEnterprisePlan = require('./enforce-enterprise-plan');
 const folders = require('./folders');
 const inquiries = require('./inquiries');
 const log = require('./log');
@@ -35,6 +36,7 @@ module.exports = {
   contacts,
   domains,
   enforcePaidPlan,
+  enforceEnterprisePlan,
   folders,
   inquiries,
   log,

app/controllers/api/v1/port.js

@@ -51,7 +51,7 @@ async function port(ctx) {
       const domain = await Domains.findOne({
         name: ctx.query.domain,
         verification_record: verifications[0],
-        plan: { $in: ['enhanced_protection', 'team'] }
+        plan: { $in: ['enhanced_protection', 'team', 'enterprise'] }
       })
         .lean()
         .exec();

app/controllers/api/v1/stripe.js

@@ -77,7 +77,7 @@ async function processEvent(ctx, event) {
             group: 'admin'
           }
         },
-        plan: { $in: ['enhanced_protection', 'team'] },
+        plan: { $in: ['enhanced_protection', 'team', 'enterprise'] },
         has_txt_record: true
       });
 
@@ -253,7 +253,7 @@ async function processEvent(ctx, event) {
 
       if (
         !isSANB(productToPlan) ||
-        !['team', 'enhanced_protection'].includes(productToPlan)
+        !['team', 'enhanced_protection', 'enterprise'].includes(productToPlan)
       )
         throw new Error('Plan was not valid');
 
@@ -523,7 +523,7 @@ async function processEvent(ctx, event) {
               group: 'admin'
             }
           },
-          plan: { $in: ['enhanced_protection', 'team'] },
+          plan: { $in: ['enhanced_protection', 'team', 'enterprise'] },
           has_txt_record: true
         });
 

app/controllers/web/admin/dashboard.js

@@ -45,7 +45,7 @@ async function getGrowthChart() {
   const docs = await Users.aggregate([
     {
       $match: {
-        plan: { $in: ['enhanced_protection', 'team'] },
+        plan: { $in: ['enhanced_protection', 'team', 'enterprise'] },
         created_at: {
           $gte: dayjs()
             .subtract(1, 'day')

app/controllers/web/admin/payments.js

@@ -39,20 +39,19 @@ async function list(ctx) {
       );
     }
 
-    // Search in enum/categorical fields with exact and partial matches
+    // Search in enum/categorical fields with exact matches (faster than regex)
     for (const field of PAYMENT_ENUM_FIELDS) {
+      // Try exact match first (case-insensitive)
+      const exactMatch = ctx.query.q.toLowerCase();
       query.$or.push(
-        { [field]: { $regex: ctx.query.q, $options: 'i' } },
-        { [field]: { $regex: _.escapeRegExp(ctx.query.q), $options: 'i' } }
+        { [field]: exactMatch },
+        { [field]: { $regex: ctx.query.q, $options: 'i' } }
       );
     }
 
-    // Search by user email
+    // Search by user email - optimized query
     const users = await Users.find({
-      $or: [
-        { email: { $regex: ctx.query.q, $options: 'i' } },
-        { email: { $regex: _.escapeRegExp(ctx.query.q), $options: 'i' } }
-      ]
+      email: { $regex: ctx.query.q, $options: 'i' }
     })
       .select('_id')
       .lean()
@@ -99,13 +98,15 @@ async function list(ctx) {
         from: 'users',
         localField: 'user',
         foreignField: '_id',
+        pipeline: [
+          { $project: { email: 1, plan: 1 } } // Only select needed fields
+        ],
         as: 'user'
       }
     },
     {
-      $unwind: {
-        path: '$user',
-        preserveNullAndEmptyArrays: true
+      $addFields: {
+        user: { $arrayElemAt: ['$user', 0] } // More efficient than $unwind
       }
     },
     {
@@ -258,11 +259,12 @@ async function freeCredit(ctx) {
     ? `${durationMapping[0]} ${durationMapping[1]}`
     : dayjs.duration(duration, 'milliseconds').humanize();
 
-  const message = ctx.translate('FREE_CREDIT_GRANTED', {
+  const message = ctx.translate(
+    'FREE_CREDIT_GRANTED',
     email,
     plan,
-    duration: durationFormatted
-  });
+    durationFormatted
+  );
 
   if (ctx.accepts('html')) {
     ctx.flash('custom', {

app/controllers/web/my-account/create-domain-billing.js

@@ -72,7 +72,7 @@ async function createDomainBilling(ctx) {
     // plan
     if (
       !isSANB(plan) ||
-      !['free', 'enhanced_protection', 'team'].includes(plan)
+      !['free', 'enhanced_protection', 'team', 'enterprise'].includes(plan)
     ) {
       throw Boom.badRequest(ctx.translateError('INVALID_PLAN'));
     }

app/controllers/web/my-account/ensure-enterprise-plan.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Forward Email LLC
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+function ensureEnterprisePlan(ctx, next) {
+  ctx.state.isEnterprisePlanRequired = ctx.state.domain.plan !== 'enterprise';
+  return next();
+}
+
+module.exports = ensureEnterprisePlan;

app/controllers/web/my-account/ensure-upgraded-plan.js

@@ -17,7 +17,8 @@ function ensureUpgradedPlan(ctx, next) {
 
   if (
     (!ctx.state.domain && ctx.state.user.plan !== 'free') ||
-    ctx.state?.domain?.plan === 'team'
+    ctx.state?.domain?.plan === 'team' ||
+    ctx.state?.domain?.plan === 'enterprise'
   )
     return next();
 

app/controllers/web/my-account/index.js

@@ -15,6 +15,7 @@ const ensureAliasAdmin = require('./ensure-alias-admin');
 const ensureDomainAdmin = require('./ensure-domain-admin');
 const ensureNotBanned = require('./ensure-not-banned');
 const ensureTeamPlan = require('./ensure-team-plan');
+const ensureEnterprisePlan = require('./ensure-enterprise-plan');
 const ensureUpgradedPlan = require('./ensure-upgraded-plan');
 const ensurePaidToDate = require('./ensure-paid-to-date');
 const importAliases = require('./import-aliases');
@@ -83,6 +84,7 @@ module.exports = {
   ensureDomainAdmin,
   ensureNotBanned,
   ensureTeamPlan,
+  ensureEnterprisePlan,
   ensureUpgradedPlan,
   ensurePaidToDate,
   importAliases,

app/controllers/web/my-account/remove-domain.js

@@ -58,7 +58,7 @@ async function removeDomain(ctx, next) {
           group: 'admin'
         }
       },
-      plan: { $in: ['enhanced_protection', 'team'] }
+      plan: { $in: ['enhanced_protection', 'team', 'enterprise'] }
     });
     if (count === 0) {
       ctx.logger.info(`updating to free plan`);

app/controllers/web/my-account/remove.js

@@ -35,7 +35,7 @@ async function remove(ctx) {
   // check that we're not an admin of any team domains
   const domainsWithOtherAdmins = ctx.state.domains.some(
     (d) =>
-      d.plan === 'team' &&
+      (d.plan === 'team' || d.plan === 'enterprise') &&
       d.group === 'admin' &&
       d.members.some(
         (m) => m.group === 'admin' && m.user.id !== ctx.state.user.id

app/controllers/web/my-account/retrieve-domain-billing.js

@@ -196,7 +196,9 @@ async function retrieveDomainBilling(ctx) {
   try {
     if (
       !isSANB(ctx.query.plan) ||
-      !['free', 'enhanced_protection', 'team'].includes(ctx.query.plan)
+      !['free', 'enhanced_protection', 'team', 'enterprise'].includes(
+        ctx.query.plan
+      )
     )
       throw Boom.badRequest(ctx.translateError('INVALID_PLAN'));
 
@@ -261,7 +263,11 @@ async function retrieveDomainBilling(ctx) {
 
         // determine what plans are required
         const validPlans =
-          domain.plan === 'team' ? ['team'] : ['enhanced_protection', 'team'];
+          domain.plan === 'team'
+            ? ['team']
+            : domain.plan === 'enterprise'
+            ? ['enterprise']
+            : ['enhanced_protection', 'team', 'enterprise'];
         let isValid = false;
 
         for (const member of domain.members) {
@@ -337,7 +343,9 @@ async function retrieveDomainBilling(ctx) {
         isMakePayment ||
         (ctx.query.plan === 'team' && ctx.state.user.plan !== 'team') ||
         (ctx.query.plan === 'enhanced_protection' &&
-          !['team', 'enhanced_protection'].includes(ctx.state.user.plan)))
+          !['team', 'enhanced_protection', 'enterprise'].includes(
+            ctx.state.user.plan
+          )))
     ) {
       //
       // if the user is switching between plans and had conversion credit
@@ -490,7 +498,7 @@ async function retrieveDomainBilling(ctx) {
 
       if (
         !isSANB(productToPlan) ||
-        !['team', 'enhanced_protection'].includes(productToPlan)
+        !['team', 'enhanced_protection', 'enterprise'].includes(productToPlan)
       )
         throw ctx.translateError('UNKNOWN_ERROR');
 
@@ -944,7 +952,7 @@ async function retrieveDomainBilling(ctx) {
 
       // validate plans matched up
       if (
-        !['team', 'enhanced_protection'].includes(
+        !['team', 'enhanced_protection', 'enterprise'].includes(
           body.purchase_units[0].custom_id.toLowerCase()
         ) ||
         body.purchase_units[0].custom_id.toLowerCase() !== ctx.query.plan
@@ -1462,7 +1470,7 @@ ${safeStringify(parseErr(err), null, 2)}</code></pre>`
               group: 'admin'
             }
           },
-          plan: { $in: ['enhanced_protection', 'team'] }
+          plan: { $in: ['enhanced_protection', 'team', 'enterprise'] }
         });
         if (count === 0) {
           ctx.logger.info(`updating to free plan`);

app/controllers/web/my-account/validate-domain.js

@@ -110,7 +110,9 @@ async function validateDomain(ctx, next) {
 
   if (isSANB(ctx.request.body.plan)) {
     if (
-      !['free', 'enhanced_protection', 'team'].includes(ctx.request.body.plan)
+      !['free', 'enhanced_protection', 'team', 'enterprise'].includes(
+        ctx.request.body.plan
+      )
     )
       throw Boom.badRequest(ctx.translateError('INVALID_PLAN'));
   } else {
@@ -163,7 +165,11 @@ async function validateDomain(ctx, next) {
   if (isSANB(ctx.request.body.plan)) {
     switch (ctx.request.body.plan) {
       case 'enhanced_protection': {
-        if (!['enhanced_protection', 'team'].includes(ctx.state.user.plan)) {
+        if (
+          !['enhanced_protection', 'team', 'enterprise'].includes(
+            ctx.state.user.plan
+          )
+        ) {
           ctx.request.body.plan = 'free';
           ctx.state.redirectTo = ctx.state.l(
             `/my-account/domains/${punycode.toASCII(

app/models/domains.js

@@ -827,9 +827,13 @@ Domains.pre('validate', async function (next) {
         return true;
       }
 
+      if (domain.plan === 'enterprise' && user.plan === 'enterprise') {
+        return true;
+      }
+
       if (
         domain.plan === 'enhanced_protection' &&
-        ['enhanced_protection', 'team'].includes(user.plan)
+        ['enhanced_protection', 'team', 'enterprise'].includes(user.plan)
       ) {
         return true;
       }
@@ -1099,7 +1103,7 @@ Domains.pre('save', function (next) {
 
 // Prevent members from existing on domains after plan changes
 Domains.pre('save', function (next) {
-  if (this.plan === 'team') {
+  if (this.plan === 'team' || this.plan === 'enterprise') {
     return next();
   }
 
@@ -2274,15 +2278,15 @@ async function getTxtAddresses(
 Domains.statics.getTxtAddresses = getTxtAddresses;
 
 async function ensureUserHasValidPlan(user, locale) {
-  // If the user was on the team plan
+  // If the user was on the team or enterprise plan
   // then all of their domains would be valid
-  if (user.plan === 'team') {
+  if (user.plan === 'team' || user.plan === 'enterprise') {
     return;
   }
 
   // Get all domains associated with this user
   const domains = await this.find({
-    plan: { $in: ['enhanced_protection', 'team'] },
+    plan: { $in: ['enhanced_protection', 'team', 'enterprise'] },
     'members.user': user._id
   })
     .select('name plan members.user members.group')
@@ -2300,7 +2304,11 @@ async function ensureUserHasValidPlan(user, locale) {
   for (const domain of domains) {
     // Determine what plans are required
     const validPlans =
-      domain.plan === 'team' ? ['team'] : ['enhanced_protection', 'team'];
+      domain.plan === 'team'
+        ? ['team']
+        : domain.plan === 'enterprise'
+        ? ['enterprise']
+        : ['enhanced_protection', 'team', 'enterprise'];
     let isValid = false;
 
     for (const member of domain.members) {

app/models/emails.js

@@ -1392,7 +1392,11 @@ Emails.statics.queue = async function (
   // validate that at least one paying, non-banned admin on >= same plan without expiration
   //
   const validPlans =
-    domain.plan === 'team' ? ['team'] : ['team', 'enhanced_protection'];
+    domain.plan === 'team'
+      ? ['team']
+      : domain.plan === 'enterprise'
+      ? ['enterprise']
+      : ['team', 'enhanced_protection', 'enterprise'];
 
   if (
     !domain.members.some(

app/models/logs.js

@@ -912,7 +912,7 @@ async function parseLog(log) {
           const domain = await Domains.findOne({
             name,
             verification_record: verifications[0],
-            plan: { $in: ['enhanced_protection', 'team'] }
+            plan: { $in: ['enhanced_protection', 'team', 'enterprise'] }
           });
 
           if (!domain) return;