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 redis connection. fix delete account

Brian Caoafe6d8994b66
diff --git a/.gitignore b/.gitignore
index 33f1a5232..544103243 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,5 @@ yarn-error.log*
.env.test.local
.env.production.local
-*.development.yml
+*.dev.yml
diff --git a/lib/redis.js b/lib/redis.js
index b059ddf62..24d814381 100644
--- a/lib/redis.js
+++ b/lib/redis.js
@@ -9,6 +9,10 @@ const INITIALIZED = 'redis:initialized';
export const DELETED = 'deleted';
function getClient() {
+ if (!process.env.REDIS_URL) {
+ return null;
+ }
+
const redis = new Redis(process.env.REDIS_URL);
if (process.env.NODE_ENV !== 'production') {
diff --git a/queries/admin/account/deleteAccount.js b/queries/admin/account/deleteAccount.js
index 994cccd59..4e204e73e 100644
--- a/queries/admin/account/deleteAccount.js
+++ b/queries/admin/account/deleteAccount.js
@@ -4,12 +4,16 @@ import redis, { DELETED } from 'lib/redis';
export async function deleteAccount(user_id) {
const { client } = prisma;
- const websiteUuids = await client.website
- .findMany({
- where: { user_id },
- select: { website_uuid: true },
- })
- .map(a => a.website_uuid);
+ const websites = await client.website.findMany({
+ where: { user_id },
+ select: { website_uuid: true },
+ });
+
+ let websiteUuids = [];
+
+ if (websites.length > 0) {
+ websiteUuids = websites.map(a => a.website_uuid);
+ }
return client
.$transaction([