Merge dev into fix/log-analytics-adjustments

server/private/routers/billing/createCheckoutSession.ts

@@ -26,8 +26,8 @@ import { getLineItems, getStandardFeaturePriceSet } from "@server/lib/billing";
 import { getTierPriceSet, TierId } from "@server/lib/billing/tiers";
 
 const createCheckoutSessionSchema = z.strictObject({
-        orgId: z.string()
-    });
+    orgId: z.string()
+});
 
 export async function createCheckoutSession(
     req: Request,
@@ -72,7 +72,7 @@ export async function createCheckoutSession(
             billing_address_collection: "required",
             line_items: [
                 {
-                    price: standardTierPrice, // Use the standard tier 
+                    price: standardTierPrice, // Use the standard tier
                     quantity: 1
                 },
                 ...getLineItems(getStandardFeaturePriceSet())

server/private/routers/billing/createPortalSession.ts

@@ -24,8 +24,8 @@ import { fromError } from "zod-validation-error";
 import stripe from "#private/lib/stripe";
 
 const createPortalSessionSchema = z.strictObject({
-        orgId: z.string()
-    });
+    orgId: z.string()
+});
 
 export async function createPortalSession(
     req: Request,

server/private/routers/billing/getOrgSubscription.ts

@@ -34,8 +34,8 @@ import {
 } from "@server/db";
 
 const getOrgSchema = z.strictObject({
-        orgId: z.string()
-    });
+    orgId: z.string()
+});
 
 registry.registerPath({
     method: "get",

server/private/routers/billing/getOrgUsage.ts

@@ -28,8 +28,8 @@ import { FeatureId } from "@server/lib/billing";
 import { GetOrgUsageResponse } from "@server/routers/billing/types";
 
 const getOrgSchema = z.strictObject({
-        orgId: z.string()
-    });
+    orgId: z.string()
+});
 
 registry.registerPath({
     method: "get",
@@ -78,11 +78,23 @@ export async function getOrgUsage(
         // Get usage for org
         const usageData = [];
 
-        const siteUptime = await usageService.getUsage(orgId, FeatureId.SITE_UPTIME);
+        const siteUptime = await usageService.getUsage(
+            orgId,
+            FeatureId.SITE_UPTIME
+        );
         const users = await usageService.getUsageDaily(orgId, FeatureId.USERS);
-        const domains = await usageService.getUsageDaily(orgId, FeatureId.DOMAINS);
-        const remoteExitNodes = await usageService.getUsageDaily(orgId, FeatureId.REMOTE_EXIT_NODES);
-        const egressData = await usageService.getUsage(orgId, FeatureId.EGRESS_DATA_MB);
+        const domains = await usageService.getUsageDaily(
+            orgId,
+            FeatureId.DOMAINS
+        );
+        const remoteExitNodes = await usageService.getUsageDaily(
+            orgId,
+            FeatureId.REMOTE_EXIT_NODES
+        );
+        const egressData = await usageService.getUsage(
+            orgId,
+            FeatureId.EGRESS_DATA_MB
+        );
 
         if (siteUptime) {
             usageData.push(siteUptime);
@@ -100,7 +112,8 @@ export async function getOrgUsage(
             usageData.push(remoteExitNodes);
         }
 
-        const orgLimits = await db.select()
+        const orgLimits = await db
+            .select()
             .from(limits)
             .where(eq(limits.orgId, orgId));
 

server/private/routers/billing/hooks/handleCustomerDeleted.ts

@@ -31,9 +31,7 @@ export async function handleCustomerDeleted(
             return;
         }
 
-        await db
-            .delete(customers)
-            .where(eq(customers.customerId, customer.id));
+        await db.delete(customers).where(eq(customers.customerId, customer.id));
     } catch (error) {
         logger.error(
             `Error handling customer created event for ID ${customer.id}:`,

server/private/routers/billing/hooks/handleSubscriptionDeleted.ts

@@ -12,7 +12,14 @@
  */
 
 import Stripe from "stripe";
-import { subscriptions, db, subscriptionItems, customers, userOrgs, users } from "@server/db";
+import {
+    subscriptions,
+    db,
+    subscriptionItems,
+    customers,
+    userOrgs,
+    users
+} from "@server/db";
 import { eq, and } from "drizzle-orm";
 import logger from "@server/logger";
 import { handleSubscriptionLifesycle } from "../subscriptionLifecycle";
@@ -43,7 +50,6 @@ export async function handleSubscriptionDeleted(
             .delete(subscriptionItems)
             .where(eq(subscriptionItems.subscriptionId, subscription.id));
 
-
         // Lookup customer to get orgId
         const [customer] = await db
             .select()
@@ -58,10 +64,7 @@ export async function handleSubscriptionDeleted(
             return;
         }
 
-        await handleSubscriptionLifesycle(
-            customer.orgId,
-            subscription.status
-        );
+        await handleSubscriptionLifesycle(customer.orgId, subscription.status);
 
         const [orgUserRes] = await db
             .select()

server/private/routers/billing/index.ts

@@ -15,4 +15,4 @@ export * from "./createCheckoutSession";
 export * from "./createPortalSession";
 export * from "./getOrgSubscription";
 export * from "./getOrgUsage";
-export * from "./internalGetOrgTier";
+export * from "./internalGetOrgTier";

server/private/routers/billing/internalGetOrgTier.ts

@@ -22,8 +22,8 @@ import { getOrgTierData } from "#private/lib/billing";
 import { GetOrgTierResponse } from "@server/routers/billing/types";
 
 const getOrgSchema = z.strictObject({
-        orgId: z.string()
-    });
+    orgId: z.string()
+});
 
 export async function getOrgTier(
     req: Request,

server/private/routers/billing/subscriptionLifecycle.ts

@@ -11,11 +11,18 @@
  * This file is not licensed under the AGPLv3.
  */
 
-import { freeLimitSet, limitsService, subscribedLimitSet } from "@server/lib/billing";
+import {
+    freeLimitSet,
+    limitsService,
+    subscribedLimitSet
+} from "@server/lib/billing";
 import { usageService } from "@server/lib/billing/usageService";
 import logger from "@server/logger";
 
-export async function handleSubscriptionLifesycle(orgId: string, status: string) {
+export async function handleSubscriptionLifesycle(
+    orgId: string,
+    status: string
+) {
     switch (status) {
         case "active":
             await limitsService.applyLimitSetToOrg(orgId, subscribedLimitSet);
@@ -42,4 +49,4 @@ export async function handleSubscriptionLifesycle(orgId: string, status: string)
         default:
             break;
     }
-}
+}

server/private/routers/billing/webhooks.ts

@@ -32,12 +32,13 @@ export async function billingWebhookHandler(
     next: NextFunction
 ): Promise<any> {
     let event: Stripe.Event = req.body;
-    const endpointSecret = privateConfig.getRawPrivateConfig().stripe?.webhook_secret;
+    const endpointSecret =
+        privateConfig.getRawPrivateConfig().stripe?.webhook_secret;
     if (!endpointSecret) {
-        logger.warn("Stripe webhook secret is not configured. Webhook events will not be priocessed.");
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "")
+        logger.warn(
+            "Stripe webhook secret is not configured. Webhook events will not be priocessed."
         );
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, ""));
     }
 
     // Only verify the event if you have an endpoint secret defined.
@@ -49,7 +50,10 @@ export async function billingWebhookHandler(
         if (!signature) {
             logger.info("No stripe signature found in headers.");
             return next(
-                createHttpError(HttpCode.BAD_REQUEST, "No stripe signature found in headers")
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "No stripe signature found in headers"
+                )
             );
         }
 
@@ -62,7 +66,10 @@ export async function billingWebhookHandler(
         } catch (err) {
             logger.error(`Webhook signature verification failed.`, err);
             return next(
-                createHttpError(HttpCode.UNAUTHORIZED, "Webhook signature verification failed")
+                createHttpError(
+                    HttpCode.UNAUTHORIZED,
+                    "Webhook signature verification failed"
+                )
             );
         }
     }