Update useValidate calls.

umami-software · Sep 30, 2023 · 0d9b6e8 · 0d9b6e8
1 parent 5e3c135
commit 0d9b6e8
Show file tree

Hide file tree

Showing 37 changed files with 38 additions and 106 deletions.
diff --git a/src/pages/api/event-data/events.ts b/src/pages/api/event-data/events.ts
@@ -28,9 +28,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     const { websiteId, startAt, endAt, event } = req.query;

diff --git a/src/pages/api/event-data/fields.ts b/src/pages/api/event-data/fields.ts
@@ -28,9 +28,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     const { websiteId, startAt, endAt, field } = req.query;

diff --git a/src/pages/api/event-data/stats.ts b/src/pages/api/event-data/stats.ts
@@ -26,9 +26,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     const { websiteId, startAt, endAt } = req.query;

diff --git a/src/pages/api/me/password.ts b/src/pages/api/me/password.ts
@@ -37,9 +37,7 @@ export default async (
   }
 
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { currentPassword, newPassword } = req.body;
   const { id } = req.auth.user;

diff --git a/src/pages/api/me/teams.ts b/src/pages/api/me/teams.ts
@@ -21,9 +21,7 @@ export default async (
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     req.query.id = req.auth.user.id;

diff --git a/src/pages/api/me/websites.ts b/src/pages/api/me/websites.ts
@@ -22,9 +22,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     req.query.id = req.auth.user.id;

diff --git a/src/pages/api/realtime/[id].ts b/src/pages/api/realtime/[id].ts
@@ -23,9 +23,7 @@ export default async (
   res: NextApiResponse<RealtimeInit>,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     const { id: websiteId, startAt } = req.query;

diff --git a/src/pages/api/reports/[id].ts b/src/pages/api/reports/[id].ts
@@ -46,9 +46,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: reportId } = req.query;
   const {

diff --git a/src/pages/api/reports/funnel.ts b/src/pages/api/reports/funnel.ts
@@ -44,9 +44,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'POST') {
     const {

diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
@@ -43,9 +43,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const {
     user: { id: userId },

diff --git a/src/pages/api/reports/insights.ts b/src/pages/api/reports/insights.ts
@@ -69,9 +69,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'POST') {
     const {

diff --git a/src/pages/api/reports/retention.ts b/src/pages/api/reports/retention.ts
@@ -32,9 +32,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'POST') {
     const {

diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
@@ -80,8 +80,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
 
     const { type, payload } = req.body;
 
-    req.yup = schema;
-    await useValidate(req, res);
+    await useValidate(schema, req, res);
 
     if (await hasBlockedIp(req)) {
       return forbidden(res);

diff --git a/src/pages/api/share/[id].ts b/src/pages/api/share/[id].ts
@@ -25,8 +25,7 @@ export default async (
   req: NextApiRequestQueryBody<ShareRequestQuery>,
   res: NextApiResponse<ShareResponse>,
 ) => {
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: shareId } = req.query;
 

diff --git a/src/pages/api/teams/[id]/index.ts b/src/pages/api/teams/[id]/index.ts
@@ -35,9 +35,7 @@ export default async (
   res: NextApiResponse<Team>,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: teamId } = req.query;
 

diff --git a/src/pages/api/teams/[id]/users/[userId].ts b/src/pages/api/teams/[id]/users/[userId].ts
@@ -20,9 +20,7 @@ const schema = {
 
 export default async (req: NextApiRequestQueryBody<TeamUserRequestQuery>, res: NextApiResponse) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'DELETE') {
     const { id: teamId, userId } = req.query;

diff --git a/src/pages/api/teams/[id]/users/index.ts b/src/pages/api/teams/[id]/users/index.ts
@@ -21,8 +21,7 @@ export default async (
   res: NextApiResponse,
 ) => {
   await useAuth(req, res);
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: teamId } = req.query;
 

diff --git a/src/pages/api/teams/[id]/websites/[websiteId].ts b/src/pages/api/teams/[id]/websites/[websiteId].ts
@@ -23,9 +23,7 @@ export default async (
   res: NextApiResponse,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: teamId, websiteId } = req.query;
 

diff --git a/src/pages/api/teams/[id]/websites/index.ts b/src/pages/api/teams/[id]/websites/index.ts
@@ -32,9 +32,7 @@ export default async (
   res: NextApiResponse,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: teamId } = req.query;
 

diff --git a/src/pages/api/teams/index.ts b/src/pages/api/teams/index.ts
@@ -30,9 +30,7 @@ export default async (
   res: NextApiResponse<Team[] | Team>,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const {
     user: { id: userId },

diff --git a/src/pages/api/teams/join.ts b/src/pages/api/teams/join.ts
@@ -21,9 +21,7 @@ export default async (
   res: NextApiResponse<Team>,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'POST') {
     const { accessCode } = req.body;

diff --git a/src/pages/api/users/[id]/index.ts b/src/pages/api/users/[id]/index.ts
@@ -33,9 +33,7 @@ export default async (
   res: NextApiResponse<User>,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const {
     user: { id: userId, isAdmin },

diff --git a/src/pages/api/users/[id]/teams.ts b/src/pages/api/users/[id]/teams.ts
@@ -29,9 +29,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { user } = req.auth;
   const { id: userId } = req.query;

diff --git a/src/pages/api/users/[id]/usage.ts b/src/pages/api/users/[id]/usage.ts
@@ -36,9 +36,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { user } = req.auth;
 

diff --git a/src/pages/api/users/[id]/websites.ts b/src/pages/api/users/[id]/websites.ts
@@ -27,9 +27,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { user } = req.auth;
   const { id: userId, page, query, includeTeams, onlyTeams } = req.query;

diff --git a/src/pages/api/users/index.ts b/src/pages/api/users/index.ts
@@ -37,9 +37,7 @@ export default async (
   res: NextApiResponse<User[] | User>,
 ) => {
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     if (!(await canViewUsers(req.auth))) {

diff --git a/src/pages/api/websites/[id]/active.ts b/src/pages/api/websites/[id]/active.ts
@@ -22,9 +22,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 

diff --git a/src/pages/api/websites/[id]/daterange.ts b/src/pages/api/websites/[id]/daterange.ts
@@ -22,9 +22,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 

diff --git a/src/pages/api/websites/[id]/events.ts b/src/pages/api/websites/[id]/events.ts
@@ -34,9 +34,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId, timezone, url } = req.query;
   const { startDate, endDate, unit } = await parseDateRangeQuery(req);

diff --git a/src/pages/api/websites/[id]/index.ts b/src/pages/api/websites/[id]/index.ts
@@ -36,9 +36,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 

diff --git a/src/pages/api/websites/[id]/metrics.ts b/src/pages/api/websites/[id]/metrics.ts
@@ -54,9 +54,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const {
     id: websiteId,

diff --git a/src/pages/api/websites/[id]/pageviews.ts b/src/pages/api/websites/[id]/pageviews.ts
@@ -50,9 +50,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const {
     id: websiteId,

diff --git a/src/pages/api/websites/[id]/reports.ts b/src/pages/api/websites/[id]/reports.ts
@@ -22,9 +22,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 

diff --git a/src/pages/api/websites/[id]/reset.ts b/src/pages/api/websites/[id]/reset.ts
@@ -22,8 +22,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 

diff --git a/src/pages/api/websites/[id]/stats.ts b/src/pages/api/websites/[id]/stats.ts
@@ -50,9 +50,7 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const {
     id: websiteId,

diff --git a/src/pages/api/websites/[id]/values.ts b/src/pages/api/websites/[id]/values.ts
@@ -20,9 +20,7 @@ const schema = {
 export default async (req: NextApiRequestQueryBody<ValuesRequestQuery>, res: NextApiResponse) => {
   await useCors(req, res);
   await useAuth(req, res);
-
-  req.yup = schema;
-  await useValidate(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId, type } = req.query;