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
fix response error return type
Francis Cao8083482ba883
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 865d02cf1..6c035c862 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -364,8 +364,6 @@ importers:specifier: ^5.9.2version: 5.9.2- dist: {}-packages:'@ampproject/[email protected]':diff --git a/src/app/api/links/[linkId]/route.ts b/src/app/api/links/[linkId]/route.tsindex f0598b8b1..9ca9d74e7 100644--- a/src/app/api/links/[linkId]/route.ts+++ b/src/app/api/links/[linkId]/route.ts@@ -48,7 +48,7 @@ export async function POST(request: Request, { params }: { params: Promise<{ linreturn Response.json(result);} catch (e: any) {if (e.message.toLowerCase().includes('unique constraint') && e.message.includes('slug')) {- return badRequest('That slug is already taken.');+ return badRequest({ message: 'That slug is already taken.' });}return serverError(e);diff --git a/src/app/api/me/password/route.ts b/src/app/api/me/password/route.tsindex 69bef49b3..51812910d 100644--- a/src/app/api/me/password/route.ts+++ b/src/app/api/me/password/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { checkPassword, hashPassword } from '@/lib/auth';+import { checkPassword, hashPassword } from '@/lib/password';import { parseRequest } from '@/lib/request';import { json, badRequest } from '@/lib/response';import { getUser, updateUser } from '@/queries/prisma/user';@@ -22,7 +22,7 @@ export async function POST(request: Request) {const user = await getUser(userId, { includePassword: true });if (!checkPassword(currentPassword, user.password)) {- return badRequest('Current password is incorrect');+ return badRequest({ message: 'Current password is incorrect' });}const password = hashPassword(newPassword);diff --git a/src/app/api/pixels/[pixelId]/route.ts b/src/app/api/pixels/[pixelId]/route.tsindex 0926372a6..2503c3840 100644--- a/src/app/api/pixels/[pixelId]/route.ts+++ b/src/app/api/pixels/[pixelId]/route.ts@@ -47,7 +47,7 @@ export async function POST(request: Request, { params }: { params: Promise<{ pixreturn Response.json(pixel);} catch (e: any) {if (e.message.toLowerCase().includes('unique constraint') && e.message.includes('slug')) {- return badRequest('That slug is already taken.');+ return badRequest({ message: 'That slug is already taken.' });}return serverError(e);diff --git a/src/app/api/send/route.ts b/src/app/api/send/route.tsindex fe8afa071..9fe03ff48 100644--- a/src/app/api/send/route.ts+++ b/src/app/api/send/route.ts@@ -103,7 +103,7 @@ export async function POST(request: Request) {const website = await fetchWebsite(websiteId);if (!website) {- return badRequest('Website not found.');+ return badRequest({ message: 'Website not found.' });}}}diff --git a/src/app/api/teams/[teamId]/route.ts b/src/app/api/teams/[teamId]/route.tsindex da5e4a016..11642da13 100644--- a/src/app/api/teams/[teamId]/route.ts+++ b/src/app/api/teams/[teamId]/route.ts@@ -20,7 +20,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ teamconst team = await getTeam(teamId, { includeMembers: true });if (!team) {- return notFound('Team not found.');+ return notFound({ message: 'Team not found.' });}return json(team);@@ -41,7 +41,7 @@ export async function POST(request: Request, { params }: { params: Promise<{ teaconst { teamId } = await params;if (!(await canUpdateTeam(auth, teamId))) {- return unauthorized('You must be the owner of this team.');+ return unauthorized({ message: 'You must be the owner of this team.' });}const team = await updateTeam(teamId, body);@@ -62,7 +62,7 @@ export async function DELETE(const { teamId } = await params;if (!(await canDeleteTeam(auth, teamId))) {- return unauthorized('You must be the owner of this team.');+ return unauthorized({ message: 'You must be the owner of this team.' });}await deleteTeam(teamId);diff --git a/src/app/api/teams/[teamId]/users/[userId]/route.ts b/src/app/api/teams/[teamId]/users/[userId]/route.tsindex 71cf1bd80..00ac23835 100644--- a/src/app/api/teams/[teamId]/users/[userId]/route.ts+++ b/src/app/api/teams/[teamId]/users/[userId]/route.ts@@ -17,7 +17,7 @@ export async function GET(const { teamId, userId } = await params;if (!(await canUpdateTeam(auth, teamId))) {- return unauthorized('You must be the owner of this team.');+ return unauthorized({ message: 'You must be the owner of this team.' });}const teamUser = await getTeamUser(teamId, userId);@@ -42,13 +42,13 @@ export async function POST(const { teamId, userId } = await params;if (!(await canUpdateTeam(auth, teamId))) {- return unauthorized('You must be the owner of this team.');+ return unauthorized({ message: 'You must be the owner of this team.' });}const teamUser = await getTeamUser(teamId, userId);if (!teamUser) {- return badRequest('The User does not exists on this team.');+ return badRequest({ message: 'The User does not exists on this team.' });}const user = await updateTeamUser(teamUser.id, body);@@ -69,13 +69,13 @@ export async function DELETE(const { teamId, userId } = await params;if (!(await canDeleteTeamUser(auth, teamId, userId))) {- return unauthorized('You must be the owner of this team.');+ return unauthorized({ message: 'You must be the owner of this team.' });}const teamUser = await getTeamUser(teamId, userId);if (!teamUser) {- return badRequest('The User does not exists on this team.');+ return badRequest({ message: 'The User does not exists on this team.' });}await deleteTeamUser(teamId, userId);diff --git a/src/app/api/teams/[teamId]/users/route.ts b/src/app/api/teams/[teamId]/users/route.tsindex 295d1d7fa..58c2e191d 100644--- a/src/app/api/teams/[teamId]/users/route.ts+++ b/src/app/api/teams/[teamId]/users/route.ts@@ -20,7 +20,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ teamconst { teamId } = await params;if (!(await canViewTeam(auth, teamId))) {- return unauthorized('You must be the owner of this team.');+ return unauthorized({ message: 'You must be the owner of this team.' });}const filters = await getQueryFilters(query);@@ -71,7 +71,7 @@ export async function POST(request: Request, { params }: { params: Promise<{ teaconst teamUser = await getTeamUser(teamId, userId);if (teamUser) {- return badRequest('User is already a member of the Team.');+ return badRequest({ message: 'User is already a member of the Team.' });}const users = await createTeamUser(userId, teamId, role);diff --git a/src/app/api/teams/join/route.ts b/src/app/api/teams/join/route.tsindex 6f64d4db0..9284c0c6e 100644--- a/src/app/api/teams/join/route.ts+++ b/src/app/api/teams/join/route.ts@@ -29,13 +29,13 @@ export async function POST(request: Request) {});if (!team) {- return notFound('Team not found.');+ return notFound({ message: 'Team not found.' });}const teamUser = await getTeamUser(team.id, auth.user.id);if (teamUser) {- return badRequest('User is already a team member.');+ return badRequest({ message: 'User is already a team member.' });}const user = await createTeamUser(auth.user.id, team.id, ROLES.teamMember);diff --git a/src/app/api/users/[userId]/route.ts b/src/app/api/users/[userId]/route.tsindex 3fe7ecf42..c65a8b6f9 100644--- a/src/app/api/users/[userId]/route.ts+++ b/src/app/api/users/[userId]/route.ts@@ -2,7 +2,7 @@ import { z } from 'zod';import { canUpdateUser, canViewUser, canDeleteUser } from '@/permissions';import { getUser, getUserByUsername, updateUser, deleteUser } from '@/queries';import { json, unauthorized, badRequest, ok } from '@/lib/response';-import { hashPassword } from '@/lib/auth';+import { hashPassword } from '@/lib/password';import { parseRequest } from '@/lib/request';import { userRoleParam } from '@/lib/schema';@@ -67,7 +67,7 @@ export async function POST(request: Request, { params }: { params: Promise<{ useconst user = await getUserByUsername(username);if (user) {- return badRequest('User already exists');+ return badRequest({ message: 'User already exists' });}}@@ -93,7 +93,7 @@ export async function DELETE(}if (userId === auth.user.id) {- return badRequest('You cannot delete yourself.');+ return badRequest({ message: 'You cannot delete yourself.' });}await deleteUser(userId);diff --git a/src/app/api/users/route.ts b/src/app/api/users/route.tsindex cf6667a72..6a6a31e3f 100644--- a/src/app/api/users/route.ts+++ b/src/app/api/users/route.ts@@ -1,5 +1,5 @@import { z } from 'zod';-import { hashPassword } from '@/lib/auth';+import { hashPassword } from '@/lib/password';import { canCreateUser } from '@/permissions';import { ROLES } from '@/lib/constants';import { uuid } from '@/lib/crypto';@@ -30,7 +30,7 @@ export async function POST(request: Request) {const existingUser = await getUserByUsername(username, { showDeleted: true });if (existingUser) {- return badRequest('User already exists');+ return badRequest({ message: 'User already exists' });}const user = await createUser({diff --git a/src/app/api/websites/[websiteId]/route.ts b/src/app/api/websites/[websiteId]/route.tsindex 66dc3d0bd..da850fbd5 100644--- a/src/app/api/websites/[websiteId]/route.ts+++ b/src/app/api/websites/[websiteId]/route.ts@@ -55,7 +55,7 @@ export async function POST(return Response.json(website);} catch (e: any) {if (e.message.toLowerCase().includes('unique constraint') && e.message.includes('share_id')) {- return badRequest('That share ID is already taken.');+ return badRequest({ message: 'That share ID is already taken.' });}return serverError(e);