Fix invite flow changes

Author: myftija

apps/webapp/app/models/member.server.ts

@@ -120,17 +120,10 @@ export async function inviteMembers({
   });
 }
 
-export async function getInviteFromToken({ token, userId }: { token: string; userId: string }) {
+export async function getInviteFromToken({ token }: { token: string }) {
   return await prisma.orgMemberInvite.findFirst({
     where: {
       token,
-      organization: {
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
     },
     include: {
       organization: true,
@@ -154,19 +147,19 @@ export async function getUsersInvites({ email }: { email: string }) {
   });
 }
 
-export async function acceptInvite({ userId, inviteId }: { userId: string; inviteId: string }) {
+export async function acceptInvite({
+  user,
+  inviteId,
+}: {
+  user: { id: string; email: string };
+  inviteId: string;
+}) {
   return await prisma.$transaction(async (tx) => {
     // 1. Delete the invite and get the invite details
     const invite = await tx.orgMemberInvite.delete({
       where: {
         id: inviteId,
-        organization: {
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
+        email: user.email,
       },
       include: {
         organization: {
@@ -181,7 +174,7 @@ export async function acceptInvite({ userId, inviteId }: { userId: string; invit
     const member = await tx.orgMember.create({
       data: {
         organizationId: invite.organizationId,
-        userId,
+        userId: user.id,
         role: invite.role,
       },
     });
@@ -201,57 +194,37 @@ export async function acceptInvite({ userId, inviteId }: { userId: string; invit
     // 4. Check for other invites
     const remainingInvites = await tx.orgMemberInvite.findMany({
       where: {
-        email: invite.email,
-        organization: {
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
+        email: user.email,
       },
     });
 
     return { remainingInvites, organization: invite.organization };
   });
 }
 
-export async function declineInvite({ userId, inviteId }: { userId: string; inviteId: string }) {
+export async function declineInvite({
+  user,
+  inviteId,
+}: {
+  user: { id: string; email: string };
+  inviteId: string;
+}) {
   return await prisma.$transaction(async (tx) => {
     //1. delete invite
     const declinedInvite = await prisma.orgMemberInvite.delete({
       where: {
         id: inviteId,
-        organization: {
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
+        email: user.email,
       },
       include: {
         organization: true,
       },
     });
 
-    //2. get email
-    const user = await prisma.user.findUnique({
-      where: { id: userId },
-      select: { email: true },
-    });
-
-    //3. check for other invites
+    //2. check for other invites
     const remainingInvites = await prisma.orgMemberInvite.findMany({
       where: {
-        email: user!.email,
-        organization: {
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
+        email: user.email,
       },
     });
 
@@ -284,7 +257,7 @@ export async function revokeInvite({
   orgSlug: string;
   inviteId: string;
 }) {
-  const invite = await prisma.orgMemberInvite.delete({
+  const invite = await prisma.orgMemberInvite.findFirst({
     where: {
       id: inviteId,
       organization: {
@@ -297,6 +270,7 @@ export async function revokeInvite({
       },
     },
     select: {
+      id: true,
       email: true,
       organization: true,
     },
@@ -306,5 +280,11 @@ export async function revokeInvite({
     throw new Error("Invite not found");
   }
 
+  await prisma.orgMemberInvite.delete({
+    where: {
+      id: invite.id,
+    },
+  });
+
   return { email: invite.email, organization: invite.organization };
 }

apps/webapp/app/routes/invite-accept.tsx

@@ -24,7 +24,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
     });
   }
 
-  const invite = await getInviteFromToken({ token, userId: user.id });
+  const invite = await getInviteFromToken({ token });
   if (!invite) {
     return redirectWithErrorMessage(
       "/",

apps/webapp/app/routes/invites.tsx

@@ -1,6 +1,6 @@
 import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
-import { ActionFunction, LoaderFunctionArgs, json, redirect } from "@remix-run/node";
+import { type ActionFunction, type LoaderFunctionArgs, json, redirect } from "@remix-run/node";
 import { Form, useActionData } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
@@ -36,7 +36,7 @@ const schema = z.object({
 });
 
 export const action: ActionFunction = async ({ request }) => {
-  const userId = await requireUserId(request);
+  const user = await requireUser(request);
 
   const formData = await request.formData();
   const submission = parse(formData, { schema });
@@ -49,7 +49,7 @@ export const action: ActionFunction = async ({ request }) => {
     if (submission.intent === "accept") {
       const { remainingInvites, organization } = await acceptInvite({
         inviteId: submission.value.inviteId,
-        userId,
+        user: { id: user.id, email: user.email },
       });
 
       if (remainingInvites.length === 0) {
@@ -64,7 +64,7 @@ export const action: ActionFunction = async ({ request }) => {
     } else if (submission.intent === "decline") {
       const { remainingInvites, organization } = await declineInvite({
         inviteId: submission.value.inviteId,
-        userId,
+        user: { id: user.id, email: user.email },
       });
       if (remainingInvites.length === 0) {
         return redirectWithSuccessMessage(