fixes

apps/web/src/server/api/routers/api.ts

@@ -34,9 +34,7 @@ export const apiRouter = createTRPCRouter({
     return keys;
   }),
 
-  deleteApiKey: teamProcedure
-    .input(z.object({ id: z.number() }))
-    .mutation(async ({ input }) => {
-      return deleteApiKey(input.id);
-    }),
+  deleteApiKey: apiKeyProcedure.mutation(async ({ input }) => {
+    return deleteApiKey(input.id);
+  }),
 });

apps/web/src/server/api/routers/domain.ts

@@ -4,6 +4,7 @@ import {
   createTRPCRouter,
   teamProcedure,
   protectedProcedure,
+  domainProcedure,
 } from "~/server/api/trpc";
 import { db } from "~/server/db";
 import {
@@ -27,14 +28,12 @@ export const domainRouter = createTRPCRouter({
       return createDomain(ctx.team.id, input.name, input.region);
     }),
 
-  startVerification: teamProcedure
-    .input(z.object({ id: z.number() }))
-    .mutation(async ({ ctx, input }) => {
-      await ctx.db.domain.update({
-        where: { id: input.id },
-        data: { isVerifying: true },
-      });
-    }),
+  startVerification: domainProcedure.mutation(async ({ ctx, input }) => {
+    await ctx.db.domain.update({
+      where: { id: input.id },
+      data: { isVerifying: true },
+    });
+  }),
 
   domains: teamProcedure.query(async ({ ctx }) => {
     const domains = await db.domain.findMany({
@@ -49,16 +48,13 @@ export const domainRouter = createTRPCRouter({
     return domains;
   }),
 
-  getDomain: teamProcedure
-    .input(z.object({ id: z.number() }))
-    .query(async ({ input }) => {
-      return getDomain(input.id);
-    }),
+  getDomain: domainProcedure.query(async ({ input }) => {
+    return getDomain(input.id);
+  }),
 
-  updateDomain: teamProcedure
+  updateDomain: domainProcedure
     .input(
       z.object({
-        id: z.number(),
         clickTracking: z.boolean().optional(),
         openTracking: z.boolean().optional(),
       })
@@ -70,43 +66,39 @@ export const domainRouter = createTRPCRouter({
       });
     }),
 
-  deleteDomain: teamProcedure
-    .input(z.object({ id: z.number() }))
-    .mutation(async ({ input }) => {
-      await deleteDomain(input.id);
-      return { success: true };
-    }),
+  deleteDomain: domainProcedure.mutation(async ({ input }) => {
+    await deleteDomain(input.id);
+    return { success: true };
+  }),
 
-  sendTestEmailFromDomain: teamProcedure
-    .input(z.object({ id: z.number() }))
-    .mutation(
-      async ({
-        ctx: {
-          session: { user },
-          team,
-        },
-        input,
-      }) => {
-        const domain = await db.domain.findFirst({
-          where: { id: input.id, teamId: team.id },
-        });
+  sendTestEmailFromDomain: domainProcedure.mutation(
+    async ({
+      ctx: {
+        session: { user },
+        team,
+      },
+      input,
+    }) => {
+      const domain = await db.domain.findFirst({
+        where: { id: input.id, teamId: team.id },
+      });
 
-        if (!domain) {
-          throw new Error("Domain not found");
-        }
-
-        if (!user.email) {
-          throw new Error("User email not found");
-        }
-
-        return sendEmail({
-          teamId: team.id,
-          to: user.email,
-          from: `hello@${domain.name}`,
-          subject: "Unsend test email",
-          text: "hello,\n\nUnsend is the best open source sending platform\n\ncheck out https://unsend.dev",
-          html: "<p>hello,</p><p>Unsend is the best open source sending platform<p><p>check out <a href='https://unsend.dev'>unsend.dev</a>",
-        });
+      if (!domain) {
+        throw new Error("Domain not found");
       }
-    ),
+
+      if (!user.email) {
+        throw new Error("User email not found");
+      }
+
+      return sendEmail({
+        teamId: team.id,
+        to: user.email,
+        from: `hello@${domain.name}`,
+        subject: "Unsend test email",
+        text: "hello,\n\nUnsend is the best open source sending platform\n\ncheck out https://unsend.dev",
+        html: "<p>hello,</p><p>Unsend is the best open source sending platform<p><p>check out <a href='https://unsend.dev'>unsend.dev</a>",
+      });
+    }
+  ),
 });

apps/web/src/server/api/routers/email.ts

@@ -2,7 +2,11 @@ import { EmailStatus } from "@prisma/client";
 import { format, subDays } from "date-fns";
 import { z } from "zod";
 
-import { createTRPCRouter, teamProcedure } from "~/server/api/trpc";
+import {
+  createTRPCRouter,
+  emailProcedure,
+  teamProcedure,
+} from "~/server/api/trpc";
 import { db } from "~/server/db";
 import { cancelEmail, updateEmail } from "~/server/service/email-service";
 
@@ -167,43 +171,39 @@ export const emailRouter = createTRPCRouter({
       return { emailStatusCounts, totalCount, emailDailyStatusCounts };
     }),
 
-  getEmail: teamProcedure
-    .input(z.object({ id: z.string() }))
-    .query(async ({ input }) => {
-      const email = await db.email.findUnique({
-        where: {
-          id: input.id,
-        },
-        select: {
-          emailEvents: {
-            orderBy: {
-              status: "desc",
-            },
+  getEmail: emailProcedure.query(async ({ input }) => {
+    const email = await db.email.findUnique({
+      where: {
+        id: input.id,
+      },
+      select: {
+        emailEvents: {
+          orderBy: {
+            status: "desc",
           },
-          id: true,
-          createdAt: true,
-          latestStatus: true,
-          subject: true,
-          to: true,
-          from: true,
-          domainId: true,
-          text: true,
-          html: true,
-          scheduledAt: true,
         },
-      });
+        id: true,
+        createdAt: true,
+        latestStatus: true,
+        subject: true,
+        to: true,
+        from: true,
+        domainId: true,
+        text: true,
+        html: true,
+        scheduledAt: true,
+      },
+    });
 
-      return email;
-    }),
+    return email;
+  }),
 
-  cancelEmail: teamProcedure
-    .input(z.object({ id: z.string() }))
-    .mutation(async ({ input }) => {
-      await cancelEmail(input.id);
-    }),
+  cancelEmail: emailProcedure.mutation(async ({ input }) => {
+    await cancelEmail(input.id);
+  }),
 
-  updateEmailScheduledAt: teamProcedure
-    .input(z.object({ id: z.string(), scheduledAt: z.string().datetime() }))
+  updateEmailScheduledAt: emailProcedure
+    .input(z.object({ scheduledAt: z.string().datetime() }))
     .mutation(async ({ input }) => {
       await updateEmail(input.id, { scheduledAt: input.scheduledAt });
     }),