-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(console): Group invite delete button not working (#2694)
- Loading branch information
1 parent
b3a04b8
commit b275dce
Showing
6 changed files
with
212 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
apps/console/app/routes/__layout/spuorg/$groupID/uninvite.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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), | ||
| }, | ||
| }) | ||
| } | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
platform/identity/src/jsonrpc/methods/identity-groups/deleteIdentityGroupInvitation.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters