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
Merge branch 'dev' into feat/um-23-v2-schema-init
Brian Cao689b73282919
diff --cc lib/auth.jsindex 1b063b5a6,25985168c..1011cda8c--- a/lib/auth.js+++ b/lib/auth.js@@@ -1,5 -1,6 +1,6 @@@import { parseSecureToken, parseToken } from 'next-basics';-import { getAccount, getWebsite } from 'queries';+import { getUser, getWebsite } from 'queries';+ import debug from 'debug';import { SHARE_TOKEN_HEADER, TYPE_ACCOUNT, TYPE_WEBSITE } from 'lib/constants';import { secret } from 'lib/crypto';diff --cc pages/api/users/[id]/index.jsindex 3329869a1,c5f16d4e1..b8ac6f74c--- a/pages/api/users/[id]/index.js+++ b/pages/api/users/[id]/index.js@@@ -53,6 -53,10 +53,10 @@@ export default async (req, res) =>}if (req.method === 'DELETE') {+ if (id === userId) {- return badRequest(res, 'You cannot delete your own account.');++ return badRequest(res, 'You cannot delete your own user.');+ }+if (!isAdmin) {return unauthorized(res);}