fix: align dashboard guard with fallback menu access

2026-07-02 03:06:45 -04:00
parent 13b54f07de
commit ea2bd215f6
7 changed files with 133 additions and 34 deletions
@@ -13,38 +13,42 @@ const BLOCKED_STATUSES = ['SUSPENDED', 'PENDING']
 *   req.company.status is not SUSPENDED or PENDING, and subscription access is not none
 */
 export async function requireSubscription(req: Request, res: Response, next: NextFunction) {
-  const company = req.company
-  if (!company) return sendUnauthorized(res, 'unauthenticated', 'No company context')
+  try {
+    const company = req.company
+    if (!company) return sendUnauthorized(res, 'unauthenticated', 'No company context')

-  if (BLOCKED_STATUSES.includes(company.status)) {
-    return sendPaymentRequired(
-      res,
-      `subscription_${company.status.toLowerCase()}`,
-      company.status === 'SUSPENDED'
-        ? 'Your account has been suspended. Please contact support or renew your subscription.'
-        : 'Your account is pending activation. Please complete your subscription setup.',
-      { billingUrl: `${process.env.NEXT_PUBLIC_DASHBOARD_URL}/subscription` },
-    )
+    if (BLOCKED_STATUSES.includes(company.status)) {
+      return sendPaymentRequired(
+        res,
+        `subscription_${company.status.toLowerCase()}`,
+        company.status === 'SUSPENDED'
+          ? 'Your account has been suspended. Please contact support or renew your subscription.'
+          : 'Your account is pending activation. Please complete your subscription setup.',
+        { billingUrl: `${process.env.NEXT_PUBLIC_DASHBOARD_URL}/subscription` },
+      )
+    }
+
+    const subscription = await prisma.subscription.findUnique({
+      where: { companyId: company.id },
+      select: { status: true },
+    })
+    const subscriptionStatus = subscription?.status ?? 'EXPIRED'
+
+    if (!hasAnyAccess(subscriptionStatus)) {
+      return sendPaymentRequired(
+        res,
+        'subscription_required',
+        'Your subscription has ended. Please reactivate to continue.',
+        {
+          billingUrl: `${process.env.NEXT_PUBLIC_DASHBOARD_URL}/subscription`,
+          subscriptionStatus,
+          accessLevel: getAccessLevel(subscriptionStatus),
+        },
+      )
+    }
+
+    next()
+  } catch (error) {
+    next(error)
  }
-
-  const subscription = await prisma.subscription.findUnique({
-    where: { companyId: company.id },
-    select: { status: true },
-  })
-  const subscriptionStatus = subscription?.status ?? 'EXPIRED'
-
-  if (!hasAnyAccess(subscriptionStatus)) {
-    return sendPaymentRequired(
-      res,
-      'subscription_required',
-      'Your subscription has ended. Please reactivate to continue.',
-      {
-        billingUrl: `${process.env.NEXT_PUBLIC_DASHBOARD_URL}/subscription`,
-        subscriptionStatus,
-        accessLevel: getAccessLevel(subscriptionStatus),
-      },
-    )
-  }
-
-  next()
 }