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
Converted admin, auth, me and realtime routes.
Mike Cao5205551ca8ff
diff --git a/src/app/api/admin/users/route.ts b/src/app/api/admin/users/route.tsnew file mode 100644index 000000000..5ed4a8ffe--- /dev/null+++ b/src/app/api/admin/users/route.ts@@ -0,0 +1,39 @@+import { z } from 'zod';+import { parseRequest } from 'lib/request';+import { json, unauthorized } from 'lib/response';+import { pagingParams } from 'lib/schema';+import { canViewUsers } from 'lib/auth';+import { getUsers } from 'queries/prisma/user';++export async function GET(request: Request) {+ const schema = z.object({+ ...pagingParams,+ });++ const { auth, query, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ if (!(await canViewUsers(auth))) {+ return unauthorized();+ }++ const users = await getUsers(+ {+ include: {+ _count: {+ select: {+ websiteUser: {+ where: { deletedAt: null },+ },+ },+ },+ },+ },+ query,+ );++ return json(users);+}diff --git a/src/app/api/admin/websites/route.ts b/src/app/api/admin/websites/route.tsnew file mode 100644index 000000000..014ef8d55--- /dev/null+++ b/src/app/api/admin/websites/route.ts@@ -0,0 +1,87 @@+import { z } from 'zod';+import { parseRequest } from 'lib/request';+import { json, unauthorized } from 'lib/response';+import { pagingParams } from 'lib/schema';+import { canViewAllWebsites } from 'lib/auth';+import { getWebsites } from 'queries/prisma/website';+import { ROLES } from 'lib/constants';++export async function GET(request: Request) {+ const schema = z.object({+ ...pagingParams,+ });++ const { auth, query, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ if (!(await canViewAllWebsites(auth))) {+ return unauthorized();+ }++ const { userId, includeOwnedTeams, includeAllTeams } = query;++ const websites = await getWebsites(+ {+ where: {+ OR: [+ ...(userId && [{ userId }]),+ ...(userId && includeOwnedTeams+ ? [+ {+ team: {+ deletedAt: null,+ teamUser: {+ some: {+ role: ROLES.teamOwner,+ userId,+ },+ },+ },+ },+ ]+ : []),+ ...(userId && includeAllTeams+ ? [+ {+ team: {+ deletedAt: null,+ teamUser: {+ some: {+ userId,+ },+ },+ },+ },+ ]+ : []),+ ],+ },+ include: {+ user: {+ select: {+ username: true,+ id: true,+ },+ },+ team: {+ where: {+ deletedAt: null,+ },+ include: {+ teamUser: {+ where: {+ role: ROLES.teamOwner,+ },+ },+ },+ },+ },+ },+ query,+ );++ return json(websites);+}diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.tsnew file mode 100644index 000000000..42d71fcf3--- /dev/null+++ b/src/app/api/auth/login/route.ts@@ -0,0 +1,44 @@+import { z } from 'zod';+import { checkPassword, createSecureToken } from 'next-basics';+import { redisEnabled } from '@umami/redis-client';+import { getUserByUsername } from 'queries';+import { json, unauthorized } from 'lib/response';+import { parseRequest } from 'lib/request';+import { saveAuth } from 'lib/auth';+import { secret } from 'lib/crypto';+import { ROLES } from 'lib/constants';++export async function POST(request: Request) {+ const schema = z.object({+ username: z.string(),+ password: z.string(),+ });++ const { body, error } = await parseRequest(request, schema, { skipAuth: true });++ if (error) {+ return error();+ }++ const { username, password } = body;++ const user = await getUserByUsername(username, { includePassword: true });++ if (!user || !checkPassword(password, user.password)) {+ return unauthorized();+ }++ if (redisEnabled) {+ const token = await saveAuth({ userId: user.id });++ return json({ token, user });+ }++ const token = createSecureToken({ userId: user.id }, secret());+ const { id, role, createdAt } = user;++ return json({+ token,+ user: { id, username, role, createdAt, isAdmin: role === ROLES.admin },+ });+}diff --git a/src/app/api/auth/logout/route.ts b/src/app/api/auth/logout/route.tsnew file mode 100644index 000000000..ce7ce7f81--- /dev/null+++ b/src/app/api/auth/logout/route.ts@@ -0,0 +1,14 @@+import { getClient, redisEnabled } from '@umami/redis-client';+import { ok } from 'lib/response';++export async function POST(request: Request) {+ if (redisEnabled) {+ const redis = getClient();++ const token = request.headers.get('authorization')?.split(' ')?.[1];++ await redis.del(token);+ }++ return ok();+}diff --git a/src/app/api/auth/sso/route.ts b/src/app/api/auth/sso/route.tsnew file mode 100644index 000000000..e06e403cd--- /dev/null+++ b/src/app/api/auth/sso/route.ts@@ -0,0 +1,18 @@+import { redisEnabled } from '@umami/redis-client';+import { json } from 'lib/response';+import { parseRequest } from 'lib/request';+import { saveAuth } from 'lib/auth';++export async function POST(request: Request) {+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }++ if (redisEnabled) {+ const token = await saveAuth({ userId: auth.user.id }, 86400);++ return json({ user: auth.user, token });+ }+}diff --git a/src/app/api/auth/verify/route.ts b/src/app/api/auth/verify/route.tsnew file mode 100644index 000000000..db62a3392--- /dev/null+++ b/src/app/api/auth/verify/route.ts@@ -0,0 +1,12 @@+import { parseRequest } from 'lib/request';+import { json } from 'lib/response';++export async function GET(request: Request) {+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }++ return json(auth.user);+}diff --git a/src/app/api/me/password/route.ts b/src/app/api/me/password/route.tsnew file mode 100644index 000000000..39af3d0e8--- /dev/null+++ b/src/app/api/me/password/route.ts@@ -0,0 +1,33 @@+import { z } from 'zod';+import { parseRequest } from 'lib/request';+import { json, badRequest } from 'lib/response';+import { getUser, updateUser } from 'queries/prisma/user';+import { checkPassword, hashPassword } from 'next-basics';++export async function POST(request: Request) {+ const schema = z.object({+ currentPassword: z.string(),+ newPassword: z.string().min(8),+ });++ const { auth, body, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const userId = auth.user.id;+ const { currentPassword, newPassword } = body;++ const user = await getUser(userId, { includePassword: true });++ if (!checkPassword(currentPassword, user.password)) {+ return badRequest('Current password is incorrect');+ }++ const password = hashPassword(newPassword);++ const updated = await updateUser(userId, { password });++ return json(updated);+}diff --git a/src/app/api/me/route.ts b/src/app/api/me/route.tsnew file mode 100644index 000000000..60a14271b--- /dev/null+++ b/src/app/api/me/route.ts@@ -0,0 +1,12 @@+import { parseRequest } from 'lib/request';+import { json } from 'lib/response';++export async function GET(request: Request) {+ const { auth, error } = await parseRequest(request);++ if (error) {+ return error();+ }++ return json(auth);+}diff --git a/src/app/api/me/teams/route.ts b/src/app/api/me/teams/route.tsnew file mode 100644index 000000000..0624e94f0--- /dev/null+++ b/src/app/api/me/teams/route.ts@@ -0,0 +1,21 @@+import { z } from 'zod';+import { pagingParams } from 'lib/schema';+import { getUserTeams } from 'queries';+import { json } from 'lib/response';+import { parseRequest } from 'lib/request';++export async function GET(request: Request) {+ const schema = z.object({+ ...pagingParams,+ });++ const { auth, query, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const teams = await getUserTeams(auth.user.id, query);++ return json(teams);+}diff --git a/src/app/api/me/websites/route.ts b/src/app/api/me/websites/route.tsnew file mode 100644index 000000000..725ca94be--- /dev/null+++ b/src/app/api/me/websites/route.ts@@ -0,0 +1,21 @@+import { z } from 'zod';+import { pagingParams } from 'lib/schema';+import { getUserWebsites } from 'queries';+import { json } from 'lib/response';+import { parseRequest } from 'lib/request';++export async function GET(request: Request) {+ const schema = z.object({+ ...pagingParams,+ });++ const { auth, query, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const websites = await getUserWebsites(auth.user.id, query);++ return json(websites);+}diff --git a/src/app/api/realtime/[websiteId]/route.ts b/src/app/api/realtime/[websiteId]/route.tsnew file mode 100644index 000000000..b575ac127--- /dev/null+++ b/src/app/api/realtime/[websiteId]/route.ts@@ -0,0 +1,30 @@+import { json, unauthorized } from 'lib/response';+import { getRealtimeData } from 'queries';+import { canViewWebsite } from 'lib/auth';+import { startOfMinute, subMinutes } from 'date-fns';+import { REALTIME_RANGE } from 'lib/constants';+import { parseRequest } from 'lib/request';++export async function GET(+ request: Request,+ { params }: { params: Promise<{ websiteId: string }> },+) {+ const { auth, query, error } = await parseRequest(request);++ if (error) {+ return error();+ }++ const { websiteId } = await params;+ const { timezone } = query;++ if (!(await canViewWebsite(auth, websiteId))) {+ return unauthorized();+ }++ const startDate = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);++ const data = await getRealtimeData(websiteId, { startDate, timezone });++ return json(data);+}diff --git a/src/app/api/users/[userId]/teams/route.ts b/src/app/api/users/[userId]/teams/route.tsindex 4eb37a61c..329e74134 100644--- a/src/app/api/users/[userId]/teams/route.ts+++ b/src/app/api/users/[userId]/teams/route.ts@@ -17,7 +17,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ userconst { userId } = await params;- if (!auth.user.isAdmin && (!userId || auth.user.id !== userId)) {+ if (auth.user.id !== userId && !auth.user.isAdmin) {return unauthorized();}diff --git a/src/lib/request.ts b/src/lib/request.tsindex 769a8f211..dc7212253 100644--- a/src/lib/request.ts+++ b/src/lib/request.ts@@ -13,7 +13,11 @@ export async function getJsonBody(request: Request) {}}-export async function parseRequest(request: Request, schema?: ZodObject<any>) {+export async function parseRequest(+ request: Request,+ schema?: ZodObject<any>,+ options?: { skipAuth: boolean },+): Promise<any> {const url = new URL(request.url);let query = Object.fromEntries(url.searchParams);let body = await getJsonBody(request);@@ -32,7 +36,7 @@ export async function parseRequest(request: Request, schema?: ZodObject<any>) {}}- const auth = !error ? await checkAuth(request) : null;+ const auth = !error && !options?.skipAuth ? await checkAuth(request) : null;if (!error && !auth) {error = () => unauthorized();diff --git a/src/lib/response.ts b/src/lib/response.tsindex 7ed0316eb..5e3b020f0 100644--- a/src/lib/response.ts+++ b/src/lib/response.ts@@ -12,14 +12,18 @@ export function badRequest(message?: any) {return Response.json({ error: 'Bad request', message }, { status: 400 });}-export function notFound(message?: any) {- return Response.json({ error: 'Not found', message, status: 404 });-}-export function unauthorized(message?: any) {return Response.json({ error: 'Unauthorized', message }, { status: 401 });}+export function forbidden(message?: any) {+ return Response.json({ error: 'Forbidden', message, status: 403 });+}++export function notFound(message?: any) {+ return Response.json({ error: 'Not found', message, status: 404 });+}+export function serverError(error?: any) {return Response.json({ error: 'Server error', message: serializeError(error), status: 500 });}diff --git a/src/pages/api/admin/users.ts b/src/pages/api/admin/_users.tssimilarity index 100%rename from src/pages/api/admin/users.tsrename to src/pages/api/admin/_users.tsdiff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/_websites.tssimilarity index 100%rename from src/pages/api/admin/websites.tsrename to src/pages/api/admin/_websites.tsdiff --git a/src/pages/api/auth/login.ts b/src/pages/api/auth/_login.tssimilarity index 100%rename from src/pages/api/auth/login.tsrename to src/pages/api/auth/_login.tsdiff --git a/src/pages/api/auth/logout.ts b/src/pages/api/auth/_logout.tssimilarity index 100%rename from src/pages/api/auth/logout.tsrename to src/pages/api/auth/_logout.tsdiff --git a/src/pages/api/auth/sso.ts b/src/pages/api/auth/_sso.tssimilarity index 100%rename from src/pages/api/auth/sso.tsrename to src/pages/api/auth/_sso.tsdiff --git a/src/pages/api/auth/verify.ts b/src/pages/api/auth/_verify.tssimilarity index 100%rename from src/pages/api/auth/verify.tsrename to src/pages/api/auth/_verify.tsdiff --git a/src/pages/api/me/index.ts b/src/pages/api/me/_index.tssimilarity index 100%rename from src/pages/api/me/index.tsrename to src/pages/api/me/_index.tsdiff --git a/src/pages/api/me/password.ts b/src/pages/api/me/_password.tssimilarity index 100%rename from src/pages/api/me/password.tsrename to src/pages/api/me/_password.tsdiff --git a/src/pages/api/me/teams.ts b/src/pages/api/me/_teams.tssimilarity index 100%rename from src/pages/api/me/teams.tsrename to src/pages/api/me/_teams.tsdiff --git a/src/pages/api/me/websites.ts b/src/pages/api/me/_websites.tssimilarity index 100%rename from src/pages/api/me/websites.tsrename to src/pages/api/me/_websites.tsdiff --git a/src/pages/api/realtime/[websiteId].ts b/src/pages/api/realtime/_[websiteId].tssimilarity index 100%rename from src/pages/api/realtime/[websiteId].tsrename to src/pages/api/realtime/_[websiteId].ts