Merge pull request #2948 from fosrl/dev

1.18.1-s.3

README.md

@@ -41,7 +41,7 @@
     </strong>
 </p>
 
-Pangolin is an open-source, identity-based remote access platform built on WireGuard that enables secure, seamless connectivity to private and public resources. Pangolin combines reverse proxy and VPN capabilities into one platform, providing browser-based access to web applications and client-based access to any private resources with NAT traversal, all with granular access controls.
+Pangolin is an open-source, identity-based remote access platform built on WireGuard® that enables secure, seamless connectivity to private and public resources. Pangolin combines reverse proxy and VPN capabilities into one platform, providing browser-based access to web applications and client-based access to any private resources with NAT traversal, all with granular access controls.
 
 ## Installation
 

server/emails/templates/NotifyTrialExpiring.tsx

@@ -64,7 +64,7 @@ export const NotifyTrialExpiring = ({
 
                                 <EmailText>
                                     Some features and resources may now be
-                                    restricted. To restore full
+                                    restricted or disconnected. To restore full
                                     access and continue using all the features
                                     you had during your trial, please upgrade to
                                     a paid plan.
@@ -85,7 +85,7 @@ export const NotifyTrialExpiring = ({
                                     <strong>{orgName}</strong> will end on{" "}
                                     <strong>{trialEndsAt}</strong>
                                     {isLastDay
-                                        ? " - that's tomorrow!"
+                                        ? " — that's tomorrow!"
                                         : `, in ${daysRemaining} days`}
                                     .
                                 </EmailText>
@@ -93,7 +93,8 @@ export const NotifyTrialExpiring = ({
                                 <EmailText>
                                     After your trial ends, your account will be
                                     moved to the free plan and some
-                                    functionality may be restricted.
+                                    functionality may be restricted or your
+                                    sites may disconnect.
                                 </EmailText>
 
                                 <EmailText>

server/lib/billing/limitSet.ts

@@ -25,7 +25,7 @@ export const tier1LimitSet: LimitSet = {
 
 export const tier2LimitSet: LimitSet = {
     [FeatureId.USERS]: {
-        value: 50,
+        value: 100,
         description: "Team limit"
     },
     [FeatureId.SITES]: {
@@ -48,7 +48,7 @@ export const tier2LimitSet: LimitSet = {
 
 export const tier3LimitSet: LimitSet = {
     [FeatureId.USERS]: {
-        value: 250,
+        value: 500,
         description: "Business limit"
     },
     [FeatureId.SITES]: {

server/private/lib/billing/getOrgTierData.ts

@@ -19,13 +19,12 @@ import { eq, and, ne } from "drizzle-orm";
 
 export async function getOrgTierData(
     orgId: string
-): Promise<{ tier: Tier | null; active: boolean; isTrial: boolean }> {
+): Promise<{ tier: Tier | null; active: boolean }> {
     let tier: Tier | null = null;
     let active = false;
-    let isTrial = false;
 
     if (build !== "saas") {
-        return { tier, active, isTrial };
+        return { tier, active };
     }
 
     try {
@@ -36,7 +35,7 @@ export async function getOrgTierData(
             .limit(1);
 
         if (!org) {
-            return { tier, active, isTrial };
+            return { tier, active };
         }
 
         let orgIdToUse = org.orgId;
@@ -45,7 +44,7 @@ export async function getOrgTierData(
                 logger.warn(
                     `Org ${orgId} is not a billing org and does not have a billingOrgId`
                 );
-                return { tier, active, isTrial };
+                return { tier, active };
             }
             orgIdToUse = org.billingOrgId;
         }
@@ -58,7 +57,7 @@ export async function getOrgTierData(
             .limit(1);
 
         if (!customer) {
-            return { tier, active, isTrial };
+            return { tier, active };
         }
 
         // Query for active subscriptions that are not license type
@@ -85,13 +84,11 @@ export async function getOrgTierData(
                 tier = subscription.type;
                 active = true;
             }
-
-            isTrial = subscription.trial ?? false;
         }
     } catch (error) {
         // If org not found or error occurs, return null tier and inactive
         // This is acceptable behavior as per the function signature
     }
 
-    return { tier, active, isTrial };
+    return { tier, active };
 }

server/routers/auth/deleteMyAccount.ts

@@ -104,9 +104,8 @@ export async function deleteMyAccount(
                 (r) => r.isBillingOrg && r.isOwner
             )?.orgId;
             if (primaryOrgId) {
-                const { tier, active, isTrial } =
-                    await getOrgTierData(primaryOrgId);
-                if (active && tier && !isTrial) {
+                const { tier, active } = await getOrgTierData(primaryOrgId);
+                if (active && tier) {
                     return next(
                         createHttpError(
                             HttpCode.BAD_REQUEST,

server/routers/siteResource/deleteSiteResource.ts

@@ -63,26 +63,17 @@ export async function deleteSiteResource(
             );
         }
 
-        // Delete the site resource
-        const [removedSiteResource] = await db
-            .delete(siteResources)
-            .where(eq(siteResources.siteResourceId, siteResourceId))
-            .returning();
+        await db.transaction(async (trx) => {
+            // Delete the site resource
+            const [removedSiteResource] = await trx
+                .delete(siteResources)
+                .where(eq(siteResources.siteResourceId, siteResourceId))
+                .returning();
 
-        // Run in the background after the response is sent. Wrapped in its
-        // own transaction so it always executes on the primary — avoiding any
-        // replica-lag issues while still allowing the HTTP response to return
-        // early.
-        db.transaction(async (trx) => {
             await rebuildClientAssociationsFromSiteResource(
                 removedSiteResource,
                 trx
             );
-        }).catch((err) => {
-            logger.error(
-                `Error rebuilding client associations for site resource ${removedSiteResource!.siteResourceId}:`,
-                err
-            );
         });
 
         logger.info(`Deleted site resource ${siteResourceId}`);