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
Merged auth into new parseRequest method.
Mike Cao2d6428172b53
diff --git a/src/app/api/teams/[teamId]/route.ts b/src/app/api/teams/[teamId]/route.tsindex 7348e3c40..8ea414423 100644--- a/src/app/api/teams/[teamId]/route.ts+++ b/src/app/api/teams/[teamId]/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { unauthorized, json, badRequest, notFound, ok } from 'lib/response';-import { canDeleteTeam, canUpdateTeam, canViewTeam, checkAuth } from 'lib/auth';-import { checkRequest } from 'lib/request';+import { unauthorized, json, notFound, ok } from 'lib/response';+import { canDeleteTeam, canUpdateTeam, canViewTeam } from 'lib/auth';+import { parseRequest } from 'lib/request';import { deleteTeam, getTeam, updateTeam } from 'queries';export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {@@ -9,17 +9,15 @@ export async function GET(request: Request, { params }: { params: Promise<{ teamteamId: z.string().uuid(),});- const { error } = await checkRequest(request, schema);+ const { auth, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { teamId } = await params;- const auth = await checkAuth(request);-- if (!auth || !(await canViewTeam(auth, teamId))) {+ if (!(await canViewTeam(auth, teamId))) {return unauthorized();}@@ -38,17 +36,15 @@ export async function POST(request: Request, { params }: { params: Promise<{ teaaccessCode: z.string().max(50),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { teamId } = await params;- const auth = await checkAuth(request);-- if (!auth || !(await canUpdateTeam(auth, teamId))) {+ if (!(await canUpdateTeam(auth, teamId))) {return unauthorized('You must be the owner of this team.');}@@ -61,11 +57,15 @@ export async function DELETE(request: Request,{ params }: { params: Promise<{ teamId: string }> },) {- const { teamId } = await params;+ const { auth, error } = await parseRequest(request);- const auth = await checkAuth(request);+ if (error) {+ return error();+ }++ const { teamId } = await params;- if (!auth || !(await canDeleteTeam(auth, teamId))) {+ if (!(await canDeleteTeam(auth, teamId))) {return unauthorized('You must be the owner of this team.');}diff --git a/src/app/api/teams/[teamId]/users/[userId]/route.ts b/src/app/api/teams/[teamId]/users/[userId]/route.tsindex c0a7f11f1..9276c194d 100644--- a/src/app/api/teams/[teamId]/users/[userId]/route.ts+++ b/src/app/api/teams/[teamId]/users/[userId]/route.ts@@ -1,16 +1,20 @@import { z } from 'zod';import { unauthorized, json, badRequest, ok } from 'lib/response';-import { canDeleteTeam, canUpdateTeam, checkAuth } from 'lib/auth';-import { checkRequest } from 'lib/request';+import { canDeleteTeam, canUpdateTeam } from 'lib/auth';+import { parseRequest } from 'lib/request';import { deleteTeam, getTeamUser, updateTeamUser } from 'queries';export async function GET(request: Request,{ params }: { params: Promise<{ teamId: string; userId: string }> },) {- const { teamId, userId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { teamId, userId } = await params;if (!(await canUpdateTeam(auth, teamId))) {return unauthorized('You must be the owner of this team.');@@ -29,16 +33,14 @@ export async function POST(role: z.string().regex(/team-member|team-view-only|team-manager/),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { teamId, userId } = await params;- const auth = await checkAuth(request);-if (!(await canUpdateTeam(auth, teamId))) {return unauthorized('You must be the owner of this team.');}@@ -58,11 +60,15 @@ export async function DELETE(request: Request,{ params }: { params: Promise<{ teamId: string }> },) {- const { teamId } = await params;+ const { auth, error } = await parseRequest(request);- const auth = await checkAuth(request);+ if (error) {+ return error();+ }++ const { teamId } = await params;- if (!auth || !(await canDeleteTeam(auth, teamId))) {+ if (!(await canDeleteTeam(auth, teamId))) {return unauthorized('You must be the owner of this team.');}diff --git a/src/app/api/teams/[teamId]/users/route.ts b/src/app/api/teams/[teamId]/users/route.tsindex 3b7f95588..a69a6b851 100644--- a/src/app/api/teams/[teamId]/users/route.ts+++ b/src/app/api/teams/[teamId]/users/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { unauthorized, json, badRequest } from 'lib/response';-import { canAddUserToTeam, canUpdateTeam, checkAuth } from 'lib/auth';-import { checkRequest } from 'lib/request';+import { canAddUserToTeam, canUpdateTeam } from 'lib/auth';+import { parseRequest } from 'lib/request';import { pagingParams, roleParam } from 'lib/schema';import { createTeamUser, getTeamUser, getTeamUsers } from 'queries';@@ -10,16 +10,14 @@ export async function GET(request: Request, { params }: { params: Promise<{ team...pagingParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { teamId } = await params;- const auth = await checkAuth(request);-if (!(await canUpdateTeam(auth, teamId))) {return unauthorized('You must be the owner of this team.');}@@ -55,17 +53,15 @@ export async function POST(role: roleParam,});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { teamId } = await params;- const auth = await checkAuth(request);-- if (!auth || !(await canAddUserToTeam(auth))) {+ if (!(await canAddUserToTeam(auth))) {return unauthorized();}diff --git a/src/app/api/teams/[teamId]/websites/route.ts b/src/app/api/teams/[teamId]/websites/route.tsindex 1d06b3c8c..9f800e0e3 100644--- a/src/app/api/teams/[teamId]/websites/route.ts+++ b/src/app/api/teams/[teamId]/websites/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { unauthorized, json, badRequest } from 'lib/response';-import { canViewTeam, checkAuth } from 'lib/auth';-import { checkRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewTeam } from 'lib/auth';+import { parseRequest } from 'lib/request';import { pagingParams } from 'lib/schema';import { getTeamWebsites } from 'queries';@@ -9,18 +9,14 @@ export async function GET(request: Request, { params }: { params: Promise<{ teamconst schema = z.object({...pagingParams,});-- const { query, error } = await checkRequest(request, schema);+ const { teamId } = await params;+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}- const { teamId } = await params;-- const auth = await checkAuth(request);-- if (!auth || !(await canViewTeam(auth, teamId))) {+ if (!(await canViewTeam(auth, teamId))) {return unauthorized();}diff --git a/src/app/api/teams/join/route.ts b/src/app/api/teams/join/route.tsindex c7bff0191..76d4a83f4 100644--- a/src/app/api/teams/join/route.ts+++ b/src/app/api/teams/join/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { unauthorized, json, badRequest, notFound } from 'lib/response';-import { canCreateTeam, checkAuth } from 'lib/auth';-import { checkRequest } from 'lib/request';+import { canCreateTeam } from 'lib/auth';+import { parseRequest } from 'lib/request';import { ROLES } from 'lib/constants';import { createTeamUser, findTeam, getTeamUser } from 'queries';@@ -10,15 +10,13 @@ export async function POST(request: Request) {accessCode: z.string().max(50),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}- const auth = await checkAuth(request);-- if (!auth || !(await canCreateTeam(auth))) {+ if (!(await canCreateTeam(auth))) {return unauthorized();}diff --git a/src/app/api/teams/route.ts b/src/app/api/teams/route.tsindex 1c097e8ef..cd71b24a5 100644--- a/src/app/api/teams/route.ts+++ b/src/app/api/teams/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';import { getRandomChars } from 'next-basics';-import { unauthorized, json, badRequest } from 'lib/response';-import { canCreateTeam, checkAuth } from 'lib/auth';+import { unauthorized, json } from 'lib/response';+import { canCreateTeam } from 'lib/auth';import { uuid } from 'lib/crypto';-import { checkRequest } from 'lib/request';+import { parseRequest } from 'lib/request';import { createTeam } from 'queries';export async function POST(request: Request) {@@ -11,15 +11,13 @@ export async function POST(request: Request) {name: z.string().max(50),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}- const auth = await checkAuth(request);-- if (!auth || !(await canCreateTeam(auth))) {+ if (!(await canCreateTeam(auth))) {return unauthorized();}diff --git a/src/app/api/users/[userId]/route.ts b/src/app/api/users/[userId]/route.tsindex 30c166f1c..684be305e 100644--- a/src/app/api/users/[userId]/route.ts+++ b/src/app/api/users/[userId]/route.ts@@ -1,16 +1,20 @@import { z } from 'zod';-import { canUpdateUser, canViewUser, checkAuth } from 'lib/auth';+import { canUpdateUser, canViewUser } from 'lib/auth';import { getUser, getUserByUsername, updateUser } from 'queries';import { json, unauthorized, badRequest } from 'lib/response';import { hashPassword } from 'next-basics';-import { checkRequest } from 'lib/request';+import { parseRequest } from 'lib/request';export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {- const { userId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { userId } = await params;- if (!auth || !(await canViewUser(auth, userId))) {+ if (!(await canViewUser(auth, userId))) {return unauthorized();}@@ -26,17 +30,15 @@ export async function POST(request: Request, { params }: { params: Promise<{ userole: z.string().regex(/admin|user|view-only/i),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { userId } = await params;- const auth = await checkAuth(request);-- if (!auth || !(await canUpdateUser(auth, userId))) {+ if (!(await canUpdateUser(auth, userId))) {return unauthorized();}diff --git a/src/app/api/users/[userId]/teams/route.ts b/src/app/api/users/[userId]/teams/route.tsindex 83238799a..4eb37a61c 100644--- a/src/app/api/users/[userId]/teams/route.ts+++ b/src/app/api/users/[userId]/teams/route.ts@@ -1,26 +1,23 @@import { z } from 'zod';import { pagingParams } from 'lib/schema';import { getUserTeams } from 'queries';-import { checkAuth } from 'lib/auth';-import { unauthorized, badRequest, json } from 'lib/response';-import { checkRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { parseRequest } from 'lib/request';export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {const schema = z.object({...pagingParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { userId } = await params;- const auth = await checkAuth(request);-- if (!auth || (!auth.user.isAdmin && (!userId || auth.user.id !== userId))) {+ if (!auth.user.isAdmin && (!userId || auth.user.id !== userId)) {return unauthorized();}diff --git a/src/app/api/users/[userId]/usage/route.ts b/src/app/api/users/[userId]/usage/route.tsindex 275f665f4..72510bd32 100644--- a/src/app/api/users/[userId]/usage/route.ts+++ b/src/app/api/users/[userId]/usage/route.ts@@ -1,10 +1,9 @@import { z } from 'zod';-import { json, unauthorized, badRequest } from 'lib/response';+import { json, unauthorized } from 'lib/response';import { getAllUserWebsitesIncludingTeamOwner } from 'queries/prisma/website';import { getEventUsage } from 'queries/analytics/events/getEventUsage';import { getEventDataUsage } from 'queries/analytics/events/getEventDataUsage';-import { checkAuth } from 'lib/auth';-import { checkRequest } from 'lib/request';+import { parseRequest } from 'lib/request';export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {const schema = z.object({@@ -12,15 +11,13 @@ export async function GET(request: Request, { params }: { params: Promise<{ userendAt: z.coerce.number().int(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}- const auth = await checkAuth(request);-- if (!auth || !auth.user.isAdmin) {+ if (!auth.user.isAdmin) {return unauthorized();}diff --git a/src/app/api/users/[userId]/websites/route.ts b/src/app/api/users/[userId]/websites/route.tsindex 189bf8fa3..22aced514 100644--- a/src/app/api/users/[userId]/websites/route.ts+++ b/src/app/api/users/[userId]/websites/route.ts@@ -1,26 +1,23 @@import { z } from 'zod';-import { unauthorized, json, badRequest } from 'lib/response';+import { unauthorized, json } from 'lib/response';import { getUserWebsites } from 'queries/prisma/website';import { pagingParams } from 'lib/schema';-import { checkRequest } from 'lib/request';-import { checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {const schema = z.object({...pagingParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { userId } = await params;- const auth = await checkAuth(request);-- if (!auth || (!auth.user.isAdmin && auth.user.id !== userId)) {+ if (!auth.user.isAdmin && auth.user.id !== userId) {return unauthorized();}diff --git a/src/app/api/users/route.ts b/src/app/api/users/route.tsindex 87959a0cc..8f9e57231 100644--- a/src/app/api/users/route.ts+++ b/src/app/api/users/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';import { hashPassword } from 'next-basics';-import { canCreateUser, checkAuth } from 'lib/auth';+import { canCreateUser } from 'lib/auth';import { ROLES } from 'lib/constants';import { uuid } from 'lib/crypto';-import { checkRequest } from 'lib/request';+import { parseRequest } from 'lib/request';import { unauthorized, json, badRequest } from 'lib/response';import { createUser, getUserByUsername } from 'queries';@@ -15,15 +15,13 @@ export async function POST(request: Request) {role: z.string().regex(/admin|user|view-only/i),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}- const auth = await checkAuth(request);-- if (!auth || !(await canCreateUser(auth))) {+ if (!(await canCreateUser(auth))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/active/route.ts b/src/app/api/websites/[websiteId]/active/route.tsindex 569bdb7be..9e25cea6e 100644--- a/src/app/api/websites/[websiteId]/active/route.ts+++ b/src/app/api/websites/[websiteId]/active/route.ts@@ -1,16 +1,21 @@-import { canViewWebsite, checkAuth } from 'lib/auth';+import { canViewWebsite } from 'lib/auth';import { json, unauthorized } from 'lib/response';import { getActiveVisitors } from 'queries';+import { parseRequest } from 'lib/request';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {- const { websiteId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { websiteId } = await params;- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/daterange/route.ts b/src/app/api/websites/[websiteId]/daterange/route.tsindex d4a562deb..754234540 100644--- a/src/app/api/websites/[websiteId]/daterange/route.ts+++ b/src/app/api/websites/[websiteId]/daterange/route.ts@@ -1,16 +1,21 @@-import { canViewWebsite, checkAuth } from 'lib/auth';+import { canViewWebsite } from 'lib/auth';import { getWebsiteDateRange } from 'queries';import { json, unauthorized } from 'lib/response';+import { parseRequest } from 'lib/request';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {- const { websiteId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { websiteId } = await params;- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/event-data/events/route.ts b/src/app/api/websites/[websiteId]/event-data/events/route.tsindex 143fae184..4937482a4 100644--- a/src/app/api/websites/[websiteId]/event-data/events/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/events/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getEventDataEvents } from 'queries/analytics/events/getEventDataEvents';export async function GET(@@ -13,19 +13,16 @@ export async function GET(endAt: z.coerce.number().int(),event: z.string().optional(),});-- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt, event } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/event-data/fields/route.ts b/src/app/api/websites/[websiteId]/event-data/fields/route.tsindex 3ef2f3b1b..e95998ed0 100644--- a/src/app/api/websites/[websiteId]/event-data/fields/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/fields/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getEventDataFields } from 'queries';export async function GET(@@ -13,17 +13,15 @@ export async function GET(endAt: z.coerce.number().int(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt } = query;- const auth = await checkAuth(request);-if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/event-data/properties/route.ts b/src/app/api/websites/[websiteId]/event-data/properties/route.tsindex 68fdf4e38..25f915b1d 100644--- a/src/app/api/websites/[websiteId]/event-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/properties/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getEventDataProperties } from 'queries';export async function GET(@@ -14,18 +14,16 @@ export async function GET(propertyName: z.string().optional(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt, propertyName } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/event-data/stats/route.ts b/src/app/api/websites/[websiteId]/event-data/stats/route.tsindex d958bbdcb..a8093e617 100644--- a/src/app/api/websites/[websiteId]/event-data/stats/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/stats/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getEventDataStats } from 'queries';export async function GET(@@ -14,18 +14,16 @@ export async function GET(propertyName: z.string().optional(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/event-data/values/route.ts b/src/app/api/websites/[websiteId]/event-data/values/route.tsindex 0ecf20d36..7734d920e 100644--- a/src/app/api/websites/[websiteId]/event-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/values/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getEventDataValues } from 'queries';export async function GET(@@ -15,18 +15,16 @@ export async function GET(propertyName: z.string().optional(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt, eventName, propertyName } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/events/route.ts b/src/app/api/websites/[websiteId]/events/route.tsindex ef9293126..71046b3cb 100644--- a/src/app/api/websites/[websiteId]/events/route.ts+++ b/src/app/api/websites/[websiteId]/events/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { pagingParams } from 'lib/schema';import { getWebsiteEvents } from 'queries';@@ -15,18 +15,16 @@ export async function GET(...pagingParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/events/series/route.ts b/src/app/api/websites/[websiteId]/events/series/route.tsindex 4551e3bf2..99378612a 100644--- a/src/app/api/websites/[websiteId]/events/series/route.ts+++ b/src/app/api/websites/[websiteId]/events/series/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest, getRequestDateRange, getRequestFilters } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest, getRequestDateRange, getRequestFilters } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { filterParams, timezoneParam, unitParam } from 'lib/schema';import { getEventMetrics } from 'queries';@@ -17,19 +17,17 @@ export async function GET(...filterParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { timezone } = query;const { startDate, endDate, unit } = await getRequestDateRange(request);- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/metrics/route.ts b/src/app/api/websites/[websiteId]/metrics/route.tsindex 3842c6830..44312429c 100644--- a/src/app/api/websites/[websiteId]/metrics/route.ts+++ b/src/app/api/websites/[websiteId]/metrics/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { canViewWebsite } from 'lib/auth';import { SESSION_COLUMNS, EVENT_COLUMNS, FILTER_COLUMNS, OPERATORS } from 'lib/constants';-import { getRequestFilters, getRequestDateRange, checkRequest } from 'lib/request';+import { getRequestFilters, getRequestDateRange, parseRequest } from 'lib/request';import { json, unauthorized, badRequest } from 'lib/response';import { getPageviewMetrics, getSessionMetrics } from 'queries';import { filterParams } from 'lib/schema';@@ -20,18 +20,16 @@ export async function GET(...filterParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { type, limit, offset, search } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/pageviews/route.ts b/src/app/api/websites/[websiteId]/pageviews/route.tsindex e9e6f32b9..020e139b7 100644--- a/src/app/api/websites/[websiteId]/pageviews/route.ts+++ b/src/app/api/websites/[websiteId]/pageviews/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';-import { canViewWebsite, checkAuth } from 'lib/auth';-import { getRequestFilters, getRequestDateRange, checkRequest } from 'lib/request';+import { canViewWebsite } from 'lib/auth';+import { getRequestFilters, getRequestDateRange, parseRequest } from 'lib/request';import { unitParam, timezoneParam, filterParams } from 'lib/schema';import { getCompareDate } from 'lib/date';-import { badRequest, unauthorized, json } from 'lib/response';+import { unauthorized, json } from 'lib/response';import { getPageviewStats, getSessionStats } from 'queries';export async function GET(@@ -19,18 +19,16 @@ export async function GET(...filterParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { timezone, compare } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/reports/route.ts b/src/app/api/websites/[websiteId]/reports/route.tsindex 0098fa155..44f626252 100644--- a/src/app/api/websites/[websiteId]/reports/route.ts+++ b/src/app/api/websites/[websiteId]/reports/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { canViewWebsite } from 'lib/auth';import { getWebsiteReports } from 'queries';import { pagingParams } from 'lib/schema';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';export async function GET(request: Request,@@ -13,18 +13,16 @@ export async function GET(...pagingParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { page, pageSize, search } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/reset/route.ts b/src/app/api/websites/[websiteId]/reset/route.tsindex bfbd11a82..8f2df289e 100644--- a/src/app/api/websites/[websiteId]/reset/route.ts+++ b/src/app/api/websites/[websiteId]/reset/route.ts@@ -1,16 +1,21 @@-import { canUpdateWebsite, checkAuth } from 'lib/auth';+import { canUpdateWebsite } from 'lib/auth';import { resetWebsite } from 'queries';import { unauthorized, ok } from 'lib/response';+import { parseRequest } from 'lib/request';export async function POST(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {- const { websiteId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { websiteId } = await params;- if (!auth || !(await canUpdateWebsite(auth, websiteId))) {+ if (!(await canUpdateWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/route.ts b/src/app/api/websites/[websiteId]/route.tsindex e8ad8a0b5..b72a5e1de 100644--- a/src/app/api/websites/[websiteId]/route.ts+++ b/src/app/api/websites/[websiteId]/route.ts@@ -1,19 +1,23 @@import { z } from 'zod';-import { canUpdateWebsite, canDeleteWebsite, checkAuth, canViewWebsite } from 'lib/auth';+import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from 'lib/auth';import { SHARE_ID_REGEX } from 'lib/constants';-import { checkRequest } from 'lib/request';-import { ok, json, badRequest, unauthorized, serverError } from 'lib/response';+import { parseRequest } from 'lib/request';+import { ok, json, unauthorized, serverError } from 'lib/response';import { deleteWebsite, getWebsite, updateWebsite } from 'queries';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {- const { websiteId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { websiteId } = await params;- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}@@ -32,18 +36,16 @@ export async function POST(shareId: z.string().regex(SHARE_ID_REGEX).nullable(),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { name, domain, shareId } = body;- const auth = await checkAuth(request);-- if (!auth || !(await canUpdateWebsite(auth, websiteId))) {+ if (!(await canUpdateWebsite(auth, websiteId))) {return unauthorized();}@@ -64,11 +66,15 @@ export async function DELETE(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {- const { websiteId } = await params;+ const { auth, error } = await parseRequest(request);- const auth = await checkAuth(request);+ if (error) {+ return error();+ }++ const { websiteId } = await params;- if (!auth || !(await canDeleteWebsite(auth, websiteId))) {+ if (!(await canDeleteWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/session-data/properties/route.ts b/src/app/api/websites/[websiteId]/session-data/properties/route.tsindex af168f84e..5729ddbd8 100644--- a/src/app/api/websites/[websiteId]/session-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/session-data/properties/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getSessionDataProperties } from 'queries';export async function GET(@@ -14,18 +14,16 @@ export async function GET(propertyName: z.string().optional(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { startAt, endAt, propertyName } = query;const { websiteId } = await params;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/session-data/values/route.ts b/src/app/api/websites/[websiteId]/session-data/values/route.tsindex 627298af5..f14b19161 100644--- a/src/app/api/websites/[websiteId]/session-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/session-data/values/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getEventDataEvents } from 'queries/analytics/events/getEventDataEvents';export async function GET(@@ -14,18 +14,16 @@ export async function GET(propertyName: z.string().optional(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { startAt, endAt, event } = query;const { websiteId } = await params;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.tsindex 48123ffeb..ccd05d4d7 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getSessionActivity } from 'queries';export async function GET(@@ -13,18 +13,16 @@ export async function GET(endAt: z.coerce.number().int(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId, sessionId } = await params;const { startAt, endAt } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.tsindex 7c5863e8c..a95a02334 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts@@ -1,16 +1,21 @@import { unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { canViewWebsite } from 'lib/auth';import { getSessionData } from 'queries';+import { parseRequest } from 'lib/request';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string; sessionId: string }> },) {- const { websiteId, sessionId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { websiteId, sessionId } = await params;- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.tsindex 6822aaa01..0a968eb28 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts@@ -1,16 +1,21 @@import { unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { canViewWebsite } from 'lib/auth';import { getWebsiteSession } from 'queries';+import { parseRequest } from 'lib/request';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string; sessionId: string }> },) {- const { websiteId, sessionId } = await params;+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }- const auth = await checkAuth(request);+ const { websiteId, sessionId } = await params;- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/sessions/route.ts b/src/app/api/websites/[websiteId]/sessions/route.tsindex c96a8ddbe..da8d9d092 100644--- a/src/app/api/websites/[websiteId]/sessions/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { pagingParams } from 'lib/schema';import { getWebsiteSessions } from 'queries';@@ -15,18 +15,16 @@ export async function GET(...pagingParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/sessions/stats/route.ts b/src/app/api/websites/[websiteId]/sessions/stats/route.tsindex 35c170217..8149942a9 100644--- a/src/app/api/websites/[websiteId]/sessions/stats/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/stats/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest, getRequestDateRange, getRequestFilters } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest, getRequestDateRange, getRequestFilters } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { filterParams } from 'lib/schema';import { getWebsiteSessionStats } from 'queries';@@ -15,17 +15,15 @@ export async function GET(...filterParams,});- const { error } = await checkRequest(request, schema);+ const { auth, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts b/src/app/api/websites/[websiteId]/sessions/weekly/route.tsindex 05cc9cade..b57bb95c2 100644--- a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/weekly/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { parseRequest } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { pagingParams, timezoneParam } from 'lib/schema';import { getWebsiteSessionsWeekly } from 'queries';@@ -16,18 +16,16 @@ export async function GET(...pagingParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { startAt, endAt, timezone } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/stats/route.ts b/src/app/api/websites/[websiteId]/stats/route.tsindex 76d9f9a67..55dc4e3ec 100644--- a/src/app/api/websites/[websiteId]/stats/route.ts+++ b/src/app/api/websites/[websiteId]/stats/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { checkRequest, getRequestDateRange, getRequestFilters } from 'lib/request';-import { badRequest, unauthorized, json } from 'lib/response';-import { checkAuth, canViewWebsite } from 'lib/auth';+import { parseRequest, getRequestDateRange, getRequestFilters } from 'lib/request';+import { unauthorized, json } from 'lib/response';+import { canViewWebsite } from 'lib/auth';import { getCompareDate } from 'lib/date';import { filterParams } from 'lib/schema';import { getWebsiteStats } from 'queries';@@ -17,18 +17,16 @@ export async function GET(...filterParams,});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { compare } = query;- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}diff --git a/src/app/api/websites/[websiteId]/transfer/route.ts b/src/app/api/websites/[websiteId]/transfer/route.tsindex 8771ecc2a..d3e497cda 100644--- a/src/app/api/websites/[websiteId]/transfer/route.ts+++ b/src/app/api/websites/[websiteId]/transfer/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { canTransferWebsiteToTeam, canTransferWebsiteToUser, checkAuth } from 'lib/auth';+import { canTransferWebsiteToTeam, canTransferWebsiteToUser } from 'lib/auth';import { updateWebsite } from 'queries';-import { checkRequest } from 'lib/request';+import { parseRequest } from 'lib/request';import { badRequest, unauthorized, json } from 'lib/response';export async function POST(@@ -13,20 +13,16 @@ export async function POST(teamId: z.string().uuid().optional(),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { userId, teamId } = body;- const auth = await checkAuth(request);-- if (!auth) {- return unauthorized();- } else if (userId) {+ if (userId) {if (!(await canTransferWebsiteToUser(auth, websiteId, userId))) {return unauthorized();}@@ -49,4 +45,6 @@ export async function POST(return json(website);}++ return badRequest();}diff --git a/src/app/api/websites/[websiteId]/values/route.ts b/src/app/api/websites/[websiteId]/values/route.tsindex fe4edfbb6..6e7b51d6a 100644--- a/src/app/api/websites/[websiteId]/values/route.ts+++ b/src/app/api/websites/[websiteId]/values/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';-import { canViewWebsite, checkAuth } from 'lib/auth';+import { canViewWebsite } from 'lib/auth';import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';import { getValues } from 'queries';-import { checkRequest, getRequestDateRange } from 'lib/request';+import { parseRequest, getRequestDateRange } from 'lib/request';import { badRequest, json, unauthorized } from 'lib/response';export async function GET(@@ -16,24 +16,22 @@ export async function GET(search: z.string().optional(),});- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);+ return error();}const { websiteId } = await params;const { type, search } = query;const { startDate, endDate } = await getRequestDateRange(request);- const auth = await checkAuth(request);-- if (!auth || !(await canViewWebsite(auth, websiteId))) {+ if (!(await canViewWebsite(auth, websiteId))) {return unauthorized();}if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type)) {- return badRequest();+ return badRequest('Invalid type.');}const values = await getValues(websiteId, FILTER_COLUMNS[type], startDate, endDate, search);diff --git a/src/app/api/websites/route.ts b/src/app/api/websites/route.tsindex 6bb1e476c..3911d8d85 100644--- a/src/app/api/websites/route.ts+++ b/src/app/api/websites/route.ts@@ -1,24 +1,18 @@import { z } from 'zod';-import { canCreateTeamWebsite, canCreateWebsite, checkAuth } from 'lib/auth';-import { json, badRequest, unauthorized } from 'lib/response';+import { canCreateTeamWebsite, canCreateWebsite } from 'lib/auth';+import { json, unauthorized } from 'lib/response';import { uuid } from 'lib/crypto';-import { checkRequest } from 'lib/request';+import { parseRequest } from 'lib/request';import { createWebsite, getUserWebsites } from 'queries';import { pagingParams } from 'lib/schema';export async function GET(request: Request) {const schema = z.object({ ...pagingParams });- const { query, error } = await checkRequest(request, schema);+ const { auth, query, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);- }-- const auth = await checkAuth(request);-- if (!auth) {- return unauthorized();+ return error();}const websites = await getUserWebsites(auth.user.userId, query);@@ -34,16 +28,10 @@ export async function POST(request: Request) {teamId: z.string().nullable(),});- const { body, error } = await checkRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, schema);if (error) {- return badRequest(error);- }-- const auth = await checkAuth(request);-- if (!auth) {- return unauthorized();+ return error();}const { name, domain, shareId, teamId } = body;diff --git a/src/lib/request.ts b/src/lib/request.tsindex 5eb1b477e..ed5270d2c 100644--- a/src/lib/request.ts+++ b/src/lib/request.ts@@ -1,7 +1,9 @@import { ZodObject } from 'zod';+import { FILTER_COLUMNS } from 'lib/constants';+import { badRequest, unauthorized } from 'lib/response';import { getAllowedUnits, getMinimumUnit } from './date';import { getWebsiteDateRange } from '../queries';-import { FILTER_COLUMNS } from 'lib/constants';+import { checkAuth } from 'lib/auth';export async function getJsonBody(request: Request) {try {@@ -11,14 +13,27 @@ export async function getJsonBody(request: Request) {}}-export async function checkRequest(request: Request, schema: ZodObject<any>) {+export async function parseRequest(request: Request, schema?: ZodObject<any>) {+ let error: () => void | undefined;const url = new URL(request.url);const query = Object.fromEntries(url.searchParams);const body = await getJsonBody(request);- const result = schema.safeParse(request.method === 'GET' ? query : body);+ if (schema) {+ const result = schema.safeParse(request.method === 'GET' ? query : body);++ if (result.error) {+ error = () => badRequest(result.error);+ }+ }++ const auth = !error ? await checkAuth(request) : null;++ if (!error && !auth) {+ error = () => unauthorized();+ }- return { query, body, error: result.error };+ return { url, query, body, auth, error };}export async function getRequestDateRange(query: Record<string, any>) {diff --git a/src/lib/schema.ts b/src/lib/schema.tsindex 5f81b1f17..0410a965c 100644--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@ -16,8 +16,8 @@ export const pageInfo = {};export const pagingParams = {- page: z.coerce.number().int().positive(),- pageSize: z.coerce.number().int().positive(),+ page: z.coerce.number().int().positive().optional(),+ pageSize: z.coerce.number().int().positive().optional(),orderBy: z.string().optional(),query: z.string().optional(),};