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
Add userReport api
Brian Cao4df7d6a2a12d
diff --git a/lib/auth.ts b/lib/auth.tsindex 2195ad8f1..4d11a289c 100644--- a/lib/auth.ts+++ b/lib/auth.ts@@ -15,6 +15,7 @@ import { getTeamWebsite, getTeamWebsiteByTeamMemberId } from 'queries/admin/teamimport { validate } from 'uuid';import { Auth } from './types';import { loadWebsite } from './query';+import { UserReport } from '@prisma/client';const log = debug('umami:auth');@@ -135,7 +136,34 @@ export async function canDeleteWebsite({ user }: Auth, websiteId: string) {return false;}-// To-do: Implement when payments are setup.+export async function canViewUserReport(auth: Auth, userReport: UserReport) {+ if (auth.user.isAdmin) {+ return true;+ }++ if ((auth.user.id = userReport.userId)) {+ return true;+ }++ if (await canViewWebsite(auth, userReport.websiteId)) {+ return true;+ }++ return false;+}++export async function canUpdateUserReport(auth: Auth, userReport: UserReport) {+ if (auth.user.isAdmin) {+ return true;+ }++ if ((auth.user.id = userReport.userId)) {+ return true;+ }++ return false;+}+export async function canCreateTeam({ user }: Auth) {if (user.isAdmin) {return true;@@ -144,7 +172,6 @@ export async function canCreateTeam({ user }: Auth) {return !!user;}-// To-do: Implement when payments are setup.export async function canViewTeam({ user }: Auth, teamId: string) {if (user.isAdmin) {return true;diff --git a/pages/api/reports/[id].ts b/pages/api/reports/[id].tsnew file mode 100644index 000000000..42002d186--- /dev/null+++ b/pages/api/reports/[id].ts@@ -0,0 +1,60 @@+import { canUpdateUserReport, canViewUserReport } from 'lib/auth';+import { useAuth, useCors } from 'lib/middleware';+import { NextApiRequestQueryBody } from 'lib/types';+import { NextApiResponse } from 'next';+import { methodNotAllowed, ok, unauthorized } from 'next-basics';+import { getUserReportById, updateUserReport } from 'queries';++export interface UserReportRequestQuery {+ id: string;+}++export interface UserReportRequestBody {+ websiteId: string;+ reportName: string;+ templateName: string;+ parameters: string;+}++export default async (+ req: NextApiRequestQueryBody<UserReportRequestQuery, UserReportRequestBody>,+ res: NextApiResponse,+) => {+ await useCors(req, res);+ await useAuth(req, res);++ if (req.method === 'GET') {+ const { id: userReportId } = req.query;++ const data = await getUserReportById(userReportId);++ if (!(await canViewUserReport(req.auth, data))) {+ return unauthorized(res);+ }++ return ok(res, data);+ }++ if (req.method === 'POST') {+ const { id: userReportId } = req.query;++ const data = await getUserReportById(userReportId);++ if (!(await canUpdateUserReport(req.auth, data))) {+ return unauthorized(res);+ }++ const updated = await updateUserReport(+ {+ ...req.body,+ },+ {+ id: userReportId,+ },+ );++ return ok(res, updated);+ }++ return methodNotAllowed(res);+};diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.tsnew file mode 100644index 000000000..e58553554--- /dev/null+++ b/pages/api/reports/index.ts@@ -0,0 +1,43 @@+import { uuid } from 'lib/crypto';+import { useAuth, useCors } from 'lib/middleware';+import { NextApiRequestQueryBody } from 'lib/types';+import { NextApiResponse } from 'next';+import { methodNotAllowed, ok } from 'next-basics';+import { createUserReport, getUserReports } from 'queries';++export interface UserReportRequestBody {+ websiteId: string;+ reportName: string;+ templateName: string;+ parameters: string;+}++export default async (+ req: NextApiRequestQueryBody<any, UserReportRequestBody>,+ res: NextApiResponse,+) => {+ await useCors(req, res);+ await useAuth(req, res);++ const {+ user: { id: userId },+ } = req.auth;++ if (req.method === 'GET') {+ const data = await getUserReports(userId);++ return ok(res, data);+ }++ if (req.method === 'POST') {+ const data = await createUserReport({+ id: uuid(),+ userId,+ ...req.body,+ });++ return ok(res, data);+ }++ return methodNotAllowed(res);+};diff --git a/queries/admin/user.ts b/queries/admin/user.tsindex a81a76ef3..b7f452c7a 100644--- a/queries/admin/user.ts+++ b/queries/admin/user.ts@@ -210,6 +210,20 @@ export async function deleteUser(},},}),+ client.userReport.deleteMany({+ where: {+ OR: [+ {+ websiteId: {+ in: websiteIds,+ },+ },+ {+ userId,+ },+ ],+ },+ }),cloudMode? client.website.updateMany({data: {diff --git a/queries/admin/userReport.ts b/queries/admin/userReport.tsnew file mode 100644index 000000000..d31b512ed--- /dev/null+++ b/queries/admin/userReport.ts@@ -0,0 +1,37 @@+import { Prisma, UserReport } from '@prisma/client';+import prisma from 'lib/prisma';++export async function createUserReport(+ data: Prisma.UserReportUncheckedCreateInput,+): Promise<UserReport> {+ return prisma.client.userReport.create({ data });+}++export async function getUserReportById(userReportId: string): Promise<UserReport> {+ return prisma.client.userReport.findUnique({+ where: {+ id: userReportId,+ },+ });+}++export async function getUserReports(userId: string): Promise<UserReport[]> {+ return prisma.client.userReport.findMany({+ where: {+ userId,+ },+ });+}++export async function updateUserReport(+ data: Prisma.UserReportUpdateInput,+ where: Prisma.UserReportWhereUniqueInput,+): Promise<UserReport> {+ return prisma.client.userReport.update({ data, where });+}++export async function deleteUserReport(+ where: Prisma.UserReportWhereUniqueInput,+): Promise<UserReport> {+ return prisma.client.userReport.delete({ where });+}diff --git a/queries/admin/website.ts b/queries/admin/website.tsindex f5ce57397..e6d53fce8 100644--- a/queries/admin/website.ts+++ b/queries/admin/website.ts@@ -92,6 +92,11 @@ export async function deleteWebsite(websiteId,},}),+ client.userReport.deleteMany({+ where: {+ websiteId,+ },+ }),cloudMode? prisma.client.website.update({data: {diff --git a/queries/index.js b/queries/index.jsindex 5c295fff0..e565df250 100644--- a/queries/index.js+++ b/queries/index.js@@ -1,6 +1,7 @@export * from './admin/team';export * from './admin/teamUser';export * from './admin/user';+export * from './admin/userReport';export * from './admin/website';export * from './analytics/event/getEventMetrics';export * from './analytics/event/getEventUsage';