🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Restrict delete and get import
Edward Cui17661e8469a6
diff --git a/server/src/api/sites/deleteSiteImport.ts b/server/src/api/sites/deleteSiteImport.tsindex 20c32d3c3..224cbe0db 100644--- a/server/src/api/sites/deleteSiteImport.ts+++ b/server/src/api/sites/deleteSiteImport.ts@@ -4,6 +4,11 @@ import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";import { getImportById, deleteImport } from "../../services/import/importStatusManager.js";import { clickhouse } from "../../db/clickhouse/clickhouse.js";import { importQuotaManager } from "../../services/import/importQuotaManager.js";+import { db } from "../../db/postgres/postgres.js";+import { organization, sites } from "../../db/postgres/schema.js";+import { eq } from "drizzle-orm";+import { getBestSubscription } from "../../lib/subscriptionUtils.js";+import { IS_CLOUD } from "../../lib/const.js";const deleteImportRequestSchema = z.object({@@ -48,6 +53,28 @@ export async function deleteSiteImport(request: FastifyRequest<DeleteImportRequereturn reply.status(400).send({ error: "Cannot delete active import" });}+ if (IS_CLOUD) {+ const [siteRecord] = await db+ .select({+ organizationId: sites.organizationId,+ stripeCustomerId: organization.stripeCustomerId,+ })+ .from(sites)+ .leftJoin(organization, eq(sites.organizationId, organization.id))+ .where(eq(sites.siteId, site))+ .limit(1);++ if (siteRecord.organizationId) {+ const subscription = await getBestSubscription(siteRecord.organizationId, siteRecord.stripeCustomerId);++ if (subscription.source === "free") {+ return reply.status(403).send({+ error: "Data import is not available on the free plan. Please upgrade to a paid plan.",+ });+ }+ }+ }+try {await clickhouse.command({query: "DELETE FROM events WHERE import_id = {importId:UUID} AND site_id = {siteId:UInt16}",diff --git a/server/src/api/sites/getSiteImports.ts b/server/src/api/sites/getSiteImports.tsindex 6a32014d4..5ba3085ec 100644--- a/server/src/api/sites/getSiteImports.ts+++ b/server/src/api/sites/getSiteImports.ts@@ -2,6 +2,11 @@ import { FastifyReply, FastifyRequest } from "fastify";import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";import { getImportsForSite } from "../../services/import/importStatusManager.js";import { z } from "zod";+import { db } from "../../db/postgres/postgres.js";+import { organization, sites } from "../../db/postgres/schema.js";+import { eq } from "drizzle-orm";+import { getBestSubscription } from "../../lib/subscriptionUtils.js";+import { IS_CLOUD } from "../../lib/const.js";const getSiteImportsRequestSchema = z.object({@@ -32,6 +37,28 @@ export async function getSiteImports(request: FastifyRequest<GetSiteImportsRequereturn reply.status(403).send({ error: "Forbidden" });}+ if (IS_CLOUD) {+ const [siteRecord] = await db+ .select({+ organizationId: sites.organizationId,+ stripeCustomerId: organization.stripeCustomerId,+ })+ .from(sites)+ .leftJoin(organization, eq(sites.organizationId, organization.id))+ .where(eq(sites.siteId, site))+ .limit(1);++ if (siteRecord.organizationId) {+ const subscription = await getBestSubscription(siteRecord.organizationId, siteRecord.stripeCustomerId);++ if (subscription.source === "free") {+ return reply.status(403).send({+ error: "Data import is not available on the free plan. Please upgrade to a paid plan.",+ });+ }+ }+ }+const imports = await getImportsForSite(site);return reply.send({