fix: logs for duplicate invite

un · Aug 30, 2024 · 19c9769 · 19c9769
1 parent ab7105c
commit 19c9769
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 11 deletions.
diff --git a/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts b/apps/platform/trpc/routers/orgRouter/users/invitesRouter.ts
@@ -70,6 +70,26 @@ export const invitesRouter = router({
 
       // Insert account profile - save ID
       return db.transaction(async (db) => {
+        //check existing email invite
+        await db.query.orgInvitations
+          .findFirst({
+            where: eq(
+              orgInvitations.email,
+              notification?.notificationEmailAddress as string
+            ),
+            columns: {
+              id: true
+            }
+          })
+          .then((res: any) => {
+            if (res) {
+              throw new TRPCError({
+                code: 'UNPROCESSABLE_CONTENT',
+                message: 'Email already invited'
+              });
+            }
+          });
+
         const orgMemberProfilePublicId = typeIdGenerator('orgMemberProfile');
         const orgMemberProfileResponse = await db
           .insert(orgMemberProfiles)
@@ -227,17 +247,25 @@ export const invitesRouter = router({
         const newInvitePublicId = typeIdGenerator('orgInvitations');
         const newInviteToken = nanoIdToken();
 
-        await db.insert(orgInvitations).values({
-          publicId: newInvitePublicId,
-          orgId: orgId,
-          invitedByOrgMemberId: orgMemberId,
-          orgMemberId: +newOrgMemberResponse.insertId,
-          role: newOrgMember.role,
-          email: notification?.notificationEmailAddress ?? null,
-          inviteToken: newInviteToken,
-          invitedOrgMemberProfileId: orgMemberProfileId,
-          expiresAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000) // 7 Days from now
-        });
+        await db
+          .insert(orgInvitations)
+          .values({
+            publicId: newInvitePublicId,
+            orgId: orgId,
+            invitedByOrgMemberId: orgMemberId,
+            orgMemberId: +newOrgMemberResponse.insertId,
+            role: newOrgMember.role,
+            email: notification?.notificationEmailAddress ?? null,
+            inviteToken: newInviteToken,
+            invitedOrgMemberProfileId: orgMemberProfileId,
+            expiresAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000) // 7 Days from now
+          })
+          .catch((err) => {
+            throw new TRPCError({
+              code: 'INTERNAL_SERVER_ERROR',
+              message: 'Failed to create invite'
+            });
+          });
 
         if (notification?.notificationEmailAddress) {
           const res = await sendInviteEmail({

diff --git a/apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/invite-modal.tsx b/apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/invite-modal.tsx
@@ -83,6 +83,9 @@ export function InviteModal() {
       form.reset();
       void invalidateInvites.invalidate();
       setOpen(false);
+    },
+    onError: (error) => {
+      console.error('Error creating invite', error.message);
     }
   });