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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed share page.
Mike Cao4c202741c228
diff --git a/lib/types.ts b/lib/types.tsindex 007d6fdbd..9dc017191 100644--- a/lib/types.ts+++ b/lib/types.ts@@ -7,7 +7,9 @@ export interface Auth {role: string;isAdmin: boolean;};- shareToken?: string;+ shareToken?: {+ websiteId: string;+ };}export interface NextApiRequestQueryBody<TQuery = any, TBody = any> extends NextApiRequest {diff --git a/pages/api/share/[id].ts b/pages/api/share/[id].tsindex b8a37e257..b5511f2de 100644--- a/pages/api/share/[id].ts+++ b/pages/api/share/[id].ts@@ -23,8 +23,7 @@ export default async (const website = await getWebsite({ shareId });if (website) {- const { id } = website;- const data = { id };+ const data = { websiteId: website.id };const token = createToken(data, secret());return ok(res, { ...data, token });diff --git a/pages/api/websites/[id]/active.ts b/pages/api/websites/[id]/active.tsindex 1d007f7f7..a293b637f 100644--- a/pages/api/websites/[id]/active.ts+++ b/pages/api/websites/[id]/active.ts@@ -1,5 +1,4 @@-import { WebsiteActive } from 'lib/types';-import { NextApiRequestQueryBody } from 'lib/types';+import { NextApiRequestQueryBody, WebsiteActive } from 'lib/types';import { canViewWebsite } from 'lib/auth';import { useAuth, useCors } from 'lib/middleware';import { NextApiResponse } from 'next';@@ -17,13 +16,15 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;- const { id: websiteId } = req.query;+ const { user, shareToken } = req.auth;+ const userId = user?.id;+ const websiteId = req.query.id;+ const shared = shareToken?.websiteId === websiteId;if (req.method === 'GET') {- if (await canViewWebsite(userId, websiteId)) {+ const canView = await canViewWebsite(userId, websiteId);++ if (!canView && !shared) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/eventdata.ts b/pages/api/websites/[id]/eventdata.tsindex 9293cbada..8ceb0abcb 100644--- a/pages/api/websites/[id]/eventdata.ts+++ b/pages/api/websites/[id]/eventdata.ts@@ -30,7 +30,9 @@ export default async (const { id: websiteId } = req.query;if (req.method === 'POST') {- if (canViewWebsite(userId, websiteId)) {+ const canView = canViewWebsite(userId, websiteId);++ if (!canView) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/events.ts b/pages/api/websites/[id]/events.tsindex 726669a35..d328c83de 100644--- a/pages/api/websites/[id]/events.ts+++ b/pages/api/websites/[id]/events.ts@@ -25,13 +25,15 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: websiteId, start_at, end_at, unit, tz, url, event_name } = req.query;+ const { user, shareToken } = req.auth;+ const userId = user?.id;+ const shared = shareToken?.websiteId === websiteId;if (req.method === 'GET') {- if (canViewWebsite(userId, websiteId)) {+ const canView = canViewWebsite(userId, websiteId);++ if (!canView && !shared) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/index.ts b/pages/api/websites/[id]/index.tsindex 2f11ec701..0a0fa6628 100644--- a/pages/api/websites/[id]/index.ts+++ b/pages/api/websites/[id]/index.ts@@ -22,13 +22,15 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;- const { id: websiteId } = req.query;+ const { user, shareToken } = req.auth;+ const userId = user?.id;+ const websiteId = req.query.id;+ const shared = shareToken?.websiteId === websiteId;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ const canView = await canViewWebsite(userId, websiteId);++ if (!canView && !shared) {return unauthorized(res);}@@ -38,7 +40,9 @@ export default async (}if (req.method === 'POST') {- if (!(await canUpdateWebsite(userId, websiteId))) {+ const canUpdate = await canUpdateWebsite(userId, websiteId);++ if (!canUpdate) {return unauthorized(res);}@@ -56,7 +60,9 @@ export default async (}if (req.method === 'DELETE') {- if (!(await canDeleteWebsite(userId, websiteId))) {+ const canDelete = await canDeleteWebsite(userId, websiteId);++ if (!canDelete) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/metrics.ts b/pages/api/websites/[id]/metrics.tsindex 260814da4..7eb364a13 100644--- a/pages/api/websites/[id]/metrics.ts+++ b/pages/api/websites/[id]/metrics.ts@@ -55,9 +55,6 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const {id: websiteId,type,@@ -70,9 +67,14 @@ export default async (device,country,} = req.query;+ const { user, shareToken } = req.auth;+ const userId = user?.id;+ const shared = shareToken?.websiteId === websiteId;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ const canView = await canViewWebsite(userId, websiteId);++ if (!canView && !shared) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.tsindex ea6c5df46..a9d914447 100644--- a/pages/api/websites/[id]/pageviews.ts+++ b/pages/api/websites/[id]/pageviews.ts@@ -30,9 +30,6 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const {id: websiteId,start_at,@@ -46,9 +43,14 @@ export default async (device,country,} = req.query;+ const { user, shareToken } = req.auth;+ const userId = user?.id;+ const shared = shareToken?.websiteId === websiteId;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ const canView = await canViewWebsite(userId, websiteId);++ if (!canView && !shared) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/reset.ts b/pages/api/websites/[id]/reset.tsindex 292672aee..70f5618a4 100644--- a/pages/api/websites/[id]/reset.ts+++ b/pages/api/websites/[id]/reset.ts@@ -1,5 +1,5 @@import { NextApiRequestQueryBody } from 'lib/types';-import { canViewWebsite } from 'lib/auth';+import { canUpdateWebsite } from 'lib/auth';import { useAuth, useCors } from 'lib/middleware';import { NextApiResponse } from 'next';import { methodNotAllowed, ok, unauthorized } from 'next-basics';@@ -22,7 +22,9 @@ export default async (const { id: websiteId } = req.query;if (req.method === 'POST') {- if (!(await canViewWebsite(userId, websiteId))) {+ const canUpdate = await canUpdateWebsite(userId, websiteId);++ if (!canUpdate) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/stats.ts b/pages/api/websites/[id]/stats.tsindex 85c4f2543..c5b9bbf1c 100644--- a/pages/api/websites/[id]/stats.ts+++ b/pages/api/websites/[id]/stats.ts@@ -1,5 +1,4 @@-import { WebsiteStats } from 'lib/types';-import { NextApiRequestQueryBody } from 'lib/types';+import { NextApiRequestQueryBody, WebsiteStats } from 'lib/types';import { canViewWebsite } from 'lib/auth';import { useAuth, useCors } from 'lib/middleware';import { NextApiResponse } from 'next';@@ -26,9 +25,6 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const {id: websiteId,start_at,@@ -40,9 +36,14 @@ export default async (device,country,} = req.query;+ const { user, shareToken } = req.auth;+ const userId = user?.id;+ const shared = shareToken?.websiteId === websiteId;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ const canView = await canViewWebsite(userId, websiteId);++ if (!canView && !shared) {return unauthorized(res);}diff --git a/pages/share/[...id].js b/pages/share/[...id].jsindex d449afa55..e46c6af29 100644--- a/pages/share/[...id].js+++ b/pages/share/[...id].js@@ -16,7 +16,7 @@ export default function SharePage() {return (<Layout>- <WebsiteDetails websiteId={shareToken.id} />+ <WebsiteDetails websiteId={shareToken.websiteId} /></Layout>);}