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
Improved error handling for useSession middleware.
Mike Caoc5bffb97cc03
diff --git a/lib/middleware.ts b/lib/middleware.tsindex b0785e2d2..79c48404e 100644--- a/lib/middleware.ts+++ b/lib/middleware.ts@@ -20,14 +20,19 @@ export const useCors = createMiddleware();export const useSession = createMiddleware(async (req, res, next) => {- const session = await findSession(req as NextApiRequestCollect);+ try {+ const session = await findSession(req as NextApiRequestCollect);- if (!session) {- log('useSession: Session not found');- return badRequest(res, 'Session not found.');+ if (!session) {+ log('useSession: Session not found');+ return badRequest(res, 'Session not found.');+ }++ (req as any).session = session;+ } catch (e: any) {+ return badRequest(res, e.message);}- (req as any).session = session;next();});diff --git a/lib/session.ts b/lib/session.tsindex af9f4c11e..937bfef2e 100644--- a/lib/session.ts+++ b/lib/session.ts@@ -11,7 +11,7 @@ export async function findSession(req: NextApiRequestCollect) {const { payload } = getJsonBody<CollectRequestBody>(req);if (!payload) {- return null;+ throw new Error('Invalid payload.');}// Check if cache token is passed@@ -29,14 +29,14 @@ export async function findSession(req: NextApiRequestCollect) {const { website: websiteId, hostname, screen, language } = payload;if (!validate(websiteId)) {- return null;+ throw new Error('Invalid website ID.');}// Find websiteconst website = await loadWebsite(websiteId);if (!website) {- throw new Error(`Website not found: ${websiteId}`);+ throw new Error(`Website not found: ${websiteId}.`);}const { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device } =