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
Fetch user inside useAuth.
Mike Cao3b705e6cb44d
diff --git a/lib/auth.js b/lib/auth.jsindex ab0d5fe45..8ce37bf2b 100644--- a/lib/auth.js+++ b/lib/auth.js@@ -48,7 +48,11 @@ export function isValidToken(token, validation) {export async function allowQuery(req, type) {const { id } = req.query;- const { userId, isAdmin, shareToken } = req.auth ?? {};+ const {+ user: { id: userId },+ isAdmin,+ shareToken,+ } = req.auth ?? {};if (isAdmin) {return true;diff --git a/lib/middleware.js b/lib/middleware.jsindex 58581d273..1c79864cd 100644--- a/lib/middleware.js+++ b/lib/middleware.js@@ -4,6 +4,8 @@ import cors from 'cors';import { findSession } from 'lib/session';import { parseShareToken, getAuthToken } from 'lib/auth';import { secret } from './crypto';+import redis from 'lib/redis';+import { getUser } from '../queries';const log = debug('umami:middleware');@@ -23,14 +25,21 @@ export const useSession = createMiddleware(async (req, res, next) => {export const useAuth = createMiddleware(async (req, res, next) => {const token = getAuthToken(req);- const payload = parseSecureToken(token, secret());+ const key = parseSecureToken(token, secret());const shareToken = await parseShareToken(req);- if (!token && !shareToken) {+ let user;+ if (redis.enabled) {+ user = await redis.get(key);+ } else {+ user = await getUser({ id: key });+ }++ if (!user && !shareToken) {log('useAuth:user-not-authorized');return unauthorized(res);}- req.auth = { ...payload, shareToken };+ req.auth = { user, token, shareToken, key };next();});