Skip to content

The open alternative to Salesforce, designed for AI.

Respect account sync permissions in onboarding (#26594)

Raphaël Bosi388edf46a394
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
index 90f76a1bb14..4f7438b482f 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
@@ -21,6 +21,7 @@ import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/Dra
import { DragDropProvider } from '@dnd-kit/react';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { isDefined } from 'twenty-shared/utils';
import { Callout } from 'twenty-ui/components';
import { Switch } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
@@ -55,8 +56,8 @@ const StyledNoticesContainer = styled.div`
type CalendarEventComposerFieldsProps = {
composerState: ReturnType<typeof useCalendarEventComposer>;
contextRecord: EmailComposerContextRecord;
- onAddAccount: () => void;
- onReauthorize: () => void;
+ onAddAccount?: () => void;
+ onReauthorize?: () => void;
};
export const CalendarEventComposerFields = ({
@@ -309,16 +310,32 @@ export const CalendarEventComposerFields = ({
<Callout
variant="warning"
title={t`Connect a calendar account`}
- description={t`Connect Google, Microsoft or CalDAV and enable calendar sync before creating an event.`}
- action={{ label: t`Add account`, onClick: onAddAccount }}
+ description={
+ isDefined(onAddAccount)
+ ? t`Connect Google, Microsoft or CalDAV and enable calendar sync before creating an event.`
+ : t`Ask a workspace admin for the Sync Account permission to connect a calendar account.`
+ }
+ action={
+ isDefined(onAddAccount)
+ ? { label: t`Add account`, onClick: onAddAccount }
+ : undefined
+ }
/>
)}
{composerState.missingScopes.length > 0 && (
<Callout
variant="error"
title={t`Calendar access needs approval`}
- description={t`Reconnect this account to grant permission to create calendar events.`}
- action={{ label: t`Reconnect`, onClick: onReauthorize }}
+ description={
+ isDefined(onReauthorize)
+ ? t`Reconnect this account to grant permission to create calendar events.`
+ : t`Ask a workspace admin for the Sync Account permission to reconnect this account.`
+ }
+ action={
+ isDefined(onReauthorize)
+ ? { label: t`Reconnect`, onClick: onReauthorize }
+ : undefined
+ }
/>
)}
{!composerState.hasValidDateRange && (
diff --git a/packages/twenty-front/src/modules/front-components/media-session/components/__stories__/FrontComponentMediaPermissionModal.stories.tsx b/packages/twenty-front/src/modules/front-components/media-session/components/__stories__/FrontComponentMediaPermissionModal.stories.tsx
index 9f457d18c5c..5ca450d8370 100644
--- a/packages/twenty-front/src/modules/front-components/media-session/components/__stories__/FrontComponentMediaPermissionModal.stories.tsx
+++ b/packages/twenty-front/src/modules/front-components/media-session/components/__stories__/FrontComponentMediaPermissionModal.stories.tsx
@@ -89,8 +89,15 @@ export default meta;
type Story = StoryObj<typeof MediaPermissionModalStory>;
-const findDialog = (canvasElement: HTMLElement) =>
- within(canvasElement.ownerDocument.body).findByRole('dialog');
+const findDialog = async (canvasElement: HTMLElement) => {
+ const dialog = await within(canvasElement.ownerDocument.body).findByRole(
+ 'dialog',
+ );
+
+ await waitFor(() => expect(dialog).toBeVisible());
+
+ return dialog;
+};
export const GrantsWorkspaceWideAccess: Story = {
play: async ({ canvasElement }) => {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx
index af5ae2e75b6..b9095f98a09 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx
@@ -19,6 +19,8 @@ import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { mockedUserData } from '~/testing/mock-data/users';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
const STORY_PAGE_INSTANCE_ID = 'side-panel-composer-story';
const GOOGLE_ACCOUNT_ID = '20202020-9ac0-4390-9a1a-ab4d2c4e1bb7';
@@ -158,6 +160,9 @@ const SidePanelComposerStory = ({ composer }: SidePanelComposerStoryProps) => {
const meta = {
title: 'Modules/SidePanel/ComposerPages',
component: SidePanelComposerStory,
+ beforeEach: async () => {
+ await mockedApolloClient.clearStore();
+ },
parameters: {
container: { width: 480, height: 720 },
msw: {
@@ -241,6 +246,58 @@ export const CalendarEvent: Story = {
},
};
+export const CalendarEventWithoutAccounts: Story = {
+ args: { composer: 'calendar-event' },
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.query('MyConnectedAccounts', () =>
+ HttpResponse.json({ data: { myConnectedAccounts: [] } }),
+ ),
+ graphql.query('MyCalendarChannels', () =>
+ HttpResponse.json({ data: { myCalendarChannels: [] } }),
+ ),
+ ...meta.parameters.msw.handlers,
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(
+ await canvas.findByRole('button', { name: 'Add account' }),
+ ).toBeVisible();
+ expect(
+ canvas.getByText(
+ 'Connect Google, Microsoft or CalDAV and enable calendar sync before creating an event.',
+ ),
+ ).toBeVisible();
+ },
+};
+
+export const CalendarEventWithoutAccountPermission: Story = {
+ args: { composer: 'calendar-event' },
+ parameters: {
+ ...CalendarEventWithoutAccounts.parameters,
+ currentUserWorkspace: {
+ ...mockedUserData.currentUserWorkspace,
+ permissionFlags: [],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(
+ await canvas.findByText(
+ 'Ask a workspace admin for the Sync Account permission to connect a calendar account.',
+ ),
+ ).toBeVisible();
+ expect(
+ canvas.queryByRole('button', { name: 'Add account' }),
+ ).not.toBeInTheDocument();
+ },
+};
+
export const Email: Story = {
args: { composer: 'email' },
play: async ({ canvasElement }) => {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
index 2d5545381e8..c7a1d9105e9 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
@@ -1,6 +1,7 @@
import { CalendarEventComposerFields } from '@/activities/calendar/components/CalendarEventComposerFields';
import { useCalendarEventComposer } from '@/activities/calendar/hooks/useCalendarEventComposer';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
@@ -16,6 +17,7 @@ import { IconButton, useToast } from 'twenty-ui/components';
import { IconCalendarEvent, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { getOsControlSymbol } from 'twenty-ui/utilities';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
const StyledContainer = styled.div`
@@ -32,6 +34,9 @@ export const SidePanelComposeCalendarEventPage = () => {
const { closeSidePanelMenu } = useSidePanelMenu();
const navigateSettings = useNavigateSettings();
const { triggerApisOAuth } = useTriggerApisOAuth();
+ const hasConnectedAccountsPermission = useHasPermissionFlag(
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ );
const { enqueueToast } = useToast();
const composerState = useCalendarEventComposer({
@@ -88,8 +93,12 @@ export const SidePanelComposeCalendarEventPage = () => {
<CalendarEventComposerFields
composerState={composerState}
contextRecord={composeCalendarEventInitialValues.contextRecord}
- onAddAccount={handleAddAccount}
- onReauthorize={handleReauthorize}
+ onAddAccount={
+ hasConnectedAccountsPermission ? handleAddAccount : undefined
+ }
+ onReauthorize={
+ hasConnectedAccountsPermission ? handleReauthorize : undefined
+ }
/>
<SidePanelFooter
actions={[
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
index a092303e75a..2b776edd4bc 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
@@ -8,6 +8,7 @@ import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/c
import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
import { AVAILABLE_TIMEZONE_OPTIONS } from '@/settings/experience/constants/AvailableTimezoneOptions';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';
@@ -23,6 +24,7 @@ import { isDefined } from 'twenty-shared/utils';
import { Callout } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/primitives/input';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
type WorkflowEditActionCreateCalendarEventProps = {
@@ -54,6 +56,9 @@ export const WorkflowEditActionCreateCalendarEvent = ({
const { closeSidePanelMenu } = useSidePanelMenu();
const { accounts: myAccounts, loading } = useMyConnectedAccounts();
const { triggerApisOAuth } = useTriggerApisOAuth();
+ const hasConnectedAccountsPermission = useHasPermissionFlag(
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ );
const workflowVisualizerWorkflowId = useAtomComponentStateValue(
workflowVisualizerWorkflowIdComponentState,
@@ -111,24 +116,33 @@ export const WorkflowEditActionCreateCalendarEvent = ({
handleFieldChange('connectedAccountId', value ?? '')
}
readonly={actionOptions.readonly}
- callToActionButton={{
- onClick: () => {
- closeSidePanelMenu();
- navigate(SettingsPath.NewAccount);
- },
- Icon: IconPlus,
- text: t`Add account`,
- }}
+ callToActionButton={
+ hasConnectedAccountsPermission
+ ? {
+ onClick: () => {
+ closeSidePanelMenu();
+ navigate(SettingsPath.NewAccount);
+ },
+ Icon: IconPlus,
+ text: t`Add account`,
+ }
+ : undefined
+ }
/>
{isDefined(missingScopes) && (
<Callout
variant={'error'}
title={t`Missing calendar permission.`}
- description={t`This account is connected, but we don't have permission to create calendar events on your behalf yet. You'll be redirected to approve this access.`}
- action={{
- label: t`Reauthorize`,
- onClick: handleReauthorize,
- }}
+ description={
+ hasConnectedAccountsPermission
+ ? t`This account is connected, but we don't have permission to create calendar events on your behalf yet. You'll be redirected to approve this access.`
+ : t`Ask a workspace admin for the Sync Account permission to reconnect this account.`
+ }
+ action={
+ hasConnectedAccountsPermission
+ ? { label: t`Reauthorize`, onClick: handleReauthorize }
+ : undefined
+ }
/>
)}
<FormTextFieldInput
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
index 26ae7bccdf6..a84a6b65e9f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
@@ -9,6 +9,7 @@ import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';
@@ -44,6 +45,7 @@ import { isStandaloneVariableString } from 'twenty-shared/workflow';
import { Callout } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
type WorkflowEditActionEmailBaseProps = {
@@ -63,6 +65,9 @@ export const WorkflowEditActionEmailBase = ({
actionOptions,
}: WorkflowEditActionEmailBaseProps) => {
const { triggerApisOAuth } = useTriggerApisOAuth();
+ const hasConnectedAccountsPermission = useHasPermissionFlag(
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ );
const workflowVisualizerWorkflowId = useAtomComponentStateValue(
workflowVisualizerWorkflowIdComponentState,
@@ -238,25 +243,34 @@ export const WorkflowEditActionEmailBase = ({
onChange={handleSenderChange}
VariablePicker={WorkflowVariablePicker}
readonly={actionOptions.readonly}
- callToActionButton={{
- onClick: () => {
- closeSidePanelMenu();
- navigate(SettingsPath.NewAccount);
- },
- Icon: IconPlus,
- text: t`Add account`,
- }}
+ callToActionButton={
+ hasConnectedAccountsPermission
+ ? {
+ onClick: () => {
+ closeSidePanelMenu();
+ navigate(SettingsPath.NewAccount);
+ },
+ Icon: IconPlus,
+ text: t`Add account`,
+ }
+ : undefined
+ }
/>
{isDefined(missingScopes) && (
<>
<Callout
variant={'error'}
title={t`Missing email draft permission.`}
- description={t`This account is connected, but we don't have permission to draft emails on your behalf yet. You'll be redirected to approve this access.`}
- action={{
- label: t`Reauthorize`,
- onClick: handleReauthorize,
- }}
+ description={
+ hasConnectedAccountsPermission
+ ? t`This account is connected, but we don't have permission to draft emails on your behalf yet. You'll be redirected to approve this access.`
+ : t`Ask a workspace admin for the Sync Account permission to reconnect this account.`
+ }
+ action={
+ hasConnectedAccountsPermission
+ ? { label: t`Reauthorize`, onClick: handleReauthorize }
+ : undefined
+ }
/>
</>
)}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionCreateCalendarEvent.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionCreateCalendarEvent.stories.tsx
new file mode 100644
index 00000000000..9f0dbcd3b24
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionCreateCalendarEvent.stories.tsx
@@ -0,0 +1,111 @@
+import { type WorkflowCreateCalendarEventAction } from '@/workflow/types/Workflow';
+import { WorkflowEditActionCreateCalendarEvent } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { HttpResponse, graphql } from 'msw';
+import { expect, fn, userEvent, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
+import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/WorkflowStepActionDrawerDecorator';
+import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
+import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
+import { mockedUserData } from '~/testing/mock-data/users';
+import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
+
+const DEFAULT_ACTION: WorkflowCreateCalendarEventAction = {
+ id: getWorkflowNodeIdMock(),
+ name: 'Create Calendar Event',
+ type: 'CREATE_CALENDAR_EVENT',
+ valid: false,
+ settings: {
+ input: {
+ connectedAccountId: '',
+ title: '',
+ startsAt: '',
+ endsAt: '',
+ isFullDay: false,
+ attendees: '',
+ sendInvitations: true,
+ addConferencing: false,
+ },
+ outputSchema: {},
+ errorHandlingOptions: {
+ retryOnFailure: { value: 0 },
+ continueOnFailure: { value: false },
+ },
+ },
+};
+
+const meta: Meta<typeof WorkflowEditActionCreateCalendarEvent> = {
+ title: 'Modules/Workflow/Actions/CreateCalendarEvent/EditAction',
+ component: WorkflowEditActionCreateCalendarEvent,
+ beforeEach: async () => {
+ await mockedApolloClient.clearStore();
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.query('MyConnectedAccounts', () =>
+ HttpResponse.json({ data: { myConnectedAccounts: [] } }),
+ ),
+ graphql.query('MyMessageChannels', () =>
+ HttpResponse.json({ data: { myMessageChannels: [] } }),
+ ),
+ graphql.query('MyCalendarChannels', () =>
+ HttpResponse.json({ data: { myCalendarChannels: [] } }),
+ ),
+ ...graphqlMocks.handlers,
+ ],
+ },
+ },
+ args: {
+ action: DEFAULT_ACTION,
+ actionOptions: { onActionUpdate: fn() },
+ },
+ decorators: [
+ WorkflowStepActionDrawerDecorator,
+ WorkflowStepDecorator,
+ ComponentDecorator,
+ ObjectMetadataItemsDecorator,
+ ToastDecorator,
+ MemoryRouterDecorator,
+ WorkspaceDecorator,
+ ],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof WorkflowEditActionCreateCalendarEvent>;
+
+export const Default: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await userEvent.click(await canvas.findByText('No Account'));
+
+ const dropdown = within(canvasElement.ownerDocument.body);
+
+ expect(await dropdown.findByText('Add account')).toBeVisible();
+ },
+};
+
+export const WithoutConnectedAccountsPermission: Story = {
+ parameters: {
+ currentUserWorkspace: {
+ ...mockedUserData.currentUserWorkspace,
+ permissionFlags: [],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await userEvent.click(await canvas.findByText('No Account'));
+
+ const dropdown = within(canvasElement.ownerDocument.body);
+
+ expect(dropdown.queryByText('Add account')).not.toBeInTheDocument();
+ },
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsx
index 70207571854..86d55ba9959 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsx
@@ -5,7 +5,7 @@ import {
import { WorkflowEditActionEmailBase } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { HttpResponse, graphql } from 'msw';
-import { expect, fn, within } from 'storybook/test';
+import { expect, fn, userEvent, within } from 'storybook/test';
import { ComponentDecorator } from 'twenty-ui/testing';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
@@ -13,6 +13,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
+import { mockedUserData } from '~/testing/mock-data/users';
import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
@@ -130,6 +131,17 @@ const DEFAULT_DRAFT_EMAIL_ACTION: WorkflowDraftEmailAction = {
},
};
+const OWN_ACCOUNT_DRAFT_EMAIL_ACTION: WorkflowDraftEmailAction = {
+ ...DEFAULT_DRAFT_EMAIL_ACTION,
+ settings: {
+ ...DEFAULT_DRAFT_EMAIL_ACTION.settings,
+ input: {
+ ...DEFAULT_DRAFT_EMAIL_ACTION.settings.input,
+ connectedAccountId: MOCK_CONNECTED_ACCOUNT_ID,
+ },
+ },
+};
+
const VARIABLE_SENDER_SEND_EMAIL_ACTION: WorkflowSendEmailAction = {
id: getWorkflowNodeIdMock(),
name: 'Send Email',
@@ -274,6 +286,42 @@ export const Configured: Story = {
const subjectInput = await canvas.findByText('Welcome to Twenty!');
expect(subjectInput).toBeVisible();
+
+ await userEvent.click(canvas.getByText('[email protected]'));
+
+ const dropdown = within(canvasElement.ownerDocument.body);
+
+ expect(await dropdown.findByText('Add account')).toBeVisible();
+ },
+};
+
+export const WithoutConnectedAccountsPermission: Story = {
+ args: {
+ action: CONFIGURED_SEND_EMAIL_ACTION,
+ actionOptions: {
+ onActionUpdate: fn(),
+ },
+ },
+ parameters: {
+ currentUserWorkspace: {
+ ...mockedUserData.currentUserWorkspace,
+ permissionFlags: [],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await userEvent.click(await canvas.findByText('[email protected]'));
+
+ const dropdown = within(canvasElement.ownerDocument.body);
+ const accountAlias = await dropdown.findByText('[email protected]');
+
+ expect(accountAlias).toBeVisible();
+ expect(dropdown.queryByText('Add account')).not.toBeInTheDocument();
+
+ await userEvent.click(accountAlias);
+
+ expect(await canvas.findByText('[email protected]')).toBeVisible();
},
};
@@ -295,6 +343,52 @@ export const DraftEmail: Story = {
},
};
+export const DraftEmailMissingScopes: Story = {
+ args: {
+ action: OWN_ACCOUNT_DRAFT_EMAIL_ACTION,
+ actionOptions: {
+ onActionUpdate: fn(),
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(
+ await canvas.findByText('Missing email draft permission.'),
+ ).toBeVisible();
+ expect(
+ await canvas.findByRole('button', { name: 'Reauthorize' }),
+ ).toBeVisible();
+ },
+};
+
+export const DraftEmailMissingScopesWithoutPermission: Story = {
+ args: {
+ action: OWN_ACCOUNT_DRAFT_EMAIL_ACTION,
+ actionOptions: {
+ onActionUpdate: fn(),
+ },
+ },
+ parameters: {
+ currentUserWorkspace: {
+ ...mockedUserData.currentUserWorkspace,
+ permissionFlags: [],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(
+ await canvas.findByText(
+ 'Ask a workspace admin for the Sync Account permission to reconnect this account.',
+ ),
+ ).toBeVisible();
+ expect(
+ canvas.queryByRole('button', { name: 'Reauthorize' }),
+ ).not.toBeInTheDocument();
+ },
+};
+
export const VariableSender: Story = {
args: {
action: VARIABLE_SENDER_DRAFT_EMAIL_ACTION,
diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
index 2cf997b186c..24fd0139ac0 100644
--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
@@ -1,4 +1,5 @@
import { currentUserState } from '@/auth/states/currentUserState';
+import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadedState';
import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
import { isGoogleCalendarEnabledState } from '@/client-config/states/isGoogleCalendarEnabledState';
import { isGoogleMessagingEnabledState } from '@/client-config/states/isGoogleMessagingEnabledState';
@@ -9,10 +10,12 @@ import { SyncEmailsAutoSkipEffect } from '@/onboarding/effect-components/SyncEma
import { useSkipSyncEmailOnboardingStep } from '@/onboarding/hooks/useSkipSyncEmailOnboardingStep';
import { onboardingFreeCreditsState } from '@/onboarding/states/onboardingFreeCreditsState';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useCallback, useState } from 'react';
import { AppPath, ConnectedAccountProvider } from 'twenty-shared/types';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
import { ImportContacts } from '~/pages/onboarding/ImportContacts';
import {
CalendarChannelVisibility,
@@ -24,6 +27,10 @@ export const SyncEmails = () => {
const skipSyncEmailOnboardingStep = useSkipSyncEmailOnboardingStep();
const setOnboardingFreeCredits = useSetAtomState(onboardingFreeCreditsState);
const [hasAutoSkipFailed, setHasAutoSkipFailed] = useState(false);
+ const isCurrentUserLoaded = useAtomStateValue(isCurrentUserLoadedState);
+ const hasConnectedAccountsPermission = useHasPermissionFlag(
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ );
const isGoogleMessagingEnabled = useAtomStateValue(
isGoogleMessagingEnabledState,
@@ -39,9 +46,11 @@ export const SyncEmails = () => {
);
const isGoogleProviderEnabled =
- isGoogleMessagingEnabled || isGoogleCalendarEnabled;
+ hasConnectedAccountsPermission &&
+ (isGoogleMessagingEnabled || isGoogleCalendarEnabled);
const isMicrosoftProviderEnabled =
- isMicrosoftMessagingEnabled || isMicrosoftCalendarEnabled;
+ hasConnectedAccountsPermission &&
+ (isMicrosoftMessagingEnabled || isMicrosoftCalendarEnabled);
const hasProviderEnabled =
isGoogleProviderEnabled || isMicrosoftProviderEnabled;
const isClientConfigLoaded = useAtomStateValue(
@@ -90,7 +99,7 @@ export const SyncEmails = () => {
setHasAutoSkipFailed(true);
}, []);
- if (!isClientConfigLoaded) {
+ if (!isClientConfigLoaded || !isCurrentUserLoaded) {
return null;
}
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
index f0c1248af88..7099499487a 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
@@ -1,12 +1,20 @@
import { getOperationName } from '~/utils/getOperationName';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { HttpResponse, graphql } from 'msw';
-import { expect, within } from 'storybook/test';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { AppPath } from 'twenty-shared/types';
import { currentUserState } from '@/auth/states/currentUserState';
+import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
+import { isCookieAuthActiveState } from '@/auth/states/isCookieAuthActiveState';
+import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadedState';
+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
+import { SKIP_SYNC_EMAIL_ONBOARDING_STEP } from '@/onboarding/graphql/mutations/skipSyncEmailOnboardingStep';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
-import { OnboardingStatus } from '~/generated-metadata/graphql';
+import {
+ OnboardingStatus,
+ PermissionFlagType,
+} from '~/generated-metadata/graphql';
import { GET_CURRENT_USER } from '~/modules/users/graphql/queries/getCurrentUser';
import { SyncEmails } from '~/pages/onboarding/SyncEmails';
import {
@@ -14,49 +22,98 @@ import {
type PageDecoratorArgs,
} from '~/testing/decorators/PageDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
-import {
- mockedOnboardingUserData,
- mockedUserData,
-} from '~/testing/mock-data/users';
-
-const setIsWorkspaceCreator = (isWorkspaceCreator: boolean) => {
- jotaiStore.set(currentUserState.atom, {
- ...mockedUserData,
- isWorkspaceCreator,
- });
-};
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
+import { mockedOnboardingUserData } from '~/testing/mock-data/users';
+
+const skipSyncEmailRequest = fn();
+let finishLoadingPermissions: (() => void) | undefined;
+
+const buildHandlers = ({
+ isWorkspaceCreator = true,
+ permissionFlags = [PermissionFlagType.CONNECTED_ACCOUNTS],
+ shouldFailAutoSkip = false,
+ shouldWaitForPermissions = false,
+}: {
+ isWorkspaceCreator?: boolean;
+ permissionFlags?: PermissionFlagType[];
+ shouldFailAutoSkip?: boolean;
+ shouldWaitForPermissions?: boolean;
+} = {}) => [
+ graphql.query(getOperationName(GET_CURRENT_USER) ?? '', async () => {
+ if (shouldWaitForPermissions) {
+ await new Promise<void>((resolve) => {
+ finishLoadingPermissions = resolve;
+ });
+ }
+
+ const currentUser = mockedOnboardingUserData(OnboardingStatus.SYNC_EMAIL);
+
+ return HttpResponse.json({
+ data: {
+ currentUser: {
+ ...currentUser,
+ isWorkspaceCreator,
+ currentWorkspace: {
+ ...currentUser.currentWorkspace,
+ workspaceMembersCount: isWorkspaceCreator ? 1 : 2,
+ },
+ currentUserWorkspace: {
+ ...currentUser.currentUserWorkspace,
+ permissionFlags,
+ },
+ },
+ },
+ });
+ }),
+ graphql.mutation(
+ getOperationName(SKIP_SYNC_EMAIL_ONBOARDING_STEP) ?? '',
+ ({ variables }) => {
+ skipSyncEmailRequest(variables);
+
+ if (shouldFailAutoSkip && variables.isAutoSkipped) {
+ return HttpResponse.json({
+ errors: [{ message: 'Unable to skip onboarding' }],
+ });
+ }
+
+ return HttpResponse.json({
+ data: { skipSyncEmailOnboardingStep: { success: true } },
+ });
+ },
+ ),
+ graphqlMocks.handlers,
+];
const meta: Meta<PageDecoratorArgs> = {
title: 'Pages/Onboarding/SyncEmails',
component: SyncEmails,
decorators: [PageDecorator],
args: { routePath: AppPath.SyncEmails },
+ beforeEach: async () => {
+ await mockedApolloClient.clearStore();
+ jotaiStore.set(isCookieAuthActiveState.atom, true);
+ jotaiStore.set(isCurrentUserLoadedState.atom, false);
+ jotaiStore.set(currentUserWorkspaceState.atom, null);
+ skipSyncEmailRequest.mockClear();
+ finishLoadingPermissions = undefined;
+
+ return () => finishLoadingPermissions?.();
+ },
+ afterEach: () => {
+ jotaiStore.set(isCookieAuthActiveState.atom, false);
+ },
parameters: {
msw: {
- handlers: [
- graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
- return HttpResponse.json({
- data: {
- currentUser: mockedOnboardingUserData(
- OnboardingStatus.SYNC_EMAIL,
- ),
- },
- });
- }),
- graphqlMocks.handlers,
- ],
+ handlers: buildHandlers(),
},
},
};
export default meta;
-export type Story = StoryObj<typeof SyncEmails>;
+type Story = StoryObj<typeof SyncEmails>;
export const Default: Story = {
- beforeEach: () => {
- setIsWorkspaceCreator(true);
- },
play: async ({ canvasElement }) => {
const canvas = within(canvasElement.ownerDocument.body);
await canvas.findByText('Import your contacts');
@@ -65,12 +122,119 @@ export const Default: Story = {
};
export const InvitedUser: Story = {
- beforeEach: () => {
- setIsWorkspaceCreator(false);
+ parameters: {
+ msw: { handlers: buildHandlers({ isWorkspaceCreator: false }) },
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement.ownerDocument.body);
await canvas.findByText('Import your contacts');
+ await canvas.findByRole('button', { name: 'Continue with Google' });
+ await canvas.findByRole('button', { name: 'Continue with Microsoft' });
expect(canvas.queryByText('Earn +2')).not.toBeInTheDocument();
+ expect(jotaiStore.get(currentUserState.atom)?.onboardingStatus).toBe(
+ OnboardingStatus.SYNC_EMAIL,
+ );
+ },
+};
+
+export const WithoutConnectedAccountsPermission: Story = {
+ parameters: {
+ msw: {
+ handlers: buildHandlers({
+ isWorkspaceCreator: false,
+ permissionFlags: [],
+ }),
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await waitFor(() =>
+ expect(jotaiStore.get(currentUserState.atom)?.onboardingStatus).toBe(
+ OnboardingStatus.PROFILE_CREATION,
+ ),
+ );
+ expect(
+ canvas.queryByRole('button', { name: 'Continue with Google' }),
+ ).not.toBeInTheDocument();
+ expect(
+ canvas.queryByRole('button', { name: 'Continue with Microsoft' }),
+ ).not.toBeInTheDocument();
+ expect(
+ jotaiStore.get(currentUserState.atom)?.previousOnboardingStatus,
+ ).not.toBe(OnboardingStatus.SYNC_EMAIL);
+ expect(skipSyncEmailRequest).toHaveBeenCalledWith({ isAutoSkipped: true });
+ },
+};
+
+export const AutoSkipFailed: Story = {
+ parameters: {
+ msw: {
+ handlers: buildHandlers({
+ isWorkspaceCreator: false,
+ permissionFlags: [],
+ shouldFailAutoSkip: true,
+ }),
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+ const skipButton = await canvas.findByRole('button', { name: 'Skip' });
+
+ expect(
+ canvas.queryByRole('button', { name: 'Continue with Google' }),
+ ).not.toBeInTheDocument();
+ expect(
+ canvas.queryByRole('button', { name: 'Continue with Microsoft' }),
+ ).not.toBeInTheDocument();
+
+ await userEvent.click(skipButton);
+
+ await waitFor(() =>
+ expect(jotaiStore.get(currentUserState.atom)?.onboardingStatus).toBe(
+ OnboardingStatus.PROFILE_CREATION,
+ ),
+ );
+ expect(skipSyncEmailRequest).toHaveBeenLastCalledWith({
+ isAutoSkipped: false,
+ });
+ },
+};
+
+export const PermissionsLoading: Story = {
+ parameters: {
+ msw: {
+ handlers: buildHandlers({
+ isWorkspaceCreator: false,
+ shouldWaitForPermissions: true,
+ }),
+ },
+ },
+ beforeEach: () => {
+ jotaiStore.set(currentUserWorkspaceState.atom, {
+ permissionFlags: [],
+ objectsPermissions: [],
+ twoFactorAuthenticationMethodSummary: [],
+ isImpersonating: false,
+ });
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement.ownerDocument.body);
+
+ await waitFor(() => {
+ expect(finishLoadingPermissions).toBeDefined();
+ expect(jotaiStore.get(clientConfigApiStatusState.atom).isLoadedOnce).toBe(
+ true,
+ );
+ });
+ expect(
+ canvas.queryByRole('button', { name: 'Continue with Google' }),
+ ).not.toBeInTheDocument();
+ expect(skipSyncEmailRequest).not.toHaveBeenCalled();
+
+ finishLoadingPermissions?.();
+
+ await canvas.findByRole('button', { name: 'Continue with Google' });
+ expect(skipSyncEmailRequest).not.toHaveBeenCalled();
},
};
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
index 469b9285f14..5c6185624ad 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
@@ -17,6 +17,7 @@ import { MicrosoftAuthController } from 'src/engine/core-modules/auth/controller
import { OAuthPropagatorController } from 'src/engine/core-modules/auth/controllers/oauth-propagator.controller';
import { SsoAuthController } from 'src/engine/core-modules/auth/controllers/sso-auth.controller';
import { AuthSsoService } from 'src/engine/core-modules/auth/services/auth-sso.service';
+import { ConnectedAccountOAuthService } from 'src/engine/core-modules/auth/services/connected-account-oauth.service';
import { CreateCalendarChannelService } from 'src/engine/core-modules/auth/services/create-calendar-channel.service';
import { CreateConnectedAccountService } from 'src/engine/core-modules/auth/services/create-connected-account.service';
import { CreateMessageChannelService } from 'src/engine/core-modules/auth/services/create-message-channel.service';
@@ -167,6 +168,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
CreateMessageChannelService,
CreateCalendarChannelService,
CreateConnectedAccountService,
+ ConnectedAccountOAuthService,
CreateSsoConnectedAccountService,
UpdateConnectedAccountOnReconnectService,
TransientTokenService,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
index 5e472aff9a3..9672006628c 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts
@@ -20,6 +20,7 @@ import {
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
import { GoogleAPIsOauthExchangeCodeForTokenGuard } from 'src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard';
import { GoogleAPIsOauthRequestCodeGuard } from 'src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard';
+import { ConnectedAccountOAuthService } from 'src/engine/core-modules/auth/services/connected-account-oauth.service';
import { GoogleAPIsService } from 'src/engine/core-modules/auth/services/google-apis.service';
import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
import { APIsOAuthRequest } from 'src/engine/core-modules/auth/types/apis-oauth-request.type';
@@ -38,6 +39,7 @@ export class GoogleAPIsAuthController {
constructor(
private readonly googleAPIsService: GoogleAPIsService,
private readonly transientTokenService: TransientTokenService,
+ private readonly connectedAccountOAuthService: ConnectedAccountOAuthService,
private readonly twentyConfigService: TwentyConfigService,
private readonly onboardingService: OnboardingService,
private readonly workspaceDomainsService: WorkspaceDomainsService,
@@ -97,6 +99,11 @@ export class GoogleAPIsAuthController {
id: workspaceId,
});
+ await this.connectedAccountOAuthService.verifyUserCanConnectAccount({
+ userId,
+ workspaceId,
+ });
+
const handle = emails[0].value.toLowerCase();
const connectedAccountId =
@@ -112,12 +119,10 @@ export class GoogleAPIsAuthController {
skipMessageChannelConfiguration,
});
- if (userId) {
- await this.onboardingService.completeOnboardingConnectAccountStep({
- userId,
- workspaceId,
- });
- }
+ await this.onboardingService.completeOnboardingConnectAccountStep({
+ userId,
+ workspaceId,
+ });
if (!workspace) {
throw new AuthException(
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts
index ac2aa07bbf8..229b3cee78a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts
@@ -20,6 +20,7 @@ import {
import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
import { MicrosoftAPIsOauthExchangeCodeForTokenGuard } from 'src/engine/core-modules/auth/guards/microsoft-apis-oauth-exchange-code-for-token.guard';
import { MicrosoftAPIsOauthRequestCodeGuard } from 'src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard';
+import { ConnectedAccountOAuthService } from 'src/engine/core-modules/auth/services/connected-account-oauth.service';
import { MicrosoftAPIsService } from 'src/engine/core-modules/auth/services/microsoft-apis.service';
import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
import { APIsOAuthRequest } from 'src/engine/core-modules/auth/types/apis-oauth-request.type';
@@ -38,6 +39,7 @@ export class MicrosoftAPIsAuthController {
constructor(
private readonly microsoftAPIsService: MicrosoftAPIsService,
private readonly transientTokenService: TransientTokenService,
+ private readonly connectedAccountOAuthService: ConnectedAccountOAuthService,
private readonly twentyConfigService: TwentyConfigService,
private readonly workspaceDomainsService: WorkspaceDomainsService,
private readonly onboardingService: OnboardingService,
@@ -97,6 +99,11 @@ export class MicrosoftAPIsAuthController {
id: workspaceId,
});
+ await this.connectedAccountOAuthService.verifyUserCanConnectAccount({
+ userId,
+ workspaceId,
+ });
+
if (emails.length === 0) {
throw new AuthException(
'No email - Ask your Azure Entra Admin to add you one on top of your User Principal Name',
@@ -119,12 +126,10 @@ export class MicrosoftAPIsAuthController {
skipMessageChannelConfiguration,
});
- if (userId) {
- await this.onboardingService.completeOnboardingConnectAccountStep({
- userId,
- workspaceId,
- });
- }
+ await this.onboardingService.completeOnboardingConnectAccountStep({
+ userId,
+ workspaceId,
+ });
if (!workspace) {
throw new AuthException(
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts
index 8620b90b88a..1ee629951c3 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts
@@ -7,6 +7,7 @@ import {
AuthException,
AuthExceptionCode,
} from 'src/engine/core-modules/auth/auth.exception';
+import { ConnectedAccountOAuthService } from 'src/engine/core-modules/auth/services/connected-account-oauth.service';
import { GoogleAPIsOauthRequestCodeStrategy } from 'src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy';
import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
@@ -20,6 +21,7 @@ export class GoogleAPIsOauthRequestCodeGuard extends AuthGuard('google-apis') {
constructor(
private readonly twentyConfigService: TwentyConfigService,
private readonly transientTokenService: TransientTokenService,
+ private readonly connectedAccountOAuthService: ConnectedAccountOAuthService,
private readonly guardRedirectService: GuardRedirectService,
@InjectRepository(WorkspaceEntity)
private readonly workspaceRepository: Repository<WorkspaceEntity>,
@@ -67,6 +69,11 @@ export class GoogleAPIsOauthRequestCodeGuard extends AuthGuard('google-apis') {
);
}
+ await this.connectedAccountOAuthService.verifyUserCanConnectAccount({
+ userId,
+ workspaceId,
+ });
+
new GoogleAPIsOauthRequestCodeStrategy(this.twentyConfigService);
return (await super.canActivate(context)) as boolean;
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts
index 2be810e7fc8..2b833a40491 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts
@@ -8,6 +8,7 @@ import {
AuthException,
AuthExceptionCode,
} from 'src/engine/core-modules/auth/auth.exception';
+import { ConnectedAccountOAuthService } from 'src/engine/core-modules/auth/services/connected-account-oauth.service';
import { MicrosoftAPIsOauthRequestCodeStrategy } from 'src/engine/core-modules/auth/strategies/microsoft-apis-oauth-request-code.auth.strategy';
import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
@@ -23,6 +24,7 @@ export class MicrosoftAPIsOauthRequestCodeGuard extends AuthGuard(
constructor(
private readonly twentyConfigService: TwentyConfigService,
private readonly transientTokenService: TransientTokenService,
+ private readonly connectedAccountOAuthService: ConnectedAccountOAuthService,
private readonly guardRedirectService: GuardRedirectService,
@InjectRepository(WorkspaceEntity)
private readonly workspaceRepository: Repository<WorkspaceEntity>,
@@ -49,7 +51,7 @@ export class MicrosoftAPIsOauthRequestCodeGuard extends AuthGuard(
const request = context.switchToHttp().getRequest();
- const { workspaceId } =
+ const { workspaceId, userId } =
await this.transientTokenService.verifyTransientToken(
request.query.transientToken,
);
@@ -58,6 +60,11 @@ export class MicrosoftAPIsOauthRequestCodeGuard extends AuthGuard(
id: workspaceId,
});
+ await this.connectedAccountOAuthService.verifyUserCanConnectAccount({
+ userId,
+ workspaceId,
+ });
+
new MicrosoftAPIsOauthRequestCodeStrategy(this.twentyConfigService);
setRequestExtraParams(request, {
transientToken: request.query.transientToken,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/connected-account-oauth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/connected-account-oauth.service.ts
new file mode 100644
index 00000000000..789949c648c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/connected-account-oauth.service.ts
@@ -0,0 +1,65 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { isNonEmptyString } from '@sniptt/guards';
+import { PermissionFlagType } from 'twenty-shared/constants';
+import { isDefined } from 'twenty-shared/utils';
+import { Repository } from 'typeorm';
+
+import {
+ AuthException,
+ AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
+
+@Injectable()
+export class ConnectedAccountOAuthService {
+ constructor(
+ private readonly permissionsService: PermissionsService,
+ @InjectRepository(UserWorkspaceEntity)
+ private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
+ ) {}
+
+ async verifyUserCanConnectAccount({
+ userId,
+ workspaceId,
+ }: {
+ userId: string;
+ workspaceId: string;
+ }) {
+ if (!isNonEmptyString(userId) || !isNonEmptyString(workspaceId)) {
+ throw new AuthException(
+ 'Transient token is missing user or workspace information',
+ AuthExceptionCode.INVALID_INPUT,
+ );
+ }
+
+ const userWorkspace = await this.userWorkspaceRepository.findOneBy({
+ userId,
+ workspaceId,
+ });
+
+ if (!isDefined(userWorkspace)) {
+ throw new AuthException(
+ 'User workspace not found',
+ AuthExceptionCode.USER_WORKSPACE_NOT_FOUND,
+ );
+ }
+
+ const canConnectAccount =
+ await this.permissionsService.userHasWorkspaceSettingPermission({
+ userWorkspaceId: userWorkspace.id,
+ workspaceId,
+ setting: PermissionFlagType.CONNECTED_ACCOUNTS,
+ applicationId: undefined,
+ });
+
+ if (!canConnectAccount) {
+ throw new AuthException(
+ 'You do not have permission to connect accounts',
+ AuthExceptionCode.FORBIDDEN_EXCEPTION,
+ );
+ }
+ }
+}
diff --git a/packages/twenty-server/test/integration/graphql/suites/settings-permissions/connected-account-oauth.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/settings-permissions/connected-account-oauth.integration-spec.ts
new file mode 100644
index 00000000000..cf922c876df
--- /dev/null
+++ b/packages/twenty-server/test/integration/graphql/suites/settings-permissions/connected-account-oauth.integration-spec.ts
@@ -0,0 +1,230 @@
+import { randomUUID } from 'crypto';
+
+import request from 'supertest';
+import { setupGoogleMock } from 'test/integration/google/mocks/setup-google-mock.util';
+import { buildAppleWorkspaceOrigin } from 'test/integration/graphql/utils/build-apple-workspace-origin.util';
+import { upsertPermissionFlags } from 'test/integration/metadata/suites/role-permission-flag/utils/upsert-permission-flags.util';
+import { createOneRole } from 'test/integration/metadata/suites/role/utils/create-one-role.util';
+import { deleteOneRole } from 'test/integration/metadata/suites/role/utils/delete-one-role.util';
+import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
+import { updateWorkspaceMemberRole } from 'test/integration/metadata/suites/role/utils/update-workspace-member-role.util';
+import { setupMicrosoftMock } from 'test/integration/microsoft/mocks/setup-microsoft-mock.util';
+import { generateTransientTokenResponse } from 'test/integration/utils/generate-transient-token.util';
+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
+import { waitForAllJobsToFinish } from 'test/integration/utils/wait-for-all-jobs-to-finish.util';
+import { PermissionFlagType } from 'twenty-shared/constants';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';
+
+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { type ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
+import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+import { USER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-users.util';
+import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
+
+describe.each([
+ {
+ provider: ConnectedAccountProvider.GOOGLE,
+ path: '/auth/google-apis',
+ authorizationHostname: 'accounts.google.com',
+ setupProviderMock: setupGoogleMock,
+ },
+ {
+ provider: ConnectedAccountProvider.MICROSOFT,
+ path: '/auth/microsoft-apis',
+ authorizationHostname: 'login.microsoftonline.com',
+ setupProviderMock: setupMicrosoftMock,
+ },
+])(
+ '$provider connected account OAuth permissions (integration)',
+ ({ provider, path, authorizationHostname, setupProviderMock }) => {
+ const handle = `oauth-permission-${randomUUID()}@apple.dev`;
+ const client = request(`http://localhost:${APP_PORT}`);
+ const appleWorkspaceHostname = new URL(buildAppleWorkspaceOrigin())
+ .hostname;
+
+ setupProviderMock({ handle });
+
+ let roleId: string | undefined;
+ let originalRoleId: string | undefined;
+ let userWorkspaceId: string;
+
+ const setAccountPermission = async (isAllowed: boolean) => {
+ assertIsDefinedOrThrow(roleId);
+
+ await upsertPermissionFlags({
+ input: {
+ roleId,
+ permissionFlagKeys: isAllowed
+ ? [PermissionFlagType.CONNECTED_ACCOUNTS]
+ : [],
+ },
+ });
+ };
+
+ const generateMemberTransientToken = async () => {
+ const { data } = await generateTransientTokenResponse({
+ token: APPLE_JONY_MEMBER_ACCESS_TOKEN,
+ });
+
+ return data.generateTransientToken.transientToken.token;
+ };
+
+ const findConnectedAccount = () =>
+ getCoreRepository<ConnectedAccountEntity>(
+ ConnectedAccountEntity,
+ ).findOneBy({
+ handle,
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ provider,
+ });
+
+ const startAuthorization = async (transientToken: string) => {
+ const response = await client
+ .get(path)
+ .query({ transientToken })
+ .expect(302);
+
+ return new URL(response.headers.location);
+ };
+
+ const completeAuthorization = async (state: string) => {
+ const response = await client
+ .get(`${path}/get-access-token`)
+ .query({ code: 'mock-authorization-code', state })
+ .expect(302);
+
+ return new URL(response.headers.location);
+ };
+
+ beforeAll(async () => {
+ originalRoleId = (await findOneRoleByLabel({ label: 'Member' })).id;
+ userWorkspaceId = (
+ await getCoreRepository<UserWorkspaceEntity>(
+ UserWorkspaceEntity,
+ ).findOneByOrFail({
+ userId: USER_DATA_SEED_IDS.JONY,
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ })
+ ).id;
+
+ const { data } = await createOneRole({
+ input: {
+ label: `Account sync permissions ${randomUUID()}`,
+ canUpdateAllSettings: false,
+ canAccessAllTools: false,
+ canReadAllObjectRecords: false,
+ canUpdateAllObjectRecords: false,
+ canSoftDeleteAllObjectRecords: false,
+ canDestroyAllObjectRecords: false,
+ canBeAssignedToUsers: true,
+ },
+ });
+
+ roleId = data.createOneRole.id;
+
+ await updateWorkspaceMemberRole({
+ input: {
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ roleId,
+ },
+ });
+ });
+
+ beforeEach(async () => {
+ await setAccountPermission(false);
+ });
+
+ afterEach(async () => {
+ const connectedAccount = await findConnectedAccount();
+
+ if (!isDefined(connectedAccount)) {
+ return;
+ }
+
+ await getAppProviderByClassName<ConnectedAccountMetadataService>(
+ 'ConnectedAccountMetadataService',
+ ).delete({
+ id: connectedAccount.id,
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ });
+ await waitForAllJobsToFinish();
+ });
+
+ afterAll(async () => {
+ if (isDefined(originalRoleId)) {
+ await updateWorkspaceMemberRole({
+ input: {
+ workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
+ roleId: originalRoleId,
+ },
+ });
+ }
+
+ if (isDefined(roleId)) {
+ await deleteOneRole({ input: { idToDelete: roleId } });
+ }
+ });
+
+ it('rejects starting OAuth for a role without account syncing access', async () => {
+ const redirect = await startAuthorization(
+ await generateMemberTransientToken(),
+ );
+
+ expect(redirect.hostname).toBe(appleWorkspaceHostname);
+ expect(redirect.searchParams.get('errorMessage')).toBe(
+ 'You do not have permission to connect accounts',
+ );
+ expect(await findConnectedAccount()).toBeNull();
+ });
+
+ it('connects an account when the role grants account syncing access', async () => {
+ await setAccountPermission(true);
+
+ const authorizationUrl = await startAuthorization(
+ await generateMemberTransientToken(),
+ );
+
+ expect(authorizationUrl.hostname).toBe(authorizationHostname);
+
+ const state = authorizationUrl.searchParams.get('state');
+
+ assertIsDefinedOrThrow(state);
+
+ const redirect = await completeAuthorization(state);
+ const connectedAccount = await findConnectedAccount();
+
+ expect(redirect.searchParams.has('errorMessage')).toBe(false);
+ expect(connectedAccount).toMatchObject({
+ handle,
+ provider,
+ userWorkspaceId,
+ });
+ });
+
+ it('rejects saving an account when permission is revoked during OAuth', async () => {
+ await setAccountPermission(true);
+
+ const authorizationUrl = await startAuthorization(
+ await generateMemberTransientToken(),
+ );
+
+ expect(authorizationUrl.hostname).toBe(authorizationHostname);
+
+ const state = authorizationUrl.searchParams.get('state');
+
+ assertIsDefinedOrThrow(state);
+ await setAccountPermission(false);
+
+ const redirect = await completeAuthorization(state);
+
+ expect(redirect.hostname).toBe(appleWorkspaceHostname);
+ expect(redirect.searchParams.get('errorMessage')).toBe(
+ 'You do not have permission to connect accounts',
+ );
+ expect(await findConnectedAccount()).toBeNull();
+ });
+ },
+);