Skip to content

The open alternative to Salesforce, designed for AI.

Offer pending invitations in the workspace picker only once the email is verified (#28383)

Charles Bochet2ec0a84dfe83
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
index 6d08adf1075..bf1e44e49cd 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
@@ -101,6 +101,7 @@ describe('AuthResolver', () => {
checkAccessForSignIn: jest.fn(),
findWorkspaceForSignInUp: jest.fn(),
formatUserDataPayload: jest.fn(),
+ joinWorkspaceIfInvited: jest.fn(),
signInUp: jest.fn(),
},
},
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
index e1b99028c1e..13cdf017afb 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
@@ -337,6 +337,8 @@ export class AuthResolver {
)) ??
(await this.userWorkspaceService.findFirstWorkspaceByUserId(user.id));
+ await this.authService.joinWorkspaceIfInvited({ user, workspace });
+
const loginToken = await this.loginTokenService.generateLoginToken(
user.email,
workspace.id,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
index 07b9f64bdd9..7ce153747e9 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -222,18 +222,41 @@ export class AuthService {
await assertUserPasswordIsValidOrThrow({ user, password: input.password });
- // Joining before the email check lets the user land in this workspace from verifyEmailAndGetLoginToken once their email is verified
+ await this.checkIsEmailVerified(user.isEmailVerified);
+
await this.userWorkspaceService.addUserToWorkspaceIfUserNotInWorkspace(
user,
workspace,
workspaceInvitation.roleId,
);
- await this.checkIsEmailVerified(user.isEmailVerified);
-
return user;
}
+ async joinWorkspaceIfInvited({
+ user,
+ workspace,
+ }: {
+ user: UserEntity;
+ workspace: WorkspaceEntity;
+ }) {
+ const invitation =
+ await this.workspaceInvitationService.getOneWorkspaceInvitation(
+ workspace.id,
+ user.email,
+ );
+
+ if (!isDefined(invitation)) {
+ return;
+ }
+
+ await this.userWorkspaceService.addUserToWorkspaceIfUserNotInWorkspace(
+ user,
+ workspace,
+ castAppTokenToWorkspaceInvitationUtil(invitation).roleId,
+ );
+ }
+
async checkIsEmailVerified(isEmailVerified: boolean) {
const isEmailVerificationRequired = this.twentyConfigService.get(
'IS_EMAIL_VERIFICATION_REQUIRED',
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 761624a8fb3..63b01683ea1 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -680,14 +680,24 @@ export class UserWorkspaceService {
appToken?: AppTokenEntity;
}>;
},
- user: Pick<UserEntity, 'email'>,
+ user: Pick<UserEntity, 'email' | 'isEmailVerified'>,
authProvider: AuthProviderEnum,
canAutoLoginIntoWorkspaces = true,
) {
+ const shouldHideInvitations =
+ this.twentyConfigService.get('IS_EMAIL_VERIFICATION_REQUIRED') &&
+ !user.isEmailVerified;
+
+ const availableWorkspacesForSignUpToList = shouldHideInvitations
+ ? availableWorkspaces.availableWorkspacesForSignUp.filter(
+ ({ appToken }) => !isDefined(appToken),
+ )
+ : availableWorkspaces.availableWorkspacesForSignUp;
+
const [availableWorkspacesForSignUp, availableWorkspacesForSignIn] =
await Promise.all([
Promise.all(
- availableWorkspaces.availableWorkspacesForSignUp.map(
+ availableWorkspacesForSignUpToList.map(
async ({ workspace, appToken }) => {
return {
...(await this.castWorkspaceToAvailableWorkspace(workspace)),
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/login-with-personal-invitation.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/login-with-personal-invitation.integration-spec.ts
index 16d44dfbdd4..30ae7205f12 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/login-with-personal-invitation.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/login-with-personal-invitation.integration-spec.ts
@@ -1,4 +1,4 @@
-import { randomUUID } from 'node:crypto';
+import { createHash, randomUUID } from 'node:crypto';
import { sendInvitations } from 'test/integration/graphql/suites/user-session/utils/send-invitations.util';
import { buildAppleWorkspaceOrigin } from 'test/integration/graphql/utils/build-apple-workspace-origin.util';
@@ -10,10 +10,15 @@ import {
findWorkspaceInvitationsByEmail,
} from 'test/integration/graphql/utils/seed-workspace-invitation.util';
import { signUp } from 'test/integration/graphql/utils/sign-up.util';
+import { verifyEmailAndGetLoginTokenOperationFactory } from 'test/integration/graphql/utils/verify-email-and-get-login-token-operation-factory.util';
import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { updateConfigVariable } from 'test/integration/twenty-config/utils/update-config-variable.util';
+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';
+
const PASSWORD = 'Login-with-invitation-1';
+const ONE_HOUR_IN_MS = 60 * 60 * 1000;
const signUpUser = async (email: string): Promise<string> => {
const { data } = await signUp({
@@ -34,6 +39,36 @@ const loginOnAppleWorkspace = (email: string, password: string) =>
null,
);
+const seedEmailVerificationToken = async (email: string): Promise<string> => {
+ const emailVerificationToken = randomUUID();
+
+ await testDataSource.query(
+ `INSERT INTO core."appToken" ("userId", "type", "value", "expiresAt", "context")
+ SELECT id, $2, $3, $4, $5::jsonb FROM core."user" WHERE email = $1`,
+ [
+ email,
+ AppTokenType.EmailVerificationToken,
+ createHash('sha256').update(emailVerificationToken).digest('hex'),
+ new Date(Date.now() + ONE_HOUR_IN_MS).toISOString(),
+ JSON.stringify({ email }),
+ ],
+ );
+
+ return emailVerificationToken;
+};
+
+const countAppleWorkspaceMemberships = async (email: string) => {
+ const [{ count }] = await testDataSource.query(
+ `SELECT count(*)::int AS count FROM core."userWorkspace" "userWorkspace"
+ JOIN core."user" "user" ON "user".id = "userWorkspace"."userId"
+ WHERE "user".email = $1 AND "userWorkspace"."workspaceId" = $2
+ AND "userWorkspace"."deletedAt" IS NULL`,
+ [email, SEED_APPLE_WORKSPACE_ID],
+ );
+
+ return count;
+};
+
describe('getLoginTokenFromCredentials with a personal invitation (integration)', () => {
let email: string;
let userAccessToken: string;
@@ -74,7 +109,7 @@ describe('getLoginTokenFromCredentials with a personal invitation (integration)'
expect(errors).toBeUndefined();
});
- it('joins the workspace on the right password even when the email still needs verification', async () => {
+ it('joins the workspace only once the email is verified when verification is required', async () => {
await updateConfigVariable({
input: { key: 'IS_EMAIL_VERIFICATION_REQUIRED', value: true },
});
@@ -86,16 +121,35 @@ describe('getLoginTokenFromCredentials with a personal invitation (integration)'
expect(response.body.errors[0].extensions.subCode).toBe(
'EMAIL_NOT_VERIFIED',
);
+ expect(await findWorkspaceInvitationsByEmail({ email })).toHaveLength(1);
+ expect(await countAppleWorkspaceMemberships(email)).toBe(0);
+
+ const verifyResponse = await makeMetadataApiRequest(
+ verifyEmailAndGetLoginTokenOperationFactory({
+ email,
+ emailVerificationToken: await seedEmailVerificationToken(email),
+ origin: buildAppleWorkspaceOrigin(),
+ }),
+ null,
+ );
+
+ expect(verifyResponse.body.errors).toBeUndefined();
expect(await findWorkspaceInvitationsByEmail({ email })).toHaveLength(0);
+ expect(await countAppleWorkspaceMemberships(email)).toBe(1);
+
+ const { errors } = await getAuthTokensFromLoginToken({
+ loginToken:
+ verifyResponse.body.data.verifyEmailAndGetLoginToken.loginToken.token,
+ origin: buildAppleWorkspaceOrigin(),
+ expectToFail: false,
+ });
+
+ expect(errors).toBeUndefined();
} finally {
await updateConfigVariable({
input: { key: 'IS_EMAIL_VERIFICATION_REQUIRED', value: false },
});
}
-
- const response = await loginOnAppleWorkspace(email, PASSWORD);
-
- expect(response.body.errors).toBeUndefined();
});
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/sign-up/sign-up-with-pending-invitation.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/sign-up/sign-up-with-pending-invitation.integration-spec.ts
new file mode 100644
index 00000000000..1ff3e2a677c
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/sign-up/sign-up-with-pending-invitation.integration-spec.ts
@@ -0,0 +1,130 @@
+import { randomUUID } from 'node:crypto';
+
+import { deleteUser } from 'test/integration/graphql/utils/delete-user.util';
+import { findCurrentUserAvailableWorkspacesOperationFactory } from 'test/integration/graphql/utils/find-current-user-available-workspaces-operation-factory.util';
+import {
+ deleteWorkspaceInvitationsByEmail,
+ findWorkspaceInvitationsByEmail,
+ seedWorkspaceInvitation,
+} from 'test/integration/graphql/utils/seed-workspace-invitation.util';
+import { signInOperationFactory } from 'test/integration/graphql/utils/sign-in-operation-factory.util';
+import { signUpInWorkspaceOperationFactory } from 'test/integration/graphql/utils/sign-up-in-workspace-operation-factory.util';
+import { signUp } from 'test/integration/graphql/utils/sign-up.util';
+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { updateConfigVariable } from 'test/integration/twenty-config/utils/update-config-variable.util';
+
+import { type AvailableWorkspace } from 'src/engine/core-modules/auth/dto/available-workspaces.dto';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
+const PASSWORD = 'Pending-invitation-1';
+const ONE_HOUR_IN_MS = 60 * 60 * 1000;
+
+const setEmailVerificationRequired = (value: boolean) =>
+ updateConfigVariable({
+ input: { key: 'IS_EMAIL_VERIFICATION_REQUIRED', value },
+ });
+
+const signInAvailableWorkspacesForSignUp = async (email: string) => {
+ const response = await makeMetadataApiRequest(
+ signInOperationFactory({ email, password: PASSWORD }),
+ undefined,
+ );
+
+ expect(response.body.errors).toBeUndefined();
+
+ return response.body.data.signIn.availableWorkspaces
+ .availableWorkspacesForSignUp;
+};
+
+describe('signUp with a pending personal invitation (integration)', () => {
+ let email: string;
+ let inviteToken: string;
+ let accessToken: string;
+ let signUpAvailableWorkspacesForSignUp: AvailableWorkspace[];
+
+ beforeEach(async () => {
+ email = `pending-invite-${randomUUID()}@example.com`;
+ inviteToken = `pending-invite-token-${randomUUID()}`;
+
+ await seedWorkspaceInvitation({
+ email,
+ value: inviteToken,
+ expiresAt: new Date(Date.now() + ONE_HOUR_IN_MS),
+ });
+
+ const { data } = await signUp({
+ input: { email, password: PASSWORD },
+ expectToFail: false,
+ });
+
+ accessToken = data.signUp.tokens.accessOrWorkspaceAgnosticToken.token;
+ signUpAvailableWorkspacesForSignUp =
+ data.signUp.availableWorkspaces.availableWorkspacesForSignUp;
+ });
+
+ afterEach(async () => {
+ await deleteUser({ accessToken, expectToFail: false });
+ await deleteWorkspaceInvitationsByEmail({ email });
+ });
+
+ describe('when email verification is required', () => {
+ beforeAll(() => setEmailVerificationRequired(true));
+
+ afterAll(() => setEmailVerificationRequired(false));
+
+ it('does not list the invitation while the email is unverified', async () => {
+ expect(signUpAvailableWorkspacesForSignUp).toEqual([]);
+
+ const currentUserResponse = await makeMetadataApiRequest(
+ findCurrentUserAvailableWorkspacesOperationFactory(),
+ accessToken,
+ );
+
+ expect(currentUserResponse.body.errors).toBeUndefined();
+ expect(
+ currentUserResponse.body.data.currentUser.availableWorkspaces
+ .availableWorkspacesForSignUp,
+ ).toEqual([]);
+ });
+
+ it('lists the invitation once the email is verified', async () => {
+ await testDataSource.query(
+ 'UPDATE core."user" SET "isEmailVerified" = true WHERE email = $1',
+ [email],
+ );
+
+ expect(await signInAvailableWorkspacesForSignUp(email)).toEqual([
+ { id: SEED_APPLE_WORKSPACE_ID, personalInviteToken: inviteToken },
+ ]);
+ });
+
+ it('still joins the workspace through the invitation link while unverified', async () => {
+ const response = await makeMetadataApiRequest(
+ signUpInWorkspaceOperationFactory({
+ email,
+ password: PASSWORD,
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ workspacePersonalInviteToken: inviteToken,
+ }),
+ undefined,
+ );
+
+ expect(response.body.errors).toBeUndefined();
+ expect(response.body.data.signUpInWorkspace.workspace.id).toBe(
+ SEED_APPLE_WORKSPACE_ID,
+ );
+ expect(await findWorkspaceInvitationsByEmail({ email })).toHaveLength(0);
+ });
+ });
+
+ describe('when email verification is not required', () => {
+ it('lists the invitation for an unverified email', async () => {
+ expect(signUpAvailableWorkspacesForSignUp).toEqual([
+ expect.objectContaining({
+ id: SEED_APPLE_WORKSPACE_ID,
+ personalInviteToken: inviteToken,
+ }),
+ ]);
+ });
+ });
+});
diff --git a/packages/twenty-server/test/integration/graphql/utils/find-current-user-available-workspaces-operation-factory.util.ts b/packages/twenty-server/test/integration/graphql/utils/find-current-user-available-workspaces-operation-factory.util.ts
new file mode 100644
index 00000000000..47e2ac1f9ab
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/utils/find-current-user-available-workspaces-operation-factory.util.ts
@@ -0,0 +1,16 @@
+import gql from 'graphql-tag';
+
+export const findCurrentUserAvailableWorkspacesOperationFactory = () => ({
+ query: gql`
+ query CurrentUserAvailableWorkspaces {
+ currentUser {
+ availableWorkspaces {
+ availableWorkspacesForSignUp {
+ id
+ personalInviteToken
+ }
+ }
+ }
+ }
+ `,
+});
diff --git a/packages/twenty-server/test/integration/graphql/utils/sign-in-operation-factory.util.ts b/packages/twenty-server/test/integration/graphql/utils/sign-in-operation-factory.util.ts
new file mode 100644
index 00000000000..9d0efd13f32
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/utils/sign-in-operation-factory.util.ts
@@ -0,0 +1,23 @@
+import gql from 'graphql-tag';
+
+export const signInOperationFactory = ({
+ email,
+ password,
+}: {
+ email: string;
+ password: string;
+}) => ({
+ query: gql`
+ mutation SignIn($email: String!, $password: String!) {
+ signIn(email: $email, password: $password) {
+ availableWorkspaces {
+ availableWorkspacesForSignUp {
+ id
+ personalInviteToken
+ }
+ }
+ }
+ }
+ `,
+ variables: { email, password },
+});
diff --git a/packages/twenty-server/test/integration/graphql/utils/sign-up.util.ts b/packages/twenty-server/test/integration/graphql/utils/sign-up.util.ts
index 405ee246c0b..ae19cc59de9 100644
--- a/packages/twenty-server/test/integration/graphql/utils/sign-up.util.ts
+++ b/packages/twenty-server/test/integration/graphql/utils/sign-up.util.ts
@@ -49,6 +49,7 @@ export const signUp = async ({
id
displayName
logo
+ personalInviteToken
workspaceUrls {
customUrl
subdomainUrl
diff --git a/packages/twenty-server/test/integration/graphql/utils/verify-email-and-get-login-token-operation-factory.util.ts b/packages/twenty-server/test/integration/graphql/utils/verify-email-and-get-login-token-operation-factory.util.ts
new file mode 100644
index 00000000000..194e6334d4d
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/utils/verify-email-and-get-login-token-operation-factory.util.ts
@@ -0,0 +1,30 @@
+import gql from 'graphql-tag';
+
+export const verifyEmailAndGetLoginTokenOperationFactory = ({
+ email,
+ emailVerificationToken,
+ origin,
+}: {
+ email: string;
+ emailVerificationToken: string;
+ origin: string;
+}) => ({
+ query: gql`
+ mutation VerifyEmailAndGetLoginToken(
+ $email: String!
+ $emailVerificationToken: String!
+ $origin: String!
+ ) {
+ verifyEmailAndGetLoginToken(
+ email: $email
+ emailVerificationToken: $emailVerificationToken
+ origin: $origin
+ ) {
+ loginToken {
+ token
+ }
+ }
+ }
+ `,
+ variables: { email, emailVerificationToken, origin },
+});