Skip to content

The open alternative to Salesforce, designed for AI.

fix: separate connected account disconnect from deletion (#26347)

neo773aa07720c3e22
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 9d1bc77cc79..ba84579d418 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -4026,6 +4026,7 @@ type Mutation {
endSubscriptionTrialPeriod: BillingEndTrialPeriod!
cancelSwitchResourceCreditPrice: BillingUpdate!
deleteConnectedAccount(id: UUID!): ConnectedAccountPublicDTO!
+ disconnectConnectedAccount(id: UUID!): ConnectedAccountPublicDTO!
updateOneApplicationVariable(key: String!, value: String!, applicationId: UUID): Boolean!
skipSyncEmailOnboardingStep(isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
completeBookCallOnboardingStep(hasBookedCall: Boolean! = false, isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 51753b70d09..69204ff5fb5 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -3443,6 +3443,7 @@ export interface Mutation {
endSubscriptionTrialPeriod: BillingEndTrialPeriod
cancelSwitchResourceCreditPrice: BillingUpdate
deleteConnectedAccount: ConnectedAccountPublicDTO
+ disconnectConnectedAccount: ConnectedAccountPublicDTO
updateOneApplicationVariable: Scalars['Boolean']
skipSyncEmailOnboardingStep: OnboardingStepSuccess
completeBookCallOnboardingStep: OnboardingStepSuccess
@@ -7285,6 +7286,7 @@ export interface MutationGenqlSelection{
endSubscriptionTrialPeriod?: BillingEndTrialPeriodGenqlSelection
cancelSwitchResourceCreditPrice?: BillingUpdateGenqlSelection
deleteConnectedAccount?: (ConnectedAccountPublicDTOGenqlSelection & { __args: {id: Scalars['UUID']} })
+ disconnectConnectedAccount?: (ConnectedAccountPublicDTOGenqlSelection & { __args: {id: Scalars['UUID']} })
updateOneApplicationVariable?: { __args: {key: Scalars['String'], value: Scalars['String'], applicationId?: (Scalars['UUID'] | null)} }
skipSyncEmailOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {isAutoSkipped: Scalars['Boolean']} })
completeBookCallOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {hasBookedCall: Scalars['Boolean'], isAutoSkipped: Scalars['Boolean']} })
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index b48a376cd46..577f6b265ba 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -9019,6 +9019,15 @@ export default {
]
}
],
+ "disconnectConnectedAccount": [
+ 193,
+ {
+ "id": [
+ 3,
+ "UUID!"
+ ]
+ }
+ ],
"updateOneApplicationVariable": [
8,
{
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 7d29923198a..d31b4da78da 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -3131,6 +3131,7 @@ export type Mutation = {
destroyViewFilterGroup: Scalars['Boolean']['output'];
destroyViewGroup: ViewGroup;
destroyViewSort: Scalars['Boolean']['output'];
+ disconnectConnectedAccount: ConnectedAccountPublicDto;
duplicateDashboard: DuplicatedDashboard;
duplicateMessageList: DuplicatedMessageList;
editSSOIdentityProvider: EditSso;
@@ -3846,6 +3847,11 @@ export type MutationDestroyViewSortArgs = {
};
+export type MutationDisconnectConnectedAccountArgs = {
+ id: Scalars['UUID']['input'];
+};
+
+
export type MutationDuplicateDashboardArgs = {
id: Scalars['UUID']['input'];
};
@@ -9084,6 +9090,13 @@ export type DeleteEmailGroupChannelMutationVariables = Exact<{
export type DeleteEmailGroupChannelMutation = { __typename?: 'Mutation', deleteEmailGroupChannel: { __typename?: 'MessageChannel', id: string } };
+export type DisconnectConnectedAccountMutationVariables = Exact<{
+ id: Scalars['UUID']['input'];
+}>;
+
+
+export type DisconnectConnectedAccountMutation = { __typename?: 'Mutation', disconnectConnectedAccount: { __typename?: 'ConnectedAccountPublicDTO', id: string } };
+
export type SaveImapSmtpCaldavAccountMutationVariables = Exact<{
handle: Scalars['String']['input'];
connectionParameters: EmailAccountConnectionParameters;
@@ -10373,6 +10386,7 @@ export const ExportRecordsDocument = {"kind":"Document","definitions":[{"kind":"
export const CreateEmailGroupChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateEmailGroupChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateEmailGroupChannelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createEmailGroupChannel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"messageChannel"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"isSyncEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"excludeGroupEmails"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}}]}},{"kind":"Field","name":{"kind":"Name","value":"forwardingAddress"}}]}}]}}]} as unknown as DocumentNode<CreateEmailGroupChannelMutation, CreateEmailGroupChannelMutationVariables>;
export const DeleteConnectedAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteConnectedAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteConnectedAccount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<DeleteConnectedAccountMutation, DeleteConnectedAccountMutationVariables>;
export const DeleteEmailGroupChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteEmailGroupChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteEmailGroupChannel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<DeleteEmailGroupChannelMutation, DeleteEmailGroupChannelMutationVariables>;
+export const DisconnectConnectedAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DisconnectConnectedAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"disconnectConnectedAccount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<DisconnectConnectedAccountMutation, DisconnectConnectedAccountMutationVariables>;
export const SaveImapSmtpCaldavAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SaveImapSmtpCaldavAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"handle"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectionParameters"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EmailAccountConnectionParameters"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"saveImapSmtpCaldavAccount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"handle"},"value":{"kind":"Variable","name":{"kind":"Name","value":"handle"}}},{"kind":"Argument","name":{"kind":"Name","value":"connectionParameters"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectionParameters"}}},{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"connectedAccountId"}}]}}]}}]} as unknown as DocumentNode<SaveImapSmtpCaldavAccountMutation, SaveImapSmtpCaldavAccountMutationVariables>;
export const StartChannelSyncDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"StartChannelSync"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startChannelSync"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}}]}}]} as unknown as DocumentNode<StartChannelSyncMutation, StartChannelSyncMutationVariables>;
export const UpdateCalendarChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateCalendarChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCalendarChannelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateCalendarChannel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"isContactAutoCreationEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}}]}}]}}]} as unknown as DocumentNode<UpdateCalendarChannelMutation, UpdateCalendarChannelMutationVariables>;
diff --git a/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts b/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts
index 38c1f27d821..13288d49be0 100644
--- a/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts
+++ b/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts
@@ -8,8 +8,8 @@ export type ConnectedAccount = {
handle: string;
provider: ConnectedAccountProvider;
authFailedAt: string | null;
- // Set when the account was frozen after its owner left the workspace:
- // synced data is kept but the account is read-only.
+ // Set when the account is disconnected or frozen: synced data is kept but
+ // cannot be updated until the account is reconnected.
archivedAt: string | null;
scopes: string[] | null;
handleAliases: string[] | null;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx
index 504bb1aef4a..e8f1b06e9d8 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx
@@ -26,12 +26,12 @@ export const SettingsAccountsConnectedAccountsRowRightContainer = ({
const status = computeSyncStatus(messageChannel, calendarChannel);
- // Archived accounts are frozen (owner left the workspace): their synced data
- // is kept but sync is disabled, so the live sync status is no longer relevant.
+ // Archived accounts retain their synced data but cannot be synced until they
+ // are reconnected, so the live sync status is no longer relevant.
if (isArchived) {
return (
<StyledRowRightContainer>
- <Status color="gray" weight="medium">{t`Archived`}</Status>
+ <Status color="gray" weight="medium">{t`Sync paused`}</Status>
<SettingsAccountsRowDropdownMenu account={account} />
</StyledRowRightContainer>
);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
index ce9135194f0..3b5998f673c 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
@@ -7,6 +7,7 @@ import {
MessageChannelSyncStage,
SettingsPath,
} from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
import { useTriggerProviderReconnect } from '@/settings/accounts/hooks/useTriggerProviderReconnect';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -24,10 +25,13 @@ import {
IconPlayerPlay,
IconRefresh,
IconTrash,
+ IconUnlink,
} from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/components';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { DELETE_CONNECTED_ACCOUNT } from '../graphql/mutations/deleteConnectedAccount';
+import { DISCONNECT_CONNECTED_ACCOUNT } from '../graphql/mutations/disconnectConnectedAccount';
+import { isConnectedAccountEligibleForProviderReconnect } from '../constants/isConnectedAccountEligibleForProviderReconnect.const';
type SettingsAccountsRowDropdownMenuProps = {
account: ConnectedAccount;
@@ -38,6 +42,7 @@ export const SettingsAccountsRowDropdownMenu = ({
}: SettingsAccountsRowDropdownMenuProps) => {
const dropdownId = `settings-account-row-${account.id}`;
const deleteAccountModalId = `delete-account-modal-${account.id}`;
+ const disconnectAccountModalId = `disconnect-account-modal-${account.id}`;
const accountHandle = account.handle;
const { t } = useLingui();
@@ -50,6 +55,9 @@ export const SettingsAccountsRowDropdownMenu = ({
const [deleteConnectedAccountMutation] = useMutation(
DELETE_CONNECTED_ACCOUNT,
);
+ const [disconnectConnectedAccountMutation] = useMutation(
+ DISCONNECT_CONNECTED_ACCOUNT,
+ );
const { triggerProviderReconnect } = useTriggerProviderReconnect();
const hasPendingConfiguration =
@@ -62,6 +70,9 @@ export const SettingsAccountsRowDropdownMenu = ({
channel.syncStage === CalendarChannelSyncStage.PENDING_CONFIGURATION,
);
+ const isEligibleForProviderReconnect =
+ isConnectedAccountEligibleForProviderReconnect(account);
+
const deleteAccount = async () => {
await deleteConnectedAccountMutation({
variables: { id: account.id },
@@ -69,6 +80,13 @@ export const SettingsAccountsRowDropdownMenu = ({
await apolloClient.refetchQueries({ include: 'active' });
};
+ const disconnectAccount = async () => {
+ await disconnectConnectedAccountMutation({
+ variables: { id: account.id },
+ });
+ await apolloClient.refetchQueries({ include: 'active' });
+ };
+
return (
<>
<Dropdown
@@ -119,15 +137,26 @@ export const SettingsAccountsRowDropdownMenu = ({
closeDropdown(dropdownId);
}}
>{t`Calendar settings`}</ListItem>
- {account.authFailedAt && (
+ {isEligibleForProviderReconnect && (
<ListItem
startIcon={<IconRefresh />}
onClick={() => {
- triggerProviderReconnect(account.provider, account.id);
+ triggerProviderReconnect(account.provider, account.id, {
+ loginHint: account.handle,
+ });
closeDropdown(dropdownId);
}}
>{t`Reconnect`}</ListItem>
)}
+ {!isDefined(account.archivedAt) && (
+ <ListItem
+ startIcon={<IconUnlink />}
+ onClick={() => {
+ closeDropdown(dropdownId);
+ openDialog(disconnectAccountModalId);
+ }}
+ >{t`Disconnect account`}</ListItem>
+ )}
<ListItem
color="danger"
startIcon={<IconTrash />}
@@ -135,22 +164,35 @@ export const SettingsAccountsRowDropdownMenu = ({
closeDropdown(dropdownId);
openDialog(deleteAccountModalId);
}}
- >{t`Remove account`}</ListItem>
+ >{t`Delete account and synced data`}</ListItem>
</DropdownMenuItemsContainer>
</DropdownContent>
}
/>
+ <ConfirmationDialog
+ dialogId={disconnectAccountModalId}
+ title={t`Disconnect account`}
+ subtitle={
+ <Trans>
+ Syncing will stop and this account's credentials will be removed.
+ Your emails and events will be retained and available after you
+ reconnect.
+ </Trans>
+ }
+ onConfirmClick={disconnectAccount}
+ confirmButtonText={t`Disconnect account`}
+ />
<ConfirmationDialog
dialogId={deleteAccountModalId}
- title={t`Data deletion`}
+ title={t`Delete account and synced data?`}
subtitle={
<Trans>
- All emails and events linked to this account ({accountHandle}) will
- be deleted
+ This permanently deletes {accountHandle} and all of its synced
+ emails and events. This action cannot be undone.
</Trans>
}
onConfirmClick={deleteAccount}
- confirmButtonText={t`Delete account`}
+ confirmButtonText={t`Delete account and data`}
/>
</>
);
diff --git a/packages/twenty-front/src/modules/settings/accounts/constants/isConnectedAccountEligibleForProviderReconnect.const.ts b/packages/twenty-front/src/modules/settings/accounts/constants/isConnectedAccountEligibleForProviderReconnect.const.ts
new file mode 100644
index 00000000000..cb93cc567a0
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/constants/isConnectedAccountEligibleForProviderReconnect.const.ts
@@ -0,0 +1,10 @@
+import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+export const isConnectedAccountEligibleForProviderReconnect = (
+ account: ConnectedAccount,
+): boolean =>
+ (account.provider === ConnectedAccountProvider.GOOGLE ||
+ account.provider === ConnectedAccountProvider.MICROSOFT) &&
+ (isDefined(account.authFailedAt) || isDefined(account.archivedAt));
diff --git a/packages/twenty-front/src/modules/settings/accounts/graphql/mutations/disconnectConnectedAccount.ts b/packages/twenty-front/src/modules/settings/accounts/graphql/mutations/disconnectConnectedAccount.ts
new file mode 100644
index 00000000000..6316f3e93cc
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/graphql/mutations/disconnectConnectedAccount.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const DISCONNECT_CONNECTED_ACCOUNT = gql`
+ mutation DisconnectConnectedAccount($id: UUID!) {
+ disconnectConnectedAccount(id: $id) {
+ id
+ }
+ }
+`;
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts
index 2a4d0b64928..806694ce527 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.module.ts
@@ -16,6 +16,7 @@ import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channe
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
+import { WebhookSubscriptionModule } from 'src/modules/connected-account/webhook-subscription-manager/webhook-subscription.module';
@Module({
imports: [
@@ -28,6 +29,7 @@ import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/
AppOAuthRefreshModule,
ConnectionProviderModule,
FeatureFlagModule,
+ WebhookSubscriptionModule,
PermissionsModule,
UserRoleModule,
WorkspaceEventEmitterModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts
index 4b90dc30fc9..11260916623 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts
@@ -32,6 +32,8 @@ import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channe
import { type MessageChannelDeletedEvent } from 'src/engine/metadata-modules/message-channel/types/message-channel-deleted.type';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
+import { CalendarWebhookSubscriptionService } from 'src/modules/connected-account/webhook-subscription-manager/services/calendar-webhook-subscription.service';
+import { MessagingWebhookSubscriptionService } from 'src/modules/connected-account/webhook-subscription-manager/services/messaging-webhook-subscription.service';
@Injectable()
export class ConnectedAccountMetadataService {
@@ -48,6 +50,8 @@ export class ConnectedAccountMetadataService {
private readonly connectionProviderLifecycleHookService: ConnectionProviderLifecycleHookService,
private readonly permissionsService: PermissionsService,
private readonly workspaceEventEmitter: WorkspaceEventEmitter,
+ private readonly calendarWebhookSubscriptionService: CalendarWebhookSubscriptionService,
+ private readonly messagingWebhookSubscriptionService: MessagingWebhookSubscriptionService,
) {}
async findMailboxesUsableByCaller({
@@ -412,6 +416,79 @@ export class ConnectedAccountMetadataService {
}
}
+ async disconnect({
+ id,
+ workspaceId,
+ }: {
+ id: string;
+ workspaceId: string;
+ }): Promise<ConnectedAccountEntity> {
+ const connectedAccount = await this.repository.findOneOrFail({
+ where: { id, workspaceId },
+ });
+
+ if (isDefined(connectedAccount.connectionProviderId)) {
+ await this.connectionProviderLifecycleHookService.runOnDisconnect({
+ connectionProviderId: connectedAccount.connectionProviderId,
+ workspaceId,
+ connectedAccountId: id,
+ });
+ }
+
+ await this.appOAuthRevokeService.revokeIfApp(connectedAccount);
+
+ const [messageChannels, calendarChannels] = await Promise.all([
+ this.messageChannelRepository.find({
+ where: { connectedAccountId: id, workspaceId },
+ select: { id: true },
+ }),
+ this.calendarChannelRepository.find({
+ where: { connectedAccountId: id, workspaceId },
+ select: { id: true },
+ }),
+ ]);
+
+ await this.stopWebhookSubscriptions({
+ messageChannels,
+ calendarChannels,
+ workspaceId,
+ });
+
+ await this.repository.manager.transaction(async (entityManager) => {
+ await entityManager.update(
+ ConnectedAccountEntity,
+ { id, workspaceId },
+ {
+ accessToken: null,
+ refreshToken: null,
+ connectionParameters: null,
+ authFailedAt: null,
+ authFailedReason: null,
+ },
+ );
+
+ await entityManager.update(
+ ConnectedAccountEntity,
+ { id, workspaceId, archivedAt: IsNull() },
+ { archivedAt: new Date() },
+ );
+
+ await entityManager.update(
+ MessageChannelEntity,
+ { connectedAccountId: id, workspaceId },
+ { isSyncEnabled: false },
+ );
+
+ await entityManager.update(
+ CalendarChannelEntity,
+ { connectedAccountId: id, workspaceId },
+ { isSyncEnabled: false },
+ );
+ });
+
+ return this.repository.findOneOrFail({ where: { id, workspaceId } });
+ }
+
async delete({
id,
workspaceId,
@@ -446,6 +523,12 @@ export class ConnectedAccountMetadataService {
});
}
+ await this.stopWebhookSubscriptions({
+ messageChannels,
+ calendarChannels,
+ workspaceId,
+ });
+
// The hook may have refreshed the tokens through getConnection, and an
// overlapping delete may already have removed the row.
const latestConnectedAccount = await this.repository.findOne({
@@ -487,4 +570,29 @@ export class ConnectedAccountMetadataService {
return connectedAccount;
}
+
+ private async stopWebhookSubscriptions({
+ messageChannels,
+ calendarChannels,
+ workspaceId,
+ }: {
+ messageChannels: Pick<MessageChannelEntity, 'id'>[];
+ calendarChannels: Pick<CalendarChannelEntity, 'id'>[];
+ workspaceId: string;
+ }): Promise<void> {
+ await Promise.all([
+ ...messageChannels.map(({ id: messageChannelId }) =>
+ this.messagingWebhookSubscriptionService.deleteSubscription(
+ messageChannelId,
+ workspaceId,
+ ),
+ ),
+ ...calendarChannels.map(({ id: calendarChannelId }) =>
+ this.calendarWebhookSubscriptionService.deleteSubscription(
+ calendarChannelId,
+ workspaceId,
+ ),
+ ),
+ ]);
+ }
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/connected-account.dto.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/connected-account.dto.ts
index 41ac2fd4365..ae73d1d13b5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/connected-account.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/connected-account.dto.ts
@@ -50,8 +50,8 @@ export class ConnectedAccountDTO {
@Field(() => String, { nullable: true })
authFailedReason: string | null;
- // Set when the account is frozen after its owner is removed from the
- // workspace: synced data is kept but the account is read-only.
+ // Set when the account is disconnected or frozen: synced data is kept but
+ // cannot be updated until the account is reconnected.
@IsDateString()
@IsOptional()
@Field(() => Date, { nullable: true })
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts
index cffd2685f73..56655287a34 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts
@@ -93,4 +93,27 @@ export class ConnectedAccountResolver {
return buildPublicConnectedAccount(deleted);
}
+
+ @Mutation(() => ConnectedAccountPublicDTO)
+ @UseGuards(CustomPermissionGuard)
+ async disconnectConnectedAccount(
+ @Args('id', { type: () => UUIDScalarType }) id: string,
+ @AuthWorkspace() workspace: WorkspaceEntity,
+ @AuthUserWorkspaceId() userWorkspaceId: string,
+ @AuthApplication({ allowUndefined: true }) application?: FlatApplication,
+ ): Promise<ConnectedAccountPublicDTO> {
+ await this.connectedAccountMetadataService.verifyAdministrableByCaller({
+ id,
+ userWorkspaceId,
+ workspaceId: workspace.id,
+ applicationId: application?.id,
+ });
+
+ const disconnected = await this.connectedAccountMetadataService.disconnect({
+ id,
+ workspaceId: workspace.id,
+ });
+
+ return buildPublicConnectedAccount(disconnected);
+ }
}
diff --git a/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/calendar-webhook-subscription.service.ts b/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/calendar-webhook-subscription.service.ts
index 3c8b3c7eedf..e2009add92e 100644
--- a/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/calendar-webhook-subscription.service.ts
+++ b/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/calendar-webhook-subscription.service.ts
@@ -227,6 +227,14 @@ export class CalendarWebhookSubscriptionService {
return;
}
+ if (
+ !this.webhookSubscriptionDriverFactory.isProviderSupported(
+ connectedAccount.provider,
+ )
+ ) {
+ return;
+ }
+
const driver = this.webhookSubscriptionDriverFactory.getDriver(
connectedAccount.provider,
);
@@ -281,6 +289,13 @@ export class CalendarWebhookSubscriptionService {
return;
}
+ if (
+ calendarChannel.webhookSubscriptionStatus !==
+ WebhookSubscriptionStatus.ACTIVE
+ ) {
+ return;
+ }
+
const connectedAccount = await this.connectedAccountRepository.findOne({
where: {
id: calendarChannel.connectedAccountId,
@@ -292,6 +307,14 @@ export class CalendarWebhookSubscriptionService {
return;
}
+ if (
+ !this.webhookSubscriptionDriverFactory.isProviderSupported(
+ connectedAccount.provider,
+ )
+ ) {
+ return;
+ }
+
const driver = this.webhookSubscriptionDriverFactory.getDriver(
connectedAccount.provider,
);
@@ -299,6 +322,11 @@ export class CalendarWebhookSubscriptionService {
try {
await driver.deleteSubscription(this.toContext(calendarChannel));
+ await this.webhookSubscriptionStatusService.markAsExpired(
+ WebhookSubscriptionChannelType.CALENDAR,
+ calendarChannelId,
+ );
+
this.metricsService.incrementCounterBy({
key: MetricsKeys.ConnectedAccountWebhookSubscriptionDeleted,
amount: 1,
@@ -337,11 +365,6 @@ export class CalendarWebhookSubscriptionService {
}
await this.deleteSubscription(calendarChannelId, workspaceId);
-
- await this.webhookSubscriptionStatusService.markAsExpired(
- WebhookSubscriptionChannelType.CALENDAR,
- calendarChannelId,
- );
}
private buildMetricAttributes(provider: string) {
diff --git a/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/messaging-webhook-subscription.service.ts b/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/messaging-webhook-subscription.service.ts
index f9afacad923..00d0a8d28a8 100644
--- a/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/messaging-webhook-subscription.service.ts
+++ b/packages/twenty-server/src/modules/connected-account/webhook-subscription-manager/services/messaging-webhook-subscription.service.ts
@@ -227,6 +227,14 @@ export class MessagingWebhookSubscriptionService {
return;
}
+ if (
+ !this.webhookSubscriptionDriverFactory.isProviderSupported(
+ connectedAccount.provider,
+ )
+ ) {
+ return;
+ }
+
const driver = this.webhookSubscriptionDriverFactory.getDriver(
connectedAccount.provider,
);
@@ -281,6 +289,13 @@ export class MessagingWebhookSubscriptionService {
return;
}
+ if (
+ messageChannel.webhookSubscriptionStatus !==
+ WebhookSubscriptionStatus.ACTIVE
+ ) {
+ return;
+ }
+
const connectedAccount = await this.connectedAccountRepository.findOne({
where: {
id: messageChannel.connectedAccountId,
@@ -292,6 +307,14 @@ export class MessagingWebhookSubscriptionService {
return;
}
+ if (
+ !this.webhookSubscriptionDriverFactory.isProviderSupported(
+ connectedAccount.provider,
+ )
+ ) {
+ return;
+ }
+
const driver = this.webhookSubscriptionDriverFactory.getDriver(
connectedAccount.provider,
);
@@ -299,6 +322,11 @@ export class MessagingWebhookSubscriptionService {
try {
await driver.deleteSubscription(this.toContext(messageChannel));
+ await this.webhookSubscriptionStatusService.markAsExpired(
+ WebhookSubscriptionChannelType.MESSAGING,
+ messageChannelId,
+ );
+
this.metricsService.incrementCounterBy({
key: MetricsKeys.ConnectedAccountWebhookSubscriptionDeleted,
amount: 1,
@@ -337,11 +365,6 @@ export class MessagingWebhookSubscriptionService {
}
await this.deleteSubscription(messageChannelId, workspaceId);
-
- await this.webhookSubscriptionStatusService.markAsExpired(
- WebhookSubscriptionChannelType.MESSAGING,
- messageChannelId,
- );
}
private buildMetricAttributes(provider: string) {
diff --git a/packages/twenty-server/test/integration/google/messaging/connected-account-disconnection.integration-spec.ts b/packages/twenty-server/test/integration/google/messaging/connected-account-disconnection.integration-spec.ts
new file mode 100644
index 00000000000..fde53e06301
--- /dev/null
+++ b/packages/twenty-server/test/integration/google/messaging/connected-account-disconnection.integration-spec.ts
@@ -0,0 +1,103 @@
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+
+import { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';
+import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
+import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
+
+import { getGmailMessageSubject } from 'test/integration/google/mocks/gmail-message-subject.util';
+import { gmailMessage } from 'test/integration/google/mocks/gmail-message.util';
+import { setupGoogleMock } from 'test/integration/google/mocks/setup-google-mock.util';
+import { connectMessagingAccount } from 'test/integration/utils/connect-messaging-account.util';
+import { disconnectConnectedAccount } from 'test/integration/utils/query-messaging.util';
+import { findImportedMessageSubjects } from 'test/integration/utils/find-imported-records.util';
+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
+import { runMessageChannelSync } from 'test/integration/utils/run-message-channel-sync.util';
+
+const HANDLE = '[email protected]';
+
+describe('Messaging connected account disconnection (integration)', () => {
+ const inbox = [gmailMessage()];
+ const expectedSubject = getGmailMessageSubject(inbox[0]);
+
+ setupGoogleMock({ handle: HANDLE, inbox });
+
+ let channel: Awaited<ReturnType<typeof connectMessagingAccount>>;
+
+ beforeAll(async () => {
+ channel = await connectMessagingAccount({
+ provider: ConnectedAccountProvider.GOOGLE,
+ handle: HANDLE,
+ });
+
+ await runMessageChannelSync(channel.channelId);
+ }, 60000);
+
+ afterAll(async () => {
+ await channel?.cleanup().catch(() => undefined);
+ });
+
+ it('keeps synced data while archiving the account and pausing its channels', async () => {
+ expect(await findImportedMessageSubjects([expectedSubject])).toEqual([
+ expectedSubject,
+ ]);
+
+ await disconnectConnectedAccount(channel.connectedAccountId);
+
+ const [connectedAccount, messageChannel, calendarChannel] =
+ await Promise.all([
+ getCoreRepository<ConnectedAccountEntity>(
+ ConnectedAccountEntity,
+ ).findOneByOrFail({ id: channel.connectedAccountId }),
+ getCoreRepository<MessageChannelEntity>(
+ MessageChannelEntity,
+ ).findOneByOrFail({ id: channel.channelId }),
+ getCoreRepository<CalendarChannelEntity>(
+ CalendarChannelEntity,
+ ).findOneByOrFail({ id: channel.calendarChannelId }),
+ ]);
+
+ expect(connectedAccount.archivedAt).not.toBeNull();
+ expect(connectedAccount.accessToken).toBeNull();
+ expect(connectedAccount.refreshToken).toBeNull();
+ expect(messageChannel.isSyncEnabled).toBe(false);
+ expect(calendarChannel.isSyncEnabled).toBe(false);
+ expect(await findImportedMessageSubjects([expectedSubject])).toEqual([
+ expectedSubject,
+ ]);
+ }, 60000);
+
+ it('restores the same account and its data after OAuth reconnect', async () => {
+ const reconnectedChannel = await connectMessagingAccount({
+ provider: ConnectedAccountProvider.GOOGLE,
+ handle: HANDLE,
+ });
+
+ expect(reconnectedChannel.connectedAccountId).toBe(
+ channel.connectedAccountId,
+ );
+ expect(reconnectedChannel.channelId).toBe(channel.channelId);
+ expect(reconnectedChannel.calendarChannelId).toBe(
+ channel.calendarChannelId,
+ );
+
+ const [connectedAccount, messageChannel, calendarChannel] =
+ await Promise.all([
+ getCoreRepository<ConnectedAccountEntity>(
+ ConnectedAccountEntity,
+ ).findOneByOrFail({ id: channel.connectedAccountId }),
+ getCoreRepository<MessageChannelEntity>(
+ MessageChannelEntity,
+ ).findOneByOrFail({ id: channel.channelId }),
+ getCoreRepository<CalendarChannelEntity>(
+ CalendarChannelEntity,
+ ).findOneByOrFail({ id: channel.calendarChannelId }),
+ ]);
+
+ expect(connectedAccount.archivedAt).toBeNull();
+ expect(messageChannel.isSyncEnabled).toBe(true);
+ expect(calendarChannel.isSyncEnabled).toBe(true);
+ expect(await findImportedMessageSubjects([expectedSubject])).toEqual([
+ expectedSubject,
+ ]);
+ }, 60000);
+});
diff --git a/packages/twenty-server/test/integration/utils/query-messaging.util.ts b/packages/twenty-server/test/integration/utils/query-messaging.util.ts
index 2af1b1e844b..e5a19fe5ce7 100644
--- a/packages/twenty-server/test/integration/utils/query-messaging.util.ts
+++ b/packages/twenty-server/test/integration/utils/query-messaging.util.ts
@@ -313,3 +313,20 @@ export const deleteConnectedAccount = async (
await waitForAllJobsToFinish();
};
+
+export const disconnectConnectedAccount = async (
+ connectedAccountId: string,
+): Promise<void> => {
+ const response = await makeMetadataAPIRequest({
+ query: gql`
+ mutation DisconnectConnectedAccountForTest($id: UUID!) {
+ disconnectConnectedAccount(id: $id) {
+ id
+ }
+ }
+ `,
+ variables: { id: connectedAccountId },
+ });
+
+ getDataOrThrow(response);
+};