From b275dce4c284914a677100ada5a2c49560d00a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cosmin=20P=C3=A2rvulescu?=
 <Cosmin-Parvulescu@users.noreply.github.com>
Date: Tue, 19 Sep 2023 10:58:58 +0300
Subject: [PATCH] fix(console): Group invite delete button not working (#2694)

---
 .../routes/__layout/spuorg/$groupID/index.tsx | 96 ++++++++++++++++++-
 .../__layout/spuorg/$groupID/uninvite.tsx     | 70 ++++++++++++++
 .../acceptIdentityGroupMemberInvitation.ts    |  7 +-
 .../deleteIdentityGroupInvitation.ts          | 33 +++++++
 platform/identity/src/jsonrpc/router.ts       | 12 +++
 platform/identity/src/nodes/identity-group.ts |  4 +-
 6 files changed, 212 insertions(+), 10 deletions(-)
 create mode 100644 apps/console/app/routes/__layout/spuorg/$groupID/uninvite.tsx
 create mode 100644 platform/identity/src/jsonrpc/methods/identity-groups/deleteIdentityGroupInvitation.ts

diff --git a/apps/console/app/routes/__layout/spuorg/$groupID/index.tsx b/apps/console/app/routes/__layout/spuorg/$groupID/index.tsx
index 9c00cc5e5d..b6e4d94db8 100644
--- a/apps/console/app/routes/__layout/spuorg/$groupID/index.tsx
+++ b/apps/console/app/routes/__layout/spuorg/$groupID/index.tsx
@@ -356,7 +356,9 @@ const RemoveMemberModal = ({
           </section>
 
           <div className="flex justify-end items-center space-x-3">
-            <Button btnType="secondary-alt">Cancel</Button>
+            <Button btnType="secondary-alt" onClick={handleClose}>
+              Cancel
+            </Button>
             <Button type="submit" btnType="dangerous">
               Remove Member
             </Button>
@@ -367,6 +369,72 @@ const RemoveMemberModal = ({
   )
 }
 
+const RemoveInvitationModal = ({
+  groupID,
+  invitationCode,
+  userAlias,
+  isOpen,
+  handleClose,
+}: {
+  groupID: string
+  invitationCode: string
+  userAlias: string
+  isOpen: boolean
+  handleClose: () => void
+  purge?: boolean
+}) => {
+  return (
+    <Modal isOpen={isOpen} handleClose={handleClose}>
+      <div
+        className={`w-fit rounded-lg bg-white p-4
+         text-left  transition-all sm:p-5 overflow-y-auto flex items-start space-x-4`}
+      >
+        <img src={dangerVector} alt="danger" />
+
+        <Form
+          method="post"
+          action={`/spuorg/${groupID}/uninvite`}
+          onSubmit={() => {
+            handleClose()
+          }}
+        >
+          <input name="invitationCode" type="hidden" value={invitationCode} />
+
+          <div className="flex flex-row w-full items-center justify-between mb-2">
+            <Text size="lg" weight="semibold">
+              Cancel Invitation
+            </Text>
+            <div
+              className={`bg-white p-2 rounded-lg text-xl cursor-pointer
+                      hover:bg-[#F3F4F6]`}
+              onClick={() => {
+                handleClose()
+              }}
+            >
+              <HiOutlineX />
+            </div>
+          </div>
+
+          <section className="mb-4">
+            <Text size="sm" weight="normal" className="text-gray-500 my-3">
+              Are you sure you want to cancel the invitation for {userAlias}?
+            </Text>
+          </section>
+
+          <div className="flex justify-end items-center space-x-3">
+            <Button btnType="secondary-alt" onClick={handleClose}>
+              Cancel
+            </Button>
+            <Button type="submit" btnType="dangerous">
+              Cancel invitation
+            </Button>
+          </div>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+
 export default () => {
   const { apps, group, groupID, PASSPORT_URL, identityURN, invitations } =
     useOutletContext<GroupDetailsContextData>()
@@ -376,8 +444,11 @@ export default () => {
   const hydrated = useHydrated()
 
   const [selectedMemberURN, setSelectedMemberURN] = useState<IdentityURN>()
+  const [selectedInvitationCode, setSelectedInvitationCode] = useState<string>()
   const [selectedMemberAlias, setSelectedMemberAlias] = useState<string>('')
   const [removeMemberModalOpen, setRemoveMemberModalOpen] = useState(false)
+  const [removeInvitationModalOpen, setRemoveInvitationModalOpen] =
+    useState(false)
 
   const groupApps = apps.filter((a) => a.groupID === groupID)
 
@@ -403,6 +474,16 @@ export default () => {
         />
       )}
 
+      {group && selectedInvitationCode && (
+        <RemoveInvitationModal
+          isOpen={removeInvitationModalOpen}
+          handleClose={() => setRemoveInvitationModalOpen(false)}
+          groupID={groupID}
+          invitationCode={selectedInvitationCode}
+          userAlias={selectedMemberAlias}
+        />
+      )}
+
       {group && (
         <section className="-mt-4">
           <Breadcrumbs
@@ -815,8 +896,17 @@ export default () => {
                     </div>
 
                     <div className="flex flex-row items-center gap-4 p-2">
-                      <button className="p-2" disabled>
-                        <HiOutlineTrash className="w-4 h-4 text-gray-500" />
+                      <button className="p-2">
+                        <HiOutlineTrash
+                          className="w-4 h-4 text-gray-500"
+                          onClick={() => {
+                            setSelectedInvitationCode(
+                              _.last(item.val.invitationURL.split('/'))
+                            )
+                            setSelectedMemberAlias(item.val.identifier)
+                            setRemoveInvitationModalOpen(true)
+                          }}
+                        />
                       </button>
 
                       <Button
diff --git a/apps/console/app/routes/__layout/spuorg/$groupID/uninvite.tsx b/apps/console/app/routes/__layout/spuorg/$groupID/uninvite.tsx
new file mode 100644
index 0000000000..cb0cda7885
--- /dev/null
+++ b/apps/console/app/routes/__layout/spuorg/$groupID/uninvite.tsx
@@ -0,0 +1,70 @@
+import { generateTraceContextHeaders } from '@proofzero/platform-middleware/trace'
+import { getRollupReqFunctionErrorWrapper } from '@proofzero/utils/errors'
+import { redirect, type ActionFunction } from '@remix-run/cloudflare'
+import { commitFlashSession, requireJWT } from '~/utilities/session.server'
+import createCoreClient from '@proofzero/platform-clients/core'
+import { getAuthzHeaderConditionallyFromToken } from '@proofzero/utils'
+import { BadRequestError } from '@proofzero/errors'
+import {
+  type IdentityGroupURN,
+  IdentityGroupURNSpace,
+} from '@proofzero/urns/identity-group'
+import { appendToastToFlashSession } from '~/utils/toast.server'
+import { ToastType } from '@proofzero/design-system/src/atoms/toast'
+
+export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
+  async ({ request, params, context }) => {
+    const jwt = await requireJWT(request, context.env)
+    const traceHeader = generateTraceContextHeaders(context.traceSpan)
+
+    const groupID = params.groupID as string
+    const identityGroupURN = IdentityGroupURNSpace.urn(
+      groupID as string
+    ) as IdentityGroupURN
+
+    const fd = await request.formData()
+    const invitationCode = fd.get('invitationCode') as string | undefined
+    if (!invitationCode) {
+      throw new BadRequestError({
+        message: 'invitationCode is required',
+      })
+    }
+
+    const coreClient = createCoreClient(context.env.Core, {
+      ...getAuthzHeaderConditionallyFromToken(jwt),
+      ...traceHeader,
+    })
+
+    let toastSession
+    try {
+      await coreClient.identity.deleteIdentityGroupInvitation.mutate({
+        identityGroupURN,
+        invitationCode,
+      })
+
+      toastSession = await appendToastToFlashSession(
+        request,
+        {
+          message: `Succesfully removed invitation`,
+          type: ToastType.Success,
+        },
+        context.env
+      )
+    } catch (e) {
+      toastSession = await appendToastToFlashSession(
+        request,
+        {
+          message: `There was an error removing the invitation`,
+          type: ToastType.Error,
+        },
+        context.env
+      )
+    }
+
+    return redirect(`/spuorg/${groupID}`, {
+      headers: {
+        'Set-Cookie': await commitFlashSession(toastSession, context.env),
+      },
+    })
+  }
+)
diff --git a/platform/identity/src/jsonrpc/methods/identity-groups/acceptIdentityGroupMemberInvitation.ts b/platform/identity/src/jsonrpc/methods/identity-groups/acceptIdentityGroupMemberInvitation.ts
index 515f18f3b1..6a037a7c84 100644
--- a/platform/identity/src/jsonrpc/methods/identity-groups/acceptIdentityGroupMemberInvitation.ts
+++ b/platform/identity/src/jsonrpc/methods/identity-groups/acceptIdentityGroupMemberInvitation.ts
@@ -26,10 +26,7 @@ export const acceptIdentityGroupMemberInvitation = async ({
 }): Promise<void> => {
   const { identityGroupURN, invitationCode } = input
 
-  const node = await initIdentityGroupNodeByName(
-    identityGroupURN,
-    ctx.IdentityGroup
-  )
+  const node = initIdentityGroupNodeByName(identityGroupURN, ctx.IdentityGroup)
   if (!node) {
     throw new InternalServerError({
       message: 'Identity group DO not found',
@@ -62,7 +59,7 @@ export const acceptIdentityGroupMemberInvitation = async ({
     })
   }
 
-  await node.class.claimInvitation({
+  await node.class.clearInvitation({
     inviteCode: invitationCode,
   })
 
diff --git a/platform/identity/src/jsonrpc/methods/identity-groups/deleteIdentityGroupInvitation.ts b/platform/identity/src/jsonrpc/methods/identity-groups/deleteIdentityGroupInvitation.ts
new file mode 100644
index 0000000000..78869b74b1
--- /dev/null
+++ b/platform/identity/src/jsonrpc/methods/identity-groups/deleteIdentityGroupInvitation.ts
@@ -0,0 +1,33 @@
+import { z } from 'zod'
+
+import { Context } from '../../../context'
+import { IdentityGroupURNValidator } from '@proofzero/platform-middleware/inputValidators'
+import { InternalServerError } from '@proofzero/errors'
+import { initIdentityGroupNodeByName } from '../../../nodes'
+
+export const DeleteIdentityGroupInvitationInputSchema = z.object({
+  identityGroupURN: IdentityGroupURNValidator,
+  invitationCode: z.string(),
+})
+type DeleteIdentityGroupInvitationInput = z.infer<
+  typeof DeleteIdentityGroupInvitationInputSchema
+>
+
+export const deleteIdentityGroupInvitation = async ({
+  input,
+  ctx,
+}: {
+  input: DeleteIdentityGroupInvitationInput
+  ctx: Context
+}): Promise<void> => {
+  const { identityGroupURN, invitationCode } = input
+
+  const node = initIdentityGroupNodeByName(identityGroupURN, ctx.IdentityGroup)
+  if (!node) {
+    throw new InternalServerError({
+      message: 'Identity group DO not found',
+    })
+  }
+
+  await node.class.clearInvitation({ inviteCode: invitationCode })
+}
diff --git a/platform/identity/src/jsonrpc/router.ts b/platform/identity/src/jsonrpc/router.ts
index 5565b4a469..9898ed1de4 100644
--- a/platform/identity/src/jsonrpc/router.ts
+++ b/platform/identity/src/jsonrpc/router.ts
@@ -88,6 +88,10 @@ import {
   HasIdentityGroupPermissionsOutputSchema,
   hasIdentityGroupPermissions,
 } from './methods/identity-groups/hasIdentityGroupPermissions'
+import {
+  DeleteIdentityGroupInvitationInputSchema,
+  deleteIdentityGroupInvitation,
+} from './methods/identity-groups/deleteIdentityGroupInvitation'
 
 const t = initTRPC.context<Context>().create({ errorFormatter })
 
@@ -259,4 +263,12 @@ export const appRouter = t.router({
     .input(HasIdentityGroupPermissionsInputSchema)
     .output(HasIdentityGroupPermissionsOutputSchema)
     .query(hasIdentityGroupPermissions),
+  deleteIdentityGroupInvitation: t.procedure
+    .use(LogUsage)
+    .use(Analytics)
+    .use(AuthorizationTokenFromHeader)
+    .use(ValidateJWT)
+    .use(RequireIdentity)
+    .input(DeleteIdentityGroupInvitationInputSchema)
+    .mutation(deleteIdentityGroupInvitation),
 })
diff --git a/platform/identity/src/nodes/identity-group.ts b/platform/identity/src/nodes/identity-group.ts
index e1ca2525bf..0cf99d6217 100644
--- a/platform/identity/src/nodes/identity-group.ts
+++ b/platform/identity/src/nodes/identity-group.ts
@@ -22,7 +22,7 @@ export type MemberInvitation = InviteMemberInput & {
   timestamp: number
 }
 
-export type ClaimInvitationInput = {
+export type ClearInvitationInput = {
   inviteCode: string
 }
 
@@ -124,7 +124,7 @@ export default class IdentityGroup extends DOProxy {
     )
   }
 
-  async claimInvitation({ inviteCode }: ClaimInvitationInput): Promise<void> {
+  async clearInvitation({ inviteCode }: ClearInvitationInput): Promise<void> {
     const invitations =
       (await this.state.storage.get<MemberInvitation[]>('invitations')) || []