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' of https://github.com/umami-software/umami into feat/um-171-cloud-mode-env-variable
Francis Caoa777b2916f95
diff --cc pages/api/config.tsindex 65c8aa97f,32555ec5b..54498edab--- a/pages/api/config.ts+++ b/pages/api/config.ts@@@ -16,7 -17,8 +17,8 @@@ export default async (req: NextApiRequetrackerScriptName: process.env.TRACKER_SCRIPT_NAME,updatesDisabled: !!process.env.DISABLE_UPDATES,telemetryDisabled: !!process.env.DISABLE_TELEMETRY,- adminDisabled: !!process.env.CLOUD_MODE,+ adminDisabled: !!process.env.DISABLE_ADMIN,- cloudMode: true, //!!process.env.CLOUD_MODE,++ cloudMode: process.env.CLOUD_MODE,});}diff --cc pages/api/users/index.tsindex 89d4d5643,6146682e6..64cc336ce--- a/pages/api/users/index.ts+++ b/pages/api/users/index.ts@@@ -2,10 -2,10 +2,10 @@@ import { canCreateUser, canViewUsers }import { ROLES } from 'lib/constants';import { uuid } from 'lib/crypto';import { useAuth } from 'lib/middleware';--import { NextApiRequestQueryBody } from 'lib/types';++import { NextApiRequestQueryBody, User } from 'lib/types';import { NextApiResponse } from 'next';import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';--import { createUser, getUser, getUsers, User } from 'queries';++import { createUser, getUser, getUsers } from 'queries';export interface UsersRequestBody {username: string;diff --cc queries/analytics/session/getSessions.tsindex 910efc30b,e0769b37d..aefc49ca2--- a/queries/analytics/session/getSessions.ts+++ b/queries/analytics/session/getSessions.ts@@@ -40,15 -35,12 +35,15 @@@ async function clickhouseQuery(websiteIdevice,screen,language,- country+ country,+ subdivision1,+ subdivision2,+ cityfrom event- where ${websites && websites.length > 0 ? `website_id in {websites:Array(UUID)}` : '0 = 0'}+ where website_id = {websiteId:UUID}and created_at >= {startAt:DateTime('UTC')}`,{- websites,+ websiteId,startAt,},);