v1.39.2 (#1599)

* Fixed issue with realtime page rendering.

* fix auth, add pg extension (#1596)

* Fixed change password issue. API refactoring. Closes #1592.

* Fixed account lookup.

* Fixed issue with accessing user dashboards. Closes #1590

* fix sort on dashboard (#1600)

Co-authored-by: Brian Cao <brian@umami.is>

queries/admin/account/getAccountById.js

@@ -1,9 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function getAccountById(userId) {
-  return prisma.client.account.findUnique({
-    where: {
-      id: userId,
-    },
-  });
-}

queries/admin/account/getAccountByUsername.js

@@ -1,9 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function getAccountByUsername(username) {
-  return prisma.client.account.findUnique({
-    where: {
-      username,
-    },
-  });
-}

queries/admin/account/getAccounts.js

@@ -14,6 +14,7 @@ export async function getAccounts() {
       isAdmin: true,
       createdAt: true,
       updatedAt: true,
+      accountUuid: true,
     },
   });
 }

queries/admin/website/deleteWebsite.js

@@ -1,27 +1,24 @@
 import prisma from 'lib/prisma';
 import redis, { DELETED } from 'lib/redis';
-import { getWebsiteByUuid } from 'queries';
 
-export async function deleteWebsite(websiteId) {
+export async function deleteWebsite(websiteUuid) {
   const { client, transaction } = prisma;
 
-  const { websiteUuid } = await getWebsiteByUuid(websiteId);
-
   return transaction([
     client.pageview.deleteMany({
-      where: { session: { website: { websiteUuid: websiteId } } },
+      where: { session: { website: { websiteUuid } } },
     }),
     client.eventData.deleteMany({
-      where: { event: { session: { website: { websiteUuid: websiteId } } } },
+      where: { event: { session: { website: { websiteUuid } } } },
     }),
     client.event.deleteMany({
-      where: { session: { website: { websiteUuid: websiteId } } },
+      where: { session: { website: { websiteUuid } } },
     }),
     client.session.deleteMany({
-      where: { website: { websiteUuid: websiteId } },
+      where: { website: { websiteUuid } },
     }),
     client.website.delete({
-      where: { websiteUuid: websiteId },
+      where: { websiteUuid },
     }),
   ]).then(async res => {
     if (redis.client) {

queries/admin/website/getUserWebsites.js

@@ -1,10 +1,8 @@
 import prisma from 'lib/prisma';
 
-export async function getUserWebsites(userId) {
+export async function getUserWebsites(where) {
   return prisma.client.website.findMany({
-    where: {
-      userId,
-    },
+    where,
     orderBy: {
       name: 'asc',
     },

queries/admin/website/getWebsite.js

@@ -1,7 +1,16 @@
 import prisma from 'lib/prisma';
+import redis from 'lib/redis';
 
 export async function getWebsite(where) {
-  return prisma.client.website.findUnique({
-    where,
-  });
+  return prisma.client.website
+    .findUnique({
+      where,
+    })
+    .then(async data => {
+      if (redis.enabled && data) {
+        await redis.client.set(`website:${data.websiteUuid}`, data.id);
+      }
+
+      return data;
+    });
 }

queries/admin/website/getWebsiteById.js

@@ -1,9 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function getWebsiteById(websiteId) {
-  return prisma.client.website.findUnique({
-    where: {
-      id: websiteId,
-    },
-  });
-}

queries/admin/website/getWebsiteByShareId.js

@@ -1,9 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function getWebsiteByShareId(shareId) {
-  return prisma.client.website.findUnique({
-    where: {
-      shareId,
-    },
-  });
-}

queries/admin/website/getWebsiteByUuid.js

@@ -1,18 +0,0 @@
-import prisma from 'lib/prisma';
-import redis from 'lib/redis';
-
-export async function getWebsiteByUuid(websiteUuid) {
-  return prisma.client.website
-    .findUnique({
-      where: {
-        websiteUuid,
-      },
-    })
-    .then(async res => {
-      if (redis.client && res) {
-        await redis.client.set(`website:${res.websiteUuid}`, res.id);
-      }
-
-      return res;
-    });
-}