🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
remove ispro (#864)
Goldflag2de222c2d843
diff --git a/client/src/api/admin/endpoints/sites.ts b/client/src/api/admin/endpoints/sites.tsindex 1e7736aa0..dcd34c6b1 100644--- a/client/src/api/admin/endpoints/sites.ts+++ b/client/src/api/admin/endpoints/sites.ts@@ -62,7 +62,6 @@ export type GetSitesFromOrgResponse = {overMonthlyLimit: boolean;planName: string;status: string;- isPro: boolean;};};diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsxindex 5cc406a3d..72462d918 100644--- a/client/src/app/components/AddSite.tsx+++ b/client/src/app/components/AddSite.tsx@@ -132,8 +132,7 @@ export function AddSite({ trigger, disabled }: { trigger?: React.ReactNode; disa)}</TooltipTrigger><TooltipContent>- You have reached the limit of {subscription?.isPro ? STANDARD_SITE_LIMIT : FREE_SITE_LIMIT} websites. Upgrade- to add more websites+ You have reached the limit of {getSiteLimit(subscription)} websites. Upgrade to add more websites</TooltipContent></Tooltip>);diff --git a/client/src/components/DisabledOverlay.tsx b/client/src/components/DisabledOverlay.tsxindex 989a55e33..c54597a43 100644--- a/client/src/components/DisabledOverlay.tsx+++ b/client/src/components/DisabledOverlay.tsx@@ -106,7 +106,7 @@ export const DisabledOverlay: React.FC<DisabledOverlayProps> = ({if (organization?.createdAt && DateTime.fromJSDate(organization?.createdAt) < DateTime.fromISO("2025-09-19")) {return false;}- return !subscription?.isPro;+ return !subscription?.planName.includes("pro");}return subscription?.eventLimit === DEFAULT_EVENT_LIMIT;}, [subscription, requiredPlan, organization]);diff --git a/client/src/components/SiteSettings/SiteConfiguration.tsx b/client/src/components/SiteSettings/SiteConfiguration.tsxindex 754abdbe7..498595694 100644--- a/client/src/components/SiteSettings/SiteConfiguration.tsx+++ b/client/src/components/SiteSettings/SiteConfiguration.tsx@@ -185,7 +185,7 @@ export function SiteConfiguration({ siteMetadata, disabled = false, onClose }: Sconst { data: subscription, isLoading: isSubscriptionLoading } = useStripeSubscription();- const sessionReplayDisabled = !subscription?.isPro && IS_CLOUD;+ const sessionReplayDisabled = !subscription?.planName.includes("pro") && IS_CLOUD;const standardFeaturesDisabled = subscription?.status !== "active" && IS_CLOUD;// Configuration for analytics feature togglesdiff --git a/client/src/components/subscription/OverridePlan.tsx b/client/src/components/subscription/OverridePlan.tsxindex 1578b273d..b75431746 100644--- a/client/src/components/subscription/OverridePlan.tsx+++ b/client/src/components/subscription/OverridePlan.tsx@@ -7,6 +7,7 @@ import { Alert, AlertDescription, AlertTitle } from "../ui/alert";import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/card";import { Progress } from "../ui/progress";import { UsageChart } from "../UsageChart";+import { getPlanType } from "../../lib/stripe";export function OverridePlan() {const { data: subscription } = useStripeSubscription();@@ -27,7 +28,6 @@ export function OverridePlan() {const isLimitExceeded = currentUsage >= limit;const formatPlanName = (name: string) => {- const isPro = name.includes("pro");const eventMatch = name.match(/(\d+)(k|m)/i);if (!eventMatch) return name;@@ -35,7 +35,7 @@ export function OverridePlan() {const unit = eventMatch[2].toLowerCase();const events = unit === "m" ? `${num}M` : `${num}K`;- return `${isPro ? "Pro" : "Standard"} ${events}`;+ return `${getPlanType(name)} ${events}`;};return (diff --git a/client/src/components/subscription/PaidPlain/PaidPlan.tsx b/client/src/components/subscription/PaidPlain/PaidPlan.tsxindex b20fe8478..a0ce329d8 100644--- a/client/src/components/subscription/PaidPlain/PaidPlan.tsx+++ b/client/src/components/subscription/PaidPlain/PaidPlan.tsx@@ -7,7 +7,7 @@ import { Button } from "../../ui/button";import { Card, CardContent } from "../../ui/card";import { Progress } from "../../ui/progress";import { BACKEND_URL } from "../../../lib/const";-import { getStripePrices } from "../../../lib/stripe";+import { getPlanType, getStripePrices } from "../../../lib/stripe";import { formatDate } from "../../../lib/subscription/planUtils";import { useStripeSubscription } from "../../../lib/subscription/useStripeSubscription";import { UsageChart } from "../../UsageChart";@@ -37,29 +37,27 @@ export function PaidPlan() {const stripePlan = getStripePrices().find(p => p.name === activeSubscription?.planName);- const isPro = activeSubscription?.planName?.startsWith("pro");-const currentPlanDetails = activeSubscription? {- id: isPro ? "pro" : "standard",- name: isPro ? "Pro" : "Standard",- price: `$${stripePlan?.price}`,- interval: stripePlan?.interval,- description: isPro ? "Premium features for professional teams" : "Advanced analytics for growing projects",- features: isPro- ? [- "5+ year data retention",- "Session replays",- "Unlimited team members",- "Unlimited websites",- "Priority support",- ]- : ["1 year data retention", "Standard support", "Core analytics features"],- color: isPro- ? "bg-linear-to-br from-purple-50 to-indigo-100 dark:from-purple-800 dark:to-indigo-800"- : "bg-linear-to-br from-green-50 to-emerald-100 dark:from-green-800 dark:to-emerald-800",- icon: <Shield className="h-5 w-5" />,- }+ id: getPlanType(activeSubscription?.planName),+ name: getPlanType(activeSubscription?.planName),+ price: `$${stripePlan?.price}`,+ interval: stripePlan?.interval,+ description: getPlanType(activeSubscription?.planName) === "Pro" ? "Premium features for professional teams" : "Advanced analytics for growing projects",+ features: getPlanType(activeSubscription?.planName) === "Pro"+ ? [+ "5+ year data retention",+ "Session replays",+ "Unlimited team members",+ "Unlimited websites",+ "Priority support",+ ]+ : ["1 year data retention", "Standard support", "Core analytics features"],+ color: getPlanType(activeSubscription?.planName) === "Pro"+ ? "bg-linear-to-br from-purple-50 to-indigo-100 dark:from-purple-800 dark:to-indigo-800"+ : "bg-linear-to-br from-green-50 to-emerald-100 dark:from-green-800 dark:to-emerald-800",+ icon: <Shield className="h-5 w-5" />,+ }: null;const createPortalSession = async (flowType?: string) => {diff --git a/client/src/lib/stripe.ts b/client/src/lib/stripe.tsindex 3edbeeb8a..b897b6fc6 100644--- a/client/src/lib/stripe.ts+++ b/client/src/lib/stripe.ts@@ -319,3 +319,13 @@ export const getStripePrices = () => {priceId: TEST_TO_PRICE_ID[price.name as keyof typeof TEST_TO_PRICE_ID],}));};++export function getPlanType(name: string) {+ if (name.includes("standard")) {+ return "Standard";+ }+ if (name.includes("pro")) {+ return "Pro";+ }+ return "Free"+}\ No newline at end of filediff --git a/client/src/lib/subscription/useStripeSubscription.ts b/client/src/lib/subscription/useStripeSubscription.tsindex 9522c029a..962a5b48f 100644--- a/client/src/lib/subscription/useStripeSubscription.ts+++ b/client/src/lib/subscription/useStripeSubscription.ts@@ -1,7 +1,7 @@-import { useQuery, UseQueryResult } from "@tanstack/react-query";import { authClient } from "@/lib/auth";-import { BACKEND_URL, IS_CLOUD } from "../const";+import { useQuery, UseQueryResult } from "@tanstack/react-query";import { authedFetch } from "../../api/utils";+import { IS_CLOUD } from "../const";export interface SubscriptionData {id: string;@@ -17,7 +17,6 @@ export interface SubscriptionData {isTrial?: boolean;trialDaysRemaining?: number;message?: string; // For expired trial message- isPro?: boolean;isOverride?: boolean;}diff --git a/server/src/api/sites/addSite.ts b/server/src/api/sites/addSite.tsindex e9a326785..cd1c57a76 100644--- a/server/src/api/sites/addSite.ts+++ b/server/src/api/sites/addSite.ts@@ -74,7 +74,7 @@ export async function addSite(if (IS_CLOUD) {const subscription = await getSubscriptionInner(organizationId);- if (sessionReplay && !subscription?.isPro) {+ if (sessionReplay && !subscription?.planName.includes("pro")) {return reply.status(403).send({error: "Session replay requires a Pro subscription",});diff --git a/server/src/api/sites/getSitesFromOrg.ts b/server/src/api/sites/getSitesFromOrg.tsindex 558ce0ccc..bff34f3c1 100644--- a/server/src/api/sites/getSitesFromOrg.ts+++ b/server/src/api/sites/getSitesFromOrg.ts@@ -24,10 +24,10 @@ export async function getSitesFromOrg(const [memberCheck, allSitesData, orgInfo] = await Promise.all([userId? db- .select()- .from(member)- .where(and(eq(member.organizationId, organizationId), eq(member.userId, userId)))- .limit(1)+ .select()+ .from(member)+ .where(and(eq(member.organizationId, organizationId), eq(member.userId, userId)))+ .limit(1): Promise.resolve([]),db.select().from(sites).where(eq(sites.organizationId, organizationId)),db.select().from(organization).where(eq(organization.id, organizationId)).limit(1),@@ -110,7 +110,6 @@ export async function getSitesFromOrg(overMonthlyLimit: monthlyEventCount > eventLimit,planName: subscription?.planName || "free",status: subscription?.status || "free",- isPro: subscription?.planName.includes("pro") || false,},});} catch (err) {diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.tsindex 088982afb..085119803 100644--- a/server/src/api/stripe/getSubscription.ts+++ b/server/src/api/stripe/getSubscription.ts@@ -48,7 +48,6 @@ export async function getSubscriptionInner(organizationId: string) {monthlyEventCount: org.monthlyEventCount || 0,interval: subscription.interval,cancelAtPeriodEnd: subscription.cancelAtPeriodEnd,- isPro: subscription.isPro,isOverride: true,};}@@ -64,7 +63,6 @@ export async function getSubscriptionInner(organizationId: string) {monthlyEventCount: org.monthlyEventCount || 0,interval: subscription.interval,cancelAtPeriodEnd: subscription.cancelAtPeriodEnd,- isPro: false,};}@@ -72,7 +70,6 @@ export async function getSubscriptionInner(organizationId: string) {return {id: subscription.subscriptionId,planName: subscription.planName,- isPro: subscription.isPro,status: subscription.status,createdAt: subscription.createdAt,currentPeriodStart: DateTime.fromISO(subscription.periodStart).toJSDate(),diff --git a/server/src/lib/subscriptionUtils.ts b/server/src/lib/subscriptionUtils.tsindex 7dc9df244..48cade732 100644--- a/server/src/lib/subscriptionUtils.ts+++ b/server/src/lib/subscriptionUtils.ts@@ -16,7 +16,6 @@ export interface AppSumoSubscriptionInfo {status: "active";interval: "lifetime";cancelAtPeriodEnd: false;- isPro: false;}export interface StripeSubscriptionInfo {@@ -30,7 +29,6 @@ export interface StripeSubscriptionInfo {status: string;interval: string;cancelAtPeriodEnd: boolean;- isPro: boolean;createdAt: Date;}@@ -51,7 +49,6 @@ export interface OverrideSubscriptionInfo {status: "active";interval: "month" | "year" | "lifetime";cancelAtPeriodEnd: false;- isPro: boolean;}export type SubscriptionInfo =@@ -91,7 +88,6 @@ export async function getAppSumoSubscription(organizationId: string): Promise<Apstatus: "active",interval: "lifetime",cancelAtPeriodEnd: false,- isPro: false,};}@@ -134,7 +130,6 @@ export async function getOverrideSubscription(organizationId: string): Promise<Ostatus: "active",interval: "lifetime",cancelAtPeriodEnd: false,- isPro: false,};}@@ -155,7 +150,6 @@ export async function getOverrideSubscription(organizationId: string): Promise<Ostatus: "active",interval: planDetails.interval,cancelAtPeriodEnd: false,- isPro: planDetails.name.includes("pro"),};} catch (error) {console.error("Error checking plan override:", error);@@ -210,7 +204,6 @@ export async function getStripeSubscription(stripeCustomerId: string | null): Prstatus: subscription.status,interval: subscriptionItem.price.recurring?.interval ?? "unknown",cancelAtPeriodEnd: subscription.cancel_at_period_end,- isPro: false,createdAt: new Date(subscription.created * 1000),};}@@ -234,7 +227,6 @@ export async function getStripeSubscription(stripeCustomerId: string | null): Prstatus: subscription.status,interval: subscriptionItem.price.recurring?.interval ?? "unknown",cancelAtPeriodEnd: subscription.cancel_at_period_end,- isPro: planDetails.name.includes("pro"),createdAt: new Date(subscription.created * 1000),};} catch (error) {