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.

Fixed websites query.

Mike Cao66d7a815fcab
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 97e20d980..cb3d3cc79 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -59,7 +59,7 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: stri
return !!(await findTeamWebsiteByUserId(websiteId, user.id));
}
-export async function canViewAllWebsite({ user }: Auth) {
+export async function canViewAllWebsites({ user }: Auth) {
return user.isAdmin;
}
diff --git a/src/lib/crypto.ts b/src/lib/crypto.ts
index b0ce20dee..a27633525 100644
--- a/src/lib/crypto.ts
+++ b/src/lib/crypto.ts
@@ -12,7 +12,7 @@ export function salt() {
return hash(secret(), ROTATING_SALT);
}
-export function uuid(...args: [any]) {
+export function uuid(...args: any) {
if (!args.length) return v4();
return v5(hash(...args, salt()), v5.DNS);
diff --git a/src/pages/api/websites/index.ts b/src/pages/api/websites/index.ts
index 099649fae..02ec713bb 100644
--- a/src/pages/api/websites/index.ts
+++ b/src/pages/api/websites/index.ts
@@ -1,4 +1,4 @@
-import { canCreateWebsite, canViewAllWebsite } from 'lib/auth';
+import { canCreateWebsite, canViewAllWebsites } from 'lib/auth';
import { uuid } from 'lib/crypto';
import { useAuth, useCors, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
@@ -41,7 +41,7 @@ export default async (
} = req.auth;
if (req.method === 'GET') {
- if (canViewAllWebsite(req.auth)) {
+ if (await canViewAllWebsites(req.auth)) {
const websites = getWebsites(req.query, {
include: {
teamWebsite: {