Skip to content

The open alternative to Salesforce, designed for AI.

fix(server): don't delete the invitation before resend passes its gates (#24758)

Charles Bochet922ba42e769b
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
index accfb991861..0dffbe8fa0e 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
@@ -14,6 +14,7 @@ import {
IsNull,
LessThanOrEqual,
MoreThan,
+ Not,
Raw,
Repository,
} from 'typeorm';
@@ -263,24 +264,32 @@ export class WorkspaceInvitationService {
);
}
- await this.appTokenRepository.delete(appToken.id);
-
- return this.sendInvitations(
- [appToken.context.email],
+ return this.sendInvitations({
+ emails: [appToken.context.email],
workspace,
sender,
- appToken.context.roleId,
- appToken.type === AppTokenType.OnboardingInvitationToken,
- );
+ roleId: appToken.context.roleId,
+ isOnboardingInviteRewardOverride:
+ appToken.type === AppTokenType.OnboardingInvitationToken,
+ appTokenIdToInvalidate: appToken.id,
+ });
}
- async sendInvitations(
- emails: string[],
- workspace: WorkspaceEntity,
- sender: WorkspaceMemberWorkspaceEntity,
- roleId?: string,
- isOnboardingInviteRewardOverride?: boolean,
- ): Promise<SendInvitationsDTO> {
+ async sendInvitations({
+ emails,
+ workspace,
+ sender,
+ roleId,
+ isOnboardingInviteRewardOverride,
+ appTokenIdToInvalidate,
+ }: {
+ emails: string[];
+ workspace: WorkspaceEntity;
+ sender: WorkspaceMemberWorkspaceEntity;
+ roleId?: string;
+ isOnboardingInviteRewardOverride?: boolean;
+ appTokenIdToInvalidate?: string;
+ }): Promise<SendInvitationsDTO> {
if (!workspace?.inviteHash) {
return {
success: false,
@@ -305,14 +314,19 @@ export class WorkspaceInvitationService {
})));
if (isOnboardingInviteReward) {
- await this.throwIfOnboardingInvitationLimitReached(
- workspace.id,
- emails.length,
- );
+ await this.throwIfOnboardingInvitationLimitReached({
+ workspaceId: workspace.id,
+ requestedCount: emails.length,
+ excludedAppTokenId: appTokenIdToInvalidate,
+ });
}
await this.throttleInvitationSending(workspace.id, emails);
+ if (isDefined(appTokenIdToInvalidate)) {
+ await this.appTokenRepository.delete(appTokenIdToInvalidate);
+ }
+
const invitationResults = await Promise.allSettled(
emails.map(async (email) => {
const appToken = await this.createWorkspaceInvitation(
@@ -471,10 +485,15 @@ export class WorkspaceInvitationService {
return this.appTokenRepository.save(invitationToken);
}
- private async throwIfOnboardingInvitationLimitReached(
- workspaceId: string,
- requestedCount: number,
- ) {
+ private async throwIfOnboardingInvitationLimitReached({
+ workspaceId,
+ requestedCount,
+ excludedAppTokenId,
+ }: {
+ workspaceId: string;
+ requestedCount: number;
+ excludedAppTokenId?: string;
+ }) {
const maxOnboardingInvitations = this.twentyConfigService.get(
'ONBOARDING_INVITE_TEAM_MAX_INVITES',
);
@@ -485,6 +504,9 @@ export class WorkspaceInvitationService {
type: AppTokenType.OnboardingInvitationToken,
deletedAt: IsNull(),
expiresAt: MoreThan(new Date()),
+ ...(isDefined(excludedAppTokenId)
+ ? { id: Not(excludedAppTokenId) }
+ : {}),
},
});
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
index dac3c35a0a1..82dc52a8683 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.resolver.ts
@@ -116,11 +116,11 @@ export class WorkspaceInvitationResolver {
authContext,
);
- return await this.workspaceInvitationService.sendInvitations(
- sendInviteLinkInput.emails,
+ return await this.workspaceInvitationService.sendInvitations({
+ emails: sendInviteLinkInput.emails,
workspace,
- workspaceMember,
- sendInviteLinkInput.roleId ?? undefined,
- );
+ sender: workspaceMember,
+ roleId: sendInviteLinkInput.roleId ?? undefined,
+ });
}
}
diff --git a/packages/twenty-server/test/integration/graphql/suites/resend-workspace-invitation.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/resend-workspace-invitation.integration-spec.ts
new file mode 100644
index 00000000000..11a9eb89bd0
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/suites/resend-workspace-invitation.integration-spec.ts
@@ -0,0 +1,39 @@
+import {
+ deleteWorkspaceInvitationsByEmail,
+ findWorkspaceInvitationsByEmail,
+ seedWorkspaceInvitation,
+} from 'test/integration/graphql/utils/seed-workspace-invitation.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { resendWorkspaceInvitationOperationFactory } from 'test/integration/graphql/utils/resend-workspace-invitation-operation-factory.util';
+
+const ONE_HOUR_IN_MS = 60 * 60 * 1000;
+const NON_ASSIGNABLE_ROLE_ID = '20202020-0000-4000-8000-000000000000';
+
+describe('resendWorkspaceInvitation (integration)', () => {
+ it('keeps the original invitation when the resend fails a pre-creation check', async () => {
+ const email = `resend-preserves-invitation-${Date.now()}@example.com`;
+ const value = `resend-preserves-invitation-token-${Date.now()}`;
+
+ const appTokenId = await seedWorkspaceInvitation({
+ email,
+ value,
+ expiresAt: new Date(Date.now() + ONE_HOUR_IN_MS),
+ roleId: NON_ASSIGNABLE_ROLE_ID,
+ });
+
+ try {
+ const response = await makeMetadataAPIRequest(
+ resendWorkspaceInvitationOperationFactory({ appTokenId }),
+ );
+
+ expect(response.body.errors).toBeDefined();
+
+ const remainingTokens = await findWorkspaceInvitationsByEmail({ email });
+
+ expect(remainingTokens).toHaveLength(1);
+ expect(remainingTokens[0].value).toBe(value);
+ } finally {
+ await deleteWorkspaceInvitationsByEmail({ email });
+ }
+ });
+});
diff --git a/packages/twenty-server/test/integration/graphql/utils/resend-workspace-invitation-operation-factory.util.ts b/packages/twenty-server/test/integration/graphql/utils/resend-workspace-invitation-operation-factory.util.ts
new file mode 100644
index 00000000000..71be4b5247d
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/utils/resend-workspace-invitation-operation-factory.util.ts
@@ -0,0 +1,16 @@
+import gql from 'graphql-tag';
+
+export const resendWorkspaceInvitationOperationFactory = ({
+ appTokenId,
+}: {
+ appTokenId: string;
+}) => ({
+ query: gql`
+ mutation ResendWorkspaceInvitation($appTokenId: String!) {
+ resendWorkspaceInvitation(appTokenId: $appTokenId) {
+ success
+ }
+ }
+ `,
+ variables: { appTokenId },
+});
diff --git a/packages/twenty-server/test/integration/graphql/utils/seed-workspace-invitation.util.ts b/packages/twenty-server/test/integration/graphql/utils/seed-workspace-invitation.util.ts
index 36fbebe40c0..708587c1a06 100644
--- a/packages/twenty-server/test/integration/graphql/utils/seed-workspace-invitation.util.ts
+++ b/packages/twenty-server/test/integration/graphql/utils/seed-workspace-invitation.util.ts
@@ -1,29 +1,35 @@
import { AppTokenType } from 'src/engine/core-modules/app-token/app-token.entity';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
-export const seedWorkspaceInvitation = ({
+export const seedWorkspaceInvitation = async ({
email,
value,
expiresAt,
+ roleId,
workspaceId = SEED_APPLE_WORKSPACE_ID,
}: {
email: string;
value: string;
expiresAt: Date;
+ roleId?: string;
workspaceId?: string;
-}) =>
- testDataSource.query(
+}): Promise<string> => {
+ const insertedRows = await testDataSource.query(
`INSERT INTO core."appToken" ("workspaceId", "type", "value", "expiresAt", "context")
- VALUES ($1, $2, $3, $4, $5::jsonb)`,
+ VALUES ($1, $2, $3, $4, $5::jsonb)
+ RETURNING "id"`,
[
workspaceId,
AppTokenType.InvitationToken,
value,
expiresAt.toISOString(),
- JSON.stringify({ email }),
+ JSON.stringify({ email, ...(roleId ? { roleId } : {}) }),
],
);
+ return insertedRows[0].id;
+};
+
export const findWorkspaceInvitationsByEmail = ({
email,
workspaceId = SEED_APPLE_WORKSPACE_ID,