From dd3463822fe969ba15b51b78b511ea00666478d3 Mon Sep 17 00:00:00 2001
From: Kritik Jiyaviya <kritikjiyaviya07@gmail.com>
Date: Fri, 16 Feb 2024 22:26:42 +0530
Subject: [PATCH 1/2] feat: Ability to revoke an invite to an org

---
 apps/webapp/app/models/member.server.ts       | 33 ++++++++++++++++
 .../route.tsx                                 | 29 ++++++++++++--
 apps/webapp/app/routes/invite-revoke.tsx      | 39 +++++++++++++++++++
 apps/webapp/app/utils/pathBuilder.ts          |  4 ++
 4 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 apps/webapp/app/routes/invite-revoke.tsx

diff --git a/apps/webapp/app/models/member.server.ts b/apps/webapp/app/models/member.server.ts
index 716590898e4..bfb51bdf778 100644
--- a/apps/webapp/app/models/member.server.ts
+++ b/apps/webapp/app/models/member.server.ts
@@ -225,3 +225,36 @@ export async function resendInvite({ inviteId }: { inviteId: string }) {
     },
   });
 }
+
+export async function revokeInvite({
+  userId,
+  slug,
+  inviteId,
+}: {
+  userId: string;
+  slug: string;
+  inviteId: string;
+}) {
+  const org = await prisma.organization.findFirst({
+    where: { slug, members: { some: { userId } } },
+  });
+
+  if (!org) {
+    throw new Error("User does not have access to this organization");
+  }
+  const invite = await prisma.orgMemberInvite.delete({
+    where: {
+      id: inviteId,
+    },
+    select: {
+      email: true,
+      organization: true,
+    },
+  });
+
+  if (!invite) {
+    throw new Error("Invite not found");
+  }
+
+  return { email: invite.email, organization: invite.organization };
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx
index 0fd9c10a3be..f437222d290 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx
@@ -29,7 +29,12 @@ import { useUser } from "~/hooks/useUser";
 import { getTeamMembersAndInvites, removeTeamMember } from "~/models/member.server";
 import { redirectWithSuccessMessage } from "~/models/message.server";
 import { requireUserId } from "~/services/session.server";
-import { inviteTeamMemberPath, organizationTeamPath, resendInvitePath } from "~/utils/pathBuilder";
+import {
+  inviteTeamMemberPath,
+  organizationTeamPath,
+  resendInvitePath,
+  revokeInvitePath,
+} from "~/utils/pathBuilder";
 import { DateTime } from "~/components/primitives/DateTime";
 import { PageHeader, PageTitleRow, PageTitle } from "~/components/primitives/PageHeader";
 import { BreadcrumbLink } from "~/components/navigation/Breadcrumb";
@@ -155,8 +160,9 @@ export default function Page() {
                       Invite sent {<DateTime date={invite.updatedAt} />}
                     </Paragraph>
                   </div>
-                  <div className="flex grow items-center justify-end gap-4">
+                  <div className="flex grow items-center justify-end gap-x-2">
                     <ResendButton invite={invite} />
+                    <RevokeButton invite={invite} />
                   </div>
                 </li>
               ))}
@@ -280,7 +286,7 @@ function LeaveTeamModal({
 
 function ResendButton({ invite }: { invite: Invite }) {
   return (
-    <Form method="post" action={resendInvitePath()}>
+    <Form method="post" action={resendInvitePath()} className="flex">
       <input type="hidden" value={invite.id} name="inviteId" />
       <Button type="submit" variant="secondary/small">
         Resend invite
@@ -288,3 +294,20 @@ function ResendButton({ invite }: { invite: Invite }) {
     </Form>
   );
 }
+
+function RevokeButton({ invite }: { invite: Invite }) {
+  const organization = useOrganization();
+
+  return (
+    <Form method="post" action={revokeInvitePath()} className="flex">
+      <input type="hidden" value={invite.id} name="inviteId" />
+      <input type="hidden" value={organization.slug} name="slug" />
+      <Button
+        type="submit"
+        variant="danger/small"
+        LeadingIcon="trash-can"
+        leadingIconClassName="text-white"
+      />
+    </Form>
+  );
+}
diff --git a/apps/webapp/app/routes/invite-revoke.tsx b/apps/webapp/app/routes/invite-revoke.tsx
new file mode 100644
index 00000000000..b066a08ba36
--- /dev/null
+++ b/apps/webapp/app/routes/invite-revoke.tsx
@@ -0,0 +1,39 @@
+import { parse } from "@conform-to/zod";
+import { ActionFunction, json } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { revokeInvite } from "~/models/member.server";
+import { redirectWithSuccessMessage } from "~/models/message.server";
+import { requireUserId } from "~/services/session.server";
+import { organizationTeamPath } from "~/utils/pathBuilder";
+
+export const revokeSchema = z.object({
+  inviteId: z.string(),
+  slug: z.string(),
+});
+
+export const action: ActionFunction = async ({ request }) => {
+  const userId = await requireUserId(request);
+
+  const formData = await request.formData();
+  const submission = parse(formData, { schema: revokeSchema });
+
+  if (!submission.value || submission.intent !== "submit") {
+    return json(submission);
+  }
+
+  try {
+    const { email, organization } = await revokeInvite({
+      userId,
+      slug: submission.value.slug,
+      inviteId: submission.value.inviteId,
+    });
+
+    return redirectWithSuccessMessage(
+      organizationTeamPath(organization),
+      request,
+      `Invite revoked for ${email}`
+    );
+  } catch (error: any) {
+    return json({ errors: { body: error.message } }, { status: 400 });
+  }
+};
diff --git a/apps/webapp/app/utils/pathBuilder.ts b/apps/webapp/app/utils/pathBuilder.ts
index 4a2e6e216d2..54b2307c17f 100644
--- a/apps/webapp/app/utils/pathBuilder.ts
+++ b/apps/webapp/app/utils/pathBuilder.ts
@@ -106,6 +106,10 @@ export function logoutPath() {
   return `/logout`;
 }
 
+export function revokeInvitePath() {
+  return `/invite-revoke`;
+}
+
 // Org
 export function organizationPath(organization: OrgForPath) {
   return `/orgs/${organizationParam(organization)}`;

From a4c5b567a979ed62a2ff9282a68abb0039ef5727 Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Fri, 22 Mar 2024 14:23:55 +0000
Subject: [PATCH 2/2] Resolve a conflict with main

---
 .../app/routes/_app.orgs.$organizationSlug.team/route.tsx     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx
index 4934509859b..f6cd7a4fc53 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.team/route.tsx
@@ -37,10 +37,6 @@ import {
   resendInvitePath,
   revokeInvitePath,
 } from "~/utils/pathBuilder";
-import { DateTime } from "~/components/primitives/DateTime";
-import { PageHeader, PageTitleRow, PageTitle } from "~/components/primitives/PageHeader";
-import { BreadcrumbLink } from "~/components/navigation/Breadcrumb";
-import { Handle } from "~/utils/handle";
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const userId = await requireUserId(request);