Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix: User self delete does not work (#473)

Andrii Romasiune1c945db57a2
diff --git a/backend/apps/cloud/src/project/project.service.ts b/backend/apps/cloud/src/project/project.service.ts
index 68d98e254..398925557 100644
--- a/backend/apps/cloud/src/project/project.service.ts
+++ b/backend/apps/cloud/src/project/project.service.ts
@@ -17,6 +17,7 @@ import {
DeepPartial,
Brackets,
FindOptionsWhere,
+ In,
} from 'typeorm'
import handlebars from 'handlebars'
import crypto from 'crypto'
@@ -616,6 +617,44 @@ export class ProjectService implements OnModuleDestroy {
.execute()
}
+ async deleteProjectsForUser(userId: string) {
+ const projects = await this.projectsRepository.find({
+ where: { admin: { id: userId } },
+ select: ['id'],
+ })
+
+ if (_isEmpty(projects)) {
+ return
+ }
+
+ const projectIds = _map(projects, 'id')
+ const queries = [
+ 'ALTER TABLE analytics DELETE WHERE pid IN ({pids:Array(FixedString(12))})',
+ 'ALTER TABLE customEV DELETE WHERE pid IN ({pids:Array(FixedString(12))})',
+ 'ALTER TABLE performance DELETE WHERE pid IN ({pids:Array(FixedString(12))})',
+ 'ALTER TABLE errors DELETE WHERE pid IN ({pids:Array(FixedString(12))})',
+ 'ALTER TABLE error_statuses DELETE WHERE pid IN ({pids:Array(FixedString(12))})',
+ 'ALTER TABLE captcha DELETE WHERE pid IN ({pids:Array(FixedString(12))})',
+ ]
+
+ await Promise.all(
+ _map(queries, (query) =>
+ clickhouse.command({
+ query,
+ query_params: {
+ pids: projectIds,
+ },
+ }),
+ ),
+ )
+
+ await this.funnelRepository.delete({ project: { id: In(projectIds) } })
+ await this.annotationRepository.delete({ project: { id: In(projectIds) } })
+ await this.deleteMultipleShare({ project: { id: In(projectIds) } })
+ await this.deleteMultiple(projectIds)
+ await deleteProjectsRedis(projectIds)
+ }
+
async deleteMultipleShare(where: FindOptionsWhere<ProjectShare>) {
return this.projectShareRepository.delete(where)
}
diff --git a/backend/apps/cloud/src/user/user.controller.ts b/backend/apps/cloud/src/user/user.controller.ts
index 2e644bfdf..1d7d7d034 100644
--- a/backend/apps/cloud/src/user/user.controller.ts
+++ b/backend/apps/cloud/src/user/user.controller.ts
@@ -225,10 +225,7 @@ export class UserController {
try {
if (!_isEmpty(user.projects)) {
- await this.projectService.update(
- { admin: { id } },
- { isArchived: true },
- )
+ await this.projectService.deleteProjectsForUser(id)
}
await this.actionTokensService.deleteMultiple({ user: { id } })
await this.userService.deleteAllRefreshTokens(id)
@@ -244,9 +241,11 @@ export class UserController {
throw new BadRequestException('accountDeleteError')
}
+ const feedback = deleteSelfDTO?.feedback
+
try {
- if (deleteSelfDTO.feedback) {
- await this.userService.saveDeleteFeedback(deleteSelfDTO.feedback)
+ if (feedback) {
+ await this.userService.saveDeleteFeedback(feedback)
}
} catch (reason) {
this.logger.error(
@@ -259,7 +258,7 @@ export class UserController {
await trackCustom(ip, headers['user-agent'], {
ev: 'ACCOUNT_DELETED',
meta: {
- reason_stated: !!deleteSelfDTO.feedback,
+ reason_stated: !!feedback,
},
})
diff --git a/web/app/pages/Onboarding/Onboarding.tsx b/web/app/pages/Onboarding/Onboarding.tsx
index 5b5ab638a..3a05d3617 100644
--- a/web/app/pages/Onboarding/Onboarding.tsx
+++ b/web/app/pages/Onboarding/Onboarding.tsx
@@ -472,9 +472,6 @@ const Onboarding = () => {
} else if (intent === 'complete-onboarding') {
loadUser()
navigate(routes.dashboard)
- } else if (intent === 'delete-account') {
- logout()
- navigate(routes.main)
} else if (intent === 'confirm-email') {
setCookie(CONFIRMATION_TIMEOUT, true, 600)
setHasResentEmail(true)
diff --git a/web/app/routes/onboarding.tsx b/web/app/routes/onboarding.tsx
index b19de16b2..2e148ef39 100644
--- a/web/app/routes/onboarding.tsx
+++ b/web/app/routes/onboarding.tsx
@@ -246,10 +246,7 @@ export async function action({ request }: ActionFunctionArgs) {
)
}
- return data<OnboardingActionData>(
- { intent, success: true },
- { headers: createHeadersWithCookies(result.cookies) },
- )
+ return redirect('/logout')
}
case 'confirm-email': {