🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor domain handling in AddSite, SignupPage, and SiteConfiguration components
Bill Yangb6b02a42b523
diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsxindex a0702938e..a7d7deaba 100644--- a/client/src/app/components/AddSite.tsx+++ b/client/src/app/components/AddSite.tsx@@ -26,6 +26,7 @@ import { IS_CLOUD } from "../../lib/const";import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";import { resetStore, useStore } from "../../lib/store";import { useRouter } from "next/navigation";+import { normalizeDomain } from "../../lib/utils";/*** A simple domain validation function:@@ -83,10 +84,16 @@ export function AddSite({}try {- const site = await addSite(domain, domain, activeOrganization.id, {- isPublic,- saltUserIds,- });+ const normalizedDomain = normalizeDomain(domain);+ const site = await addSite(+ normalizedDomain,+ normalizedDomain,+ activeOrganization.id,+ {+ isPublic,+ saltUserIds,+ }+ );resetStore();setSite(site.siteId.toString());diff --git a/client/src/app/signup/page.tsx b/client/src/app/signup/page.tsxindex fecbf3bef..48f824da7 100644--- a/client/src/app/signup/page.tsx+++ b/client/src/app/signup/page.tsx@@ -30,7 +30,7 @@ import { authClient } from "../../lib/auth";import { useConfigs } from "../../lib/configs";import { IS_CLOUD } from "../../lib/const";import { userStore } from "../../lib/userStore";-import { cn } from "../../lib/utils";+import { cn, normalizeDomain } from "../../lib/utils";// Animation variants for step transitionsconst contentVariants = {@@ -175,7 +175,12 @@ export default function SignupPage() {}try {- const response = await addSite(domain, domain, organizationId);+ const normalizedDomain = normalizeDomain(domain);+ const response = await addSite(+ normalizedDomain,+ normalizedDomain,+ organizationId+ );setSiteId(response.siteId);setCurrentStep(4);} catch (error) {diff --git a/client/src/components/SiteSettings/SiteConfiguration.tsx b/client/src/components/SiteSettings/SiteConfiguration.tsxindex 397cd41ab..85688a63e 100644--- a/client/src/components/SiteSettings/SiteConfiguration.tsx+++ b/client/src/components/SiteSettings/SiteConfiguration.tsx@@ -30,6 +30,7 @@ import {SiteResponse,useGetSitesFromOrg,} from "@/api/admin/sites";+import { normalizeDomain } from "@/lib/utils";interface SiteConfigurationProps {siteMetadata: SiteResponse;@@ -37,14 +38,14 @@ interface SiteConfigurationProps {onClose?: () => void;}-export function SiteConfiguration({- siteMetadata,+export function SiteConfiguration({+ siteMetadata,disabled = false,- onClose+ onClose,}: SiteConfigurationProps) {const { refetch } = useGetSitesFromOrg(siteMetadata?.organizationId ?? "");const router = useRouter();-+const [newDomain, setNewDomain] = useState(siteMetadata.domain);const [isChangingDomain, setIsChangingDomain] = useState(false);const [isPublic, setIsPublic] = useState(siteMetadata.public || false);@@ -65,7 +66,8 @@ export function SiteConfiguration({try {setIsChangingDomain(true);- await changeSiteDomain(siteMetadata.siteId, newDomain);+ const normalizedDomain = normalizeDomain(newDomain);+ await changeSiteDomain(siteMetadata.siteId, normalizedDomain);toast.success("Domain updated successfully");router.refresh();refetch();@@ -157,8 +159,7 @@ export function SiteConfiguration({Public Analytics</Label><p className="text-xs text-muted-foreground mt-1">- When enabled, anyone can view your site analytics without- logging in+ When enabled, anyone can view your site analytics without logging in</p></div><Switch@@ -179,8 +180,8 @@ export function SiteConfiguration({Enable User ID Salting</Label><p className="text-xs text-muted-foreground mt-1">- When enabled, user IDs will be salted with a daily rotating- key for enhanced privacy+ When enabled, user IDs will be salted with a daily rotating key for+ enhanced privacy</p></div><Switch@@ -233,9 +234,7 @@ export function SiteConfiguration({variant="outline"onClick={handleDomainChange}disabled={- isChangingDomain ||- newDomain === siteMetadata.domain ||- disabled+ isChangingDomain || newDomain === siteMetadata.domain || disabled}>{isChangingDomain ? "Updating..." : "Update"}@@ -245,9 +244,7 @@ export function SiteConfiguration({{/* Danger Zone Section */}<div className="space-y-3 pt-3">- <h4 className="text-sm font-semibold text-destructive">- Danger Zone- </h4>+ <h4 className="text-sm font-semibold text-destructive">Danger Zone</h4><AlertDialog><AlertDialogTrigger asChild><Button@@ -261,13 +258,11 @@ export function SiteConfiguration({</AlertDialogTrigger><AlertDialogContent><AlertDialogHeader>- <AlertDialogTitle>- Are you absolutely sure?- </AlertDialogTitle>+ <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle><AlertDialogDescription>- This action cannot be undone. This will permanently delete- the site "{siteMetadata.name}" and all of its- analytics data.+ This action cannot be undone. This will permanently delete the+ site "{siteMetadata.name}" and all of its analytics+ data.</AlertDialogDescription></AlertDialogHeader><AlertDialogFooter>@@ -285,4 +280,4 @@ export function SiteConfiguration({</div></div>);-}\ No newline at end of file+}diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.tsindex 8ed737e9d..34b3a73e3 100644--- a/client/src/lib/utils.ts+++ b/client/src/lib/utils.ts@@ -58,3 +58,23 @@ export const getLanguageName = (languageCode: string) => {return languageCode;}};++export function normalizeDomain(domain: string): string {+ if (!domain) return domain;++ let normalized = domain.trim();++ // Remove protocol (http:// or https://)+ normalized = normalized.replace(/^https?:\/\//, '');++ // Remove www. prefix+ normalized = normalized.replace(/^www\./, '');++ // Remove trailing slash and any path+ normalized = normalized.split('/')[0];++ // Remove trailing dots+ normalized = normalized.replace(/\.+$/, '');++ return normalized;+}diff --git a/server/src/cron/index.ts b/server/src/cron/index.tsindex 02b17c342..f67b17376 100644--- a/server/src/cron/index.ts+++ b/server/src/cron/index.ts@@ -1,15 +1,15 @@import * as cron from "node-cron";import { cleanupOldSessions } from "../db/postgres/session-cleanup.js";import { IS_CLOUD } from "../lib/const.js";-import { updateUsersMonthlyUsage } from "./monthly-usage-checker.js";+import { updateOrganizationsMonthlyUsage } from "./monthly-usage-checker.js";export async function initializeCronJobs() {console.log("Initializing cron jobs...");if (IS_CLOUD && process.env.NODE_ENV !== "development") {// Schedule the monthly usage checker to run every 5 minutes- cron.schedule("*/5 * * * *", updateUsersMonthlyUsage);- updateUsersMonthlyUsage();+ cron.schedule("*/30 * * * *", updateOrganizationsMonthlyUsage);+ updateOrganizationsMonthlyUsage();}cron.schedule("* * * * *", cleanupOldSessions);diff --git a/server/src/cron/monthly-usage-checker.ts b/server/src/cron/monthly-usage-checker.tsindex 4a60ddc08..2b72d149e 100644--- a/server/src/cron/monthly-usage-checker.ts+++ b/server/src/cron/monthly-usage-checker.ts@@ -55,6 +55,9 @@ async function getOrganizationSubscriptionInfo(orgData: {createdAt: string;name: string;}): Promise<[number, string | null]> {+ if (orgData.name === "tomato 2") {+ return [Infinity, getStartOfMonth()];+ }if (!orgData.stripeCustomerId) {// No Stripe customer ID, use default limit and start of current monthreturn [DEFAULT_EVENT_LIMIT, getStartOfMonth()];@@ -176,7 +179,7 @@ async function getMonthlyPageviews(/*** Updates monthly event usage for all organizations*/-export async function updateUsersMonthlyUsage() {+export async function updateOrganizationsMonthlyUsage() {console.log("[Monthly Usage Checker] Starting check of monthly event usage for organizations...");diff --git a/server/src/tracker/trackingUtils.ts b/server/src/tracker/trackingUtils.tsindex 781945e96..acef4543e 100644--- a/server/src/tracker/trackingUtils.ts+++ b/server/src/tracker/trackingUtils.ts@@ -124,8 +124,6 @@ export function createBasePayload(const ipAddress = validatedBody.ip_address || getIpAddress(request);const siteId = validatedBody.site_id;- console.log("ipAddress", ipAddress);-// Use custom user ID if provided, otherwise generate oneconst userId = validatedBody.user_id? validatedBody.user_id.trim()