Merge branch 'dev' of https://github.com/umami-software/umami into dev

pages/api/users/index.ts

@@ -36,7 +36,7 @@ export default async (
 
     const { username, password, id } = req.body;
 
-    const existingUser = await getUser({ username });
+    const existingUser = await getUser({ username }, { showDeleted: true });
 
     if (existingUser) {
       return badRequest(res, 'User already exists');

queries/admin/teamWebsite.ts

@@ -3,7 +3,7 @@ import { uuid } from 'lib/crypto';
 import prisma from 'lib/prisma';
 
 export async function getTeamWebsite(teamId: string, userId: string): Promise<TeamWebsite> {
-  return prisma.client.TeamWebsite.findFirst({
+  return prisma.client.teamWebsite.findFirst({
     where: {
       teamId,
       userId,
@@ -12,7 +12,7 @@ export async function getTeamWebsite(teamId: string, userId: string): Promise<Te
 }
 
 export async function getTeamWebsites(teamId: string): Promise<TeamWebsite[]> {
-  return prisma.client.TeamWebsite.findMany({
+  return prisma.client.teamWebsite.findMany({
     where: {
       teamId,
     },
@@ -28,7 +28,7 @@ export async function createTeamWebsite(
   teamId: string,
   websiteId: string,
 ): Promise<TeamWebsite> {
-  return prisma.client.TeamWebsite.create({
+  return prisma.client.teamWebsite.create({
     data: {
       id: uuid(),
       userId,
@@ -37,11 +37,3 @@ export async function createTeamWebsite(
     },
   });
 }
-
-export async function deleteTeamWebsite(TeamWebsiteId: string): Promise<TeamWebsite> {
-  return prisma.client.teamUser.delete({
-    where: {
-      id: TeamWebsiteId,
-    },
-  });
-}

queries/admin/user.ts

@@ -4,13 +4,13 @@ import prisma from 'lib/prisma';
 import { Website, User } from 'lib/types';
 
 export async function getUser(
-  where: Prisma.UserWhereUniqueInput,
+  where: Prisma.UserWhereInput | Prisma.UserWhereUniqueInput,
-  options: { includePassword?: boolean } = {},
+  options: { includePassword?: boolean; showDeleted?: boolean } = {},
 ): Promise<User> {
-  const { includePassword = false } = options;
+  const { includePassword = false, showDeleted = false } = options;
 
-  return prisma.client.user.findUnique({
+  return prisma.client.user.findFirst({
-    where,
+    where: { ...where, ...(showDeleted ? {} : { deletedAt: null }) },
     select: {
       id: true,
       username: true,
@@ -62,6 +62,7 @@ export async function getUserWebsites(userId: string): Promise<Website[]> {
   return prisma.client.website.findMany({
     where: {
       userId,
+      deletedAt: null,
     },
     orderBy: [
       {
@@ -111,6 +112,7 @@ export async function deleteUser(
   userId: string,
 ): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Prisma.BatchPayload, User]> {
   const { client } = prisma;
+  const cloudMode = process.env.CLOUD_MODE;
 
   const websites = await client.website.findMany({
     where: { userId },
@@ -130,19 +132,29 @@ export async function deleteUser(
       client.session.deleteMany({
         where: { websiteId: { in: websiteIds } },
       }),
-      client.website.updateMany({
+      cloudMode
+        ? client.website.updateMany({
             data: {
               deletedAt: new Date(),
             },
             where: { id: { in: websiteIds } },
+          })
+        : client.website.deleteMany({
+            where: { id: { in: websiteIds } },
           }),
-      client.user.update({
+      cloudMode
+        ? client.user.update({
             data: {
               deletedAt: new Date(),
             },
             where: {
               id: userId,
             },
+          })
+        : client.user.delete({
+            where: {
+              id: userId,
+            },
           }),
     ])
     .then(async data => {

queries/admin/website.ts

@@ -1,7 +1,6 @@
 import { Prisma, Website } from '@prisma/client';
 import cache from 'lib/cache';
 import prisma from 'lib/prisma';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 
 export async function getWebsite(where: Prisma.WebsiteWhereUniqueInput): Promise<Website> {
   return prisma.client.website.findUnique({
@@ -69,17 +68,11 @@ export async function resetWebsite(
   });
 }
 
-export async function deleteWebsite(websiteId: string) {
+export async function deleteWebsite(
-  return runQuery({
-    [PRISMA]: () => deleteWebsiteRelationalQuery(websiteId),
-    [CLICKHOUSE]: () => deleteWebsiteClickhouseQuery(websiteId),
-  });
-}
-
-async function deleteWebsiteRelationalQuery(
   websiteId,
 ): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
+  const cloudMode = process.env.CLOUD_MODE;
 
   return transaction([
     client.websiteEvent.deleteMany({
@@ -88,7 +81,14 @@ async function deleteWebsiteRelationalQuery(
     client.session.deleteMany({
       where: { websiteId },
     }),
-    client.website.delete({
+    cloudMode
+      ? prisma.client.website.update({
+          data: {
+            deletedAt: new Date(),
+          },
+          where: { id: websiteId },
+        })
+      : client.website.delete({
           where: { id: websiteId },
         }),
   ]).then(async data => {
@@ -99,12 +99,3 @@ async function deleteWebsiteRelationalQuery(
     return data;
   });
 }
-
-async function deleteWebsiteClickhouseQuery(websiteId): Promise<Website> {
-  return prisma.client.website.update({
-    data: {
-      deletedAt: new Date(),
-    },
-    where: { id: websiteId },
-  });
-}