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 token check.
Mike Cao8722b794d903
diff --git a/lib/auth.js b/lib/auth.jsindex 664ff30c6..09193e890 100644--- a/lib/auth.js+++ b/lib/auth.js@@ -50,12 +50,9 @@ export function isValidToken(token, validation) {export async function allowQuery(req, type) {const { id } = req.query;- const {- user: { id: userId, isAdmin },- shareToken,- } = req.auth;+ const { user, shareToken } = req.auth;- if (isAdmin) {+ if (user?.isAdmin) {return true;}@@ -63,11 +60,11 @@ export async function allowQuery(req, type) {return isValidToken(shareToken, { id });}- if (userId) {+ if (user?.id) {if (type === TYPE_WEBSITE) {const website = await getWebsite({ id });- return website && website.userId === userId;+ return website && website.userId === user.id;} else if (type === TYPE_USER) {const user = await getUser({ id });diff --git a/lib/middleware.js b/lib/middleware.jsindex 09d790d1c..c60d27707 100644--- a/lib/middleware.js+++ b/lib/middleware.js@@ -29,12 +29,12 @@ export const useAuth = createMiddleware(async (req, res, next) => {const payload = parseSecureToken(token, secret());const shareToken = await parseShareToken(req);- let user;+ let user = null;const { userId, key } = payload || {};if (validate(userId)) {user = await getUser({ id: userId });- } else if (redis.enabled) {+ } else if (redis.enabled && key) {user = await redis.get(key);}