Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

fix: clean up link, pixel, board rows on user/team deletion

Stanislawa57abbe03917
diff --git a/src/app/(collect)/p/[slug]/route.ts b/src/app/(collect)/p/[slug]/route.ts
index fd18a2834..36ba5a892 100644
--- a/src/app/(collect)/p/[slug]/route.ts
+++ b/src/app/(collect)/p/[slug]/route.ts
@@ -21,6 +21,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
return findPixel({
where: {
slug,
+ deletedAt: null,
},
});
},
@@ -34,6 +35,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
pixel = await findPixel({
where: {
slug,
+ deletedAt: null,
},
});
diff --git a/src/app/(collect)/q/[slug]/route.ts b/src/app/(collect)/q/[slug]/route.ts
index aa9c26f3f..f585fc02e 100644
--- a/src/app/(collect)/q/[slug]/route.ts
+++ b/src/app/(collect)/q/[slug]/route.ts
@@ -19,6 +19,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
return findLink({
where: {
slug,
+ deletedAt: null,
},
});
},
@@ -32,6 +33,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
link = await findLink({
where: {
slug,
+ deletedAt: null,
},
});
diff --git a/src/queries/prisma/team.ts b/src/queries/prisma/team.ts
index de938df35..b24d65227 100644
--- a/src/queries/prisma/team.ts
+++ b/src/queries/prisma/team.ts
@@ -2,6 +2,7 @@ import { Prisma, type Team } from '@/generated/prisma/client';
import { ROLES } from '@/lib/constants';
import { uuid } from '@/lib/crypto';
import prisma from '@/lib/prisma';
+import redis from '@/lib/redis';
import type { PageResult, QueryFilters } from '@/lib/types';
import TeamFindManyArgs = Prisma.TeamFindManyArgs;
@@ -144,6 +145,24 @@ export async function deleteTeam(teamId: string) {
const { client, transaction } = prisma;
const cloudMode = !!process.env.CLOUD_MODE;
+ const [links, pixels, boards] = await Promise.all([
+ client.link.findMany({ where: { teamId }, select: { id: true, slug: true } }),
+ client.pixel.findMany({ where: { teamId }, select: { id: true, slug: true } }),
+ client.board.findMany({ where: { teamId }, select: { id: true } }),
+ ]);
+ const entityIds = [...links.map(l => l.id), ...pixels.map(p => p.id), ...boards.map(b => b.id)];
+ const linkSlugs = links.map(l => l.slug);
+ const pixelSlugs = pixels.map(p => p.slug);
+
+ const invalidateRedis = async () => {
+ if (redis.enabled && (linkSlugs.length || pixelSlugs.length)) {
+ await Promise.all([
+ ...linkSlugs.map(slug => redis.client.del(`link:${slug}`)),
+ ...pixelSlugs.map(slug => redis.client.del(`pixel:${slug}`)),
+ ]);
+ }
+ };
+
if (cloudMode) {
return transaction([
client.team.update({
@@ -154,7 +173,14 @@ export async function deleteTeam(teamId: string) {
id: teamId,
},
}),
- ]);
+ client.share.deleteMany({ where: { entityId: { in: entityIds } } }),
+ client.link.updateMany({ data: { deletedAt: new Date() }, where: { teamId } }),
+ client.pixel.updateMany({ data: { deletedAt: new Date() }, where: { teamId } }),
+ client.board.deleteMany({ where: { teamId } }),
+ ]).then(async result => {
+ await invalidateRedis();
+ return result;
+ });
}
return transaction([
@@ -163,10 +189,17 @@ export async function deleteTeam(teamId: string) {
teamId,
},
}),
+ client.share.deleteMany({ where: { entityId: { in: entityIds } } }),
+ client.link.deleteMany({ where: { teamId } }),
+ client.pixel.deleteMany({ where: { teamId } }),
+ client.board.deleteMany({ where: { teamId } }),
client.team.delete({
where: {
id: teamId,
},
}),
- ]);
+ ]).then(async result => {
+ await invalidateRedis();
+ return result;
+ });
}
diff --git a/src/queries/prisma/user.ts b/src/queries/prisma/user.ts
index 467ea1e02..c527e6026 100644
--- a/src/queries/prisma/user.ts
+++ b/src/queries/prisma/user.ts
@@ -2,6 +2,7 @@ import { Prisma } from '@/generated/prisma/client';
import { ROLES } from '@/lib/constants';
import { getRandomChars } from '@/lib/generate';
import prisma from '@/lib/prisma';
+import redis from '@/lib/redis';
import type { QueryFilters, Role } from '@/lib/types';
import UserFindManyArgs = Prisma.UserFindManyArgs;
@@ -126,6 +127,31 @@ export async function deleteUser(userId: string) {
const teamIds = teams.map(a => a.id);
+ // Cloud mode keeps owned teams (and their team-owned content), so cleanup
+ // only covers user-direct rows. Non-cloud hard-deletes owned teams below,
+ // so we must also clean up team-owned content.
+ const ownedFilter = cloudMode
+ ? { userId }
+ : { OR: [{ userId }, { teamId: { in: teamIds } }] };
+
+ const [links, pixels, boards] = await Promise.all([
+ client.link.findMany({ where: ownedFilter, select: { id: true, slug: true } }),
+ client.pixel.findMany({ where: ownedFilter, select: { id: true, slug: true } }),
+ client.board.findMany({ where: ownedFilter, select: { id: true } }),
+ ]);
+ const entityIds = [...links.map(l => l.id), ...pixels.map(p => p.id), ...boards.map(b => b.id)];
+ const linkSlugs = links.map(l => l.slug);
+ const pixelSlugs = pixels.map(p => p.slug);
+
+ const invalidateRedis = async () => {
+ if (redis.enabled && (linkSlugs.length || pixelSlugs.length)) {
+ await Promise.all([
+ ...linkSlugs.map(slug => redis.client.del(`link:${slug}`)),
+ ...pixelSlugs.map(slug => redis.client.del(`pixel:${slug}`)),
+ ]);
+ }
+ };
+
if (cloudMode) {
return transaction([
client.website.updateMany({
@@ -143,7 +169,14 @@ export async function deleteUser(userId: string) {
id: userId,
},
}),
- ]);
+ client.share.deleteMany({ where: { entityId: { in: entityIds } } }),
+ client.link.updateMany({ data: { deletedAt: new Date() }, where: { userId } }),
+ client.pixel.updateMany({ data: { deletedAt: new Date() }, where: { userId } }),
+ client.board.deleteMany({ where: { userId } }),
+ ]).then(async result => {
+ await invalidateRedis();
+ return result;
+ });
}
return transaction([
@@ -194,6 +227,10 @@ export async function deleteUser(userId: string) {
],
},
}),
+ client.share.deleteMany({ where: { entityId: { in: entityIds } } }),
+ client.link.deleteMany({ where: ownedFilter }),
+ client.pixel.deleteMany({ where: ownedFilter }),
+ client.board.deleteMany({ where: ownedFilter }),
client.website.deleteMany({
where: { id: { in: websiteIds } },
}),
@@ -202,5 +239,8 @@ export async function deleteUser(userId: string) {
id: userId,
},
}),
- ]);
+ ]).then(async result => {
+ await invalidateRedis();
+ return result;
+ });
}