Skip to content

The open alternative to Salesforce, designed for AI.

Let every application admin manage a workspace-shared connection (#25773)

Abdul Rahman6d2e8c359112
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 75ba436c033..a67566a3fed 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -1974,7 +1974,7 @@ type ApplicationConnectedAccountDTO {
createdAt: DateTime!
updatedAt: DateTime!
connectionParameters: PublicImapSmtpCaldavConnectionParameters
- isOwnedByCurrentUser: Boolean!
+ isOwnedByCurrentUser: Boolean! @deprecated(reason: "Ownership no longer gates connection actions, every application admin manages a workspace-shared connection")
}
type FeatureFlag {
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index c65aaa44e9f..139e6b9d4cc 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1596,6 +1596,7 @@ export interface ApplicationConnectedAccountDTO {
createdAt: Scalars['DateTime']
updatedAt: Scalars['DateTime']
connectionParameters?: PublicImapSmtpCaldavConnectionParameters
+ /** @deprecated Ownership no longer gates connection actions, every application admin manages a workspace-shared connection */
isOwnedByCurrentUser: Scalars['Boolean']
__typename: 'ApplicationConnectedAccountDTO'
}
@@ -5225,6 +5226,7 @@ export interface ApplicationConnectedAccountDTOGenqlSelection{
createdAt?: boolean | number
updatedAt?: boolean | number
connectionParameters?: PublicImapSmtpCaldavConnectionParametersGenqlSelection
+ /** @deprecated Ownership no longer gates connection actions, every application admin manages a workspace-shared connection */
isOwnedByCurrentUser?: boolean | number
__typename?: boolean | number
__scalar?: boolean | number
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 996a22d927a..fe2161468dc 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -375,6 +375,7 @@ export type ApplicationConnectedAccountDto = {
handle: Scalars['String']['output'];
handleAliases?: Maybe<Array<Scalars['String']['output']>>;
id: Scalars['UUID']['output'];
+ /** @deprecated Ownership no longer gates connection actions, every application admin manages a workspace-shared connection */
isOwnedByCurrentUser: Scalars['Boolean']['output'];
lastCredentialsRefreshedAt?: Maybe<Scalars['DateTime']['output']>;
lastSignedInAt?: Maybe<Scalars['DateTime']['output']>;
@@ -9129,7 +9130,7 @@ export type ApplicationConnectedAccountsQueryVariables = Exact<{
}>;
-export type ApplicationConnectedAccountsQuery = { __typename?: 'Query', applicationConnectedAccounts: Array<{ __typename?: 'ApplicationConnectedAccountDTO', id: string, handle: string, authFailedAt?: string | null, authFailedReason?: string | null, scopes?: Array<string> | null, lastSignedInAt?: string | null, connectionProviderId?: string | null, name?: string | null, visibility: string, isOwnedByCurrentUser: boolean, lastCredentialsRefreshedAt?: string | null, createdAt: string, updatedAt: string }> };
+export type ApplicationConnectedAccountsQuery = { __typename?: 'Query', applicationConnectedAccounts: Array<{ __typename?: 'ApplicationConnectedAccountDTO', id: string, handle: string, authFailedAt?: string | null, authFailedReason?: string | null, scopes?: Array<string> | null, lastSignedInAt?: string | null, connectionProviderId?: string | null, name?: string | null, visibility: string, lastCredentialsRefreshedAt?: string | null, createdAt: string, updatedAt: string }> };
export type ApplicationConnectionProvidersQueryVariables = Exact<{
applicationId: Scalars['UUID']['input'];
@@ -10253,7 +10254,7 @@ export const TriggerUninstallApplicationJobDocument = {"kind":"Document","defini
export const UninstallApplicationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UninstallApplication"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"universalIdentifier"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"uninstallApplication"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"universalIdentifier"},"value":{"kind":"Variable","name":{"kind":"Name","value":"universalIdentifier"}}}]}]}}]} as unknown as DocumentNode<UninstallApplicationMutation, UninstallApplicationMutationVariables>;
export const UpdateApplicationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateApplication"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateApplicationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateApplication"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}},{"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":"autoUpgrade"}}]}}]}}]} as unknown as DocumentNode<UpdateApplicationMutation, UpdateApplicationMutationVariables>;
export const UpdateOneApplicationVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneApplicationVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"key"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"value"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneApplicationVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"Variable","name":{"kind":"Name","value":"key"}}},{"kind":"Argument","name":{"kind":"Name","value":"value"},"value":{"kind":"Variable","name":{"kind":"Name","value":"value"}}},{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}]}]}}]} as unknown as DocumentNode<UpdateOneApplicationVariableMutation, UpdateOneApplicationVariableMutationVariables>;
-export const ApplicationConnectedAccountsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ApplicationConnectedAccounts"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"applicationConnectedAccounts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"authFailedAt"}},{"kind":"Field","name":{"kind":"Name","value":"authFailedReason"}},{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"lastSignedInAt"}},{"kind":"Field","name":{"kind":"Name","value":"connectionProviderId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"isOwnedByCurrentUser"}},{"kind":"Field","name":{"kind":"Name","value":"lastCredentialsRefreshedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<ApplicationConnectedAccountsQuery, ApplicationConnectedAccountsQueryVariables>;
+export const ApplicationConnectedAccountsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ApplicationConnectedAccounts"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"applicationConnectedAccounts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"authFailedAt"}},{"kind":"Field","name":{"kind":"Name","value":"authFailedReason"}},{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"lastSignedInAt"}},{"kind":"Field","name":{"kind":"Name","value":"connectionProviderId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"lastCredentialsRefreshedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<ApplicationConnectedAccountsQuery, ApplicationConnectedAccountsQueryVariables>;
export const ApplicationConnectionProvidersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ApplicationConnectionProviders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"applicationConnectionProviders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"oauth"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"isClientCredentialsConfigured"}}]}}]}}]}}]} as unknown as DocumentNode<ApplicationConnectionProvidersQuery, ApplicationConnectionProvidersQueryVariables>;
export const FindUninstallApplicationJobStatusDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindUninstallApplicationJobStatus"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"universalIdentifier"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findUninstallApplicationJobStatus"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"universalIdentifier"},"value":{"kind":"Variable","name":{"kind":"Name","value":"universalIdentifier"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"jobId"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"failedReason"}}]}}]}}]} as unknown as DocumentNode<FindUninstallApplicationJobStatusQuery, FindUninstallApplicationJobStatusQueryVariables>;
export const CancelSwitchBillingIntervalDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CancelSwitchBillingInterval"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cancelSwitchBillingInterval"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"currentBillingSubscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionFragment"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"price"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhase"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"start_date"}},{"kind":"Field","name":{"kind":"Name","value":"end_date"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseItemFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CurrentBillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"interval"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"currentPeriodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"billingSubscriptionItems"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"hasReachedCurrentPeriodCap"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}},{"kind":"Field","name":{"kind":"Name","value":"stripePriceId"}},{"kind":"Field","name":{"kind":"Name","value":"unitAmount"}},{"kind":"Field","name":{"kind":"Name","value":"creditAmount"}},{"kind":"Field","name":{"kind":"Name","value":"billingProduct"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"images"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"productKey"}},{"kind":"Field","name":{"kind":"Name","value":"planKey"}},{"kind":"Field","name":{"kind":"Name","value":"priceUsageBased"}},{"kind":"Field","name":{"kind":"Name","value":"isLegacy"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingSubscriptionFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingSubscription"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"metadata"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"phases"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BillingSubscriptionSchedulePhaseFragment"}}]}}]}}]} as unknown as DocumentNode<CancelSwitchBillingIntervalMutation, CancelSwitchBillingIntervalMutationVariables>;
diff --git a/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectedAccounts.ts b/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectedAccounts.ts
index 00d390a4cea..c102f9ccf99 100644
--- a/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectedAccounts.ts
+++ b/packages/twenty-front/src/modules/settings/applications/graphql/queries/findApplicationConnectedAccounts.ts
@@ -12,7 +12,6 @@ export const FIND_APPLICATION_CONNECTED_ACCOUNTS = gql`
connectionProviderId
name
visibility
- isOwnedByCurrentUser
lastCredentialsRefreshedAt
createdAt
updatedAt
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
index 42842aa0803..aee5aae11f1 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
@@ -328,35 +328,33 @@ export const SettingsApplicationConnectionDetail = () => {
title={connectionLabel}
description={t`Manage this application's OAuth connection.`}
/>
- {connection.isOwnedByCurrentUser && (
- <StyledActions>
- {connection.authFailedAt && (
- <Button
- title={t`Reconnect`}
- Icon={IconRefresh}
- variant="secondary"
- accent="blue"
- onClick={handleReconnect}
- />
- )}
- {connection.visibility !== 'workspace' && (
- <Button
- title={t`Share with workspace`}
- Icon={IconUsers}
- variant="secondary"
- accent="default"
- onClick={() => openModal(shareWithWorkspaceModalId)}
- />
- )}
+ <StyledActions>
+ {connection.authFailedAt && (
<Button
- title={t`Disconnect`}
- Icon={IconTrash}
+ title={t`Reconnect`}
+ Icon={IconRefresh}
variant="secondary"
- accent="danger"
- onClick={() => openModal(deleteModalId)}
+ accent="blue"
+ onClick={handleReconnect}
/>
- </StyledActions>
- )}
+ )}
+ {connection.visibility !== 'workspace' && (
+ <Button
+ title={t`Share with workspace`}
+ Icon={IconUsers}
+ variant="secondary"
+ accent="default"
+ onClick={() => openModal(shareWithWorkspaceModalId)}
+ />
+ )}
+ <Button
+ title={t`Disconnect`}
+ Icon={IconTrash}
+ variant="secondary"
+ accent="danger"
+ onClick={() => openModal(deleteModalId)}
+ />
+ </StyledActions>
</Section>
<Section>
<H2Title
diff --git a/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx b/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx
index 8508c045027..be95bddd8f7 100644
--- a/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/__tests__/SettingsApplicationConnectionDetail.test.tsx
@@ -147,7 +147,6 @@ describe('SettingsApplicationConnectionDetail', () => {
connectionProviderId: 'provider-1',
name: 'Original name',
visibility: 'user',
- isOwnedByCurrentUser: true,
lastCredentialsRefreshedAt: null,
createdAt: '2026-05-01T00:00:00.000Z',
updatedAt: '2026-05-01T00:00:00.000Z',
@@ -186,7 +185,7 @@ describe('SettingsApplicationConnectionDetail', () => {
});
});
- it('hides connection actions for a workspace shared connection owned by someone else', () => {
+ it('offers reconnect and disconnect on a failed workspace shared connection', () => {
mockedUseApplicationConnectedAccounts.mockReturnValue({
accounts: [
{
@@ -199,7 +198,6 @@ describe('SettingsApplicationConnectionDetail', () => {
connectionProviderId: 'provider-1',
name: 'Shared connection',
visibility: 'workspace',
- isOwnedByCurrentUser: false,
lastCredentialsRefreshedAt: null,
createdAt: '2026-05-01T00:00:00.000Z',
updatedAt: '2026-05-01T00:00:00.000Z',
@@ -213,36 +211,10 @@ describe('SettingsApplicationConnectionDetail', () => {
expect(screen.getByText('Workspace shared')).toBeVisible();
expect(screen.getByText('Reconnect needed')).toBeVisible();
- expect(screen.queryByText('Reconnect')).not.toBeInTheDocument();
- });
-
- it('shows the reconnect action to the owner of a failed connection', () => {
- mockedUseApplicationConnectedAccounts.mockReturnValue({
- accounts: [
- {
- __typename: 'ApplicationConnectedAccountDTO',
- id: 'account-1',
- handle: '[email protected]',
- authFailedAt: '2026-05-01T00:00:00.000Z',
- scopes: ['calendar.readonly'],
- lastSignedInAt: null,
- connectionProviderId: 'provider-1',
- name: 'Shared connection',
- visibility: 'workspace',
- isOwnedByCurrentUser: true,
- lastCredentialsRefreshedAt: null,
- createdAt: '2026-05-01T00:00:00.000Z',
- updatedAt: '2026-05-01T00:00:00.000Z',
- },
- ],
- loading: false,
- refetch: jest.fn(),
- });
-
- renderDetailPage();
fireEvent.click(screen.getByText('Reconnect'));
+ expect(mockTriggerAppOAuth).toHaveBeenCalledTimes(1);
expect(mockTriggerAppOAuth).toHaveBeenCalledWith({
applicationId: 'app-1',
providerName: 'google-calendar',
@@ -250,5 +222,14 @@ describe('SettingsApplicationConnectionDetail', () => {
reconnectingConnectedAccountId: 'account-1',
redirectLocation: '/settings/applications/app-1/connections/account-1',
});
+
+ const [disconnectButton] = screen.getAllByText('Disconnect');
+
+ fireEvent.click(disconnectButton);
+
+ expect(mockOpenModal).toHaveBeenCalledTimes(1);
+ expect(mockOpenModal).toHaveBeenCalledWith(
+ 'delete-application-connection-modal-account-1',
+ );
});
});
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx
index c62996eb58d..2bde9ee6375 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/__tests__/SettingsApplicationConnectionsSection.test.tsx
@@ -77,7 +77,6 @@ describe('SettingsApplicationConnectionsSection', () => {
connectionProviderId: 'provider-1',
name: 'Main connection',
visibility: 'workspace',
- isOwnedByCurrentUser: true,
lastCredentialsRefreshedAt: null,
createdAt: '2026-05-01T00:00:00.000Z',
updatedAt: '2026-05-01T00:00:00.000Z',
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/app-connection-access.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/app-connection-access.service.ts
new file mode 100644
index 00000000000..d758bb30232
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/app-connection-access.service.ts
@@ -0,0 +1,56 @@
+import { Injectable } from '@nestjs/common';
+
+import { msg } from '@lingui/core/macro';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+
+import { getConnectedAccountAdministrationPermissionFlag } from 'src/engine/metadata-modules/connected-account/utils/get-connected-account-administration-permission-flag.util';
+import {
+ PermissionsException,
+ PermissionsExceptionCode,
+ PermissionsExceptionMessage,
+} from 'src/engine/metadata-modules/permissions/permissions.exception';
+import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
+
+@Injectable()
+export class AppConnectionAccessService {
+ constructor(private readonly permissionsService: PermissionsService) {}
+
+ async validateCallerCanManageConnection({
+ isWorkspaceShared,
+ workspaceId,
+ userWorkspaceId,
+ apiKeyId,
+ applicationId,
+ }: {
+ isWorkspaceShared: boolean;
+ workspaceId: string;
+ userWorkspaceId?: string;
+ apiKeyId?: string;
+ applicationId?: string;
+ }): Promise<void> {
+ if (!isWorkspaceShared) {
+ return;
+ }
+
+ const hasPermission =
+ await this.permissionsService.userHasWorkspaceSettingPermission({
+ userWorkspaceId,
+ workspaceId,
+ setting: getConnectedAccountAdministrationPermissionFlag(
+ ConnectedAccountProvider.APP,
+ ),
+ apiKeyId,
+ applicationId,
+ });
+
+ if (!hasPermission) {
+ throw new PermissionsException(
+ PermissionsExceptionMessage.PERMISSION_DENIED,
+ PermissionsExceptionCode.PERMISSION_DENIED,
+ {
+ userFriendlyMessage: msg`You do not have permission to manage connections shared with the workspace. Please contact your workspace administrator for access.`,
+ },
+ );
+ }
+ }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.ts
index 6d96ad4c856..7a8d136bbfa 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-oauth-flow.service.ts
@@ -6,6 +6,7 @@ import { Repository } from 'typeorm';
import { ConnectedAccountProvider } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { AppConnectionAccessService } from 'src/engine/core-modules/application/connection-provider/app-connection-access.service';
import { ConnectionProviderExceptionCode } from 'src/engine/core-modules/application/connection-provider/connection-provider-exception-code.enum';
import { ConnectionProviderLifecycleHookService } from 'src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service';
import { type ConnectionProviderEntity } from 'src/engine/core-modules/application/connection-provider/connection-provider.entity';
@@ -29,6 +30,7 @@ import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twent
import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.service';
+import { buildConnectedAccountUsableByCallerWhere } from 'src/engine/metadata-modules/connected-account/utils/build-connected-account-usable-by-caller-where.util';
const STATE_JWT_EXPIRES_IN = '10m';
@@ -65,6 +67,7 @@ export class ConnectionProviderOAuthFlowService {
private readonly twentyConfigService: TwentyConfigService,
private readonly connectedAccountTokenEncryptionService: ConnectedAccountTokenEncryptionService,
private readonly connectionProviderLifecycleHookService: ConnectionProviderLifecycleHookService,
+ private readonly appConnectionAccessService: AppConnectionAccessService,
@InjectRepository(ConnectedAccountEntity)
private readonly connectedAccountRepository: Repository<ConnectedAccountEntity>,
@InjectRepository(UserEntity)
@@ -78,26 +81,36 @@ export class ConnectionProviderOAuthFlowService {
assertOAuthProvider(connectionProvider);
- // Reconnect target must live in the requesting workspace and belong to
- // the same provider — without this guard a foreign id would silently
- // leak through findOneByOrFail later in the flow.
+ let reconnectTarget: ConnectedAccountEntity | null = null;
+
if (isDefined(args.reconnectingConnectedAccountId)) {
- const target = await this.connectedAccountRepository.findOne({
- where: {
- id: args.reconnectingConnectedAccountId,
- workspaceId,
- connectionProviderId: connectionProvider.id,
- },
+ reconnectTarget = await this.connectedAccountRepository.findOne({
+ where: buildConnectedAccountUsableByCallerWhere({
+ baseWhere: {
+ id: args.reconnectingConnectedAccountId,
+ workspaceId,
+ connectionProviderId: connectionProvider.id,
+ },
+ userWorkspaceId,
+ }),
});
- if (!isDefined(target)) {
+ if (!isDefined(reconnectTarget)) {
throw new ConnectionProviderException(
- `Cannot reconnect connectedAccount ${args.reconnectingConnectedAccountId}: not found in this workspace for the requested provider.`,
+ `Cannot reconnect connectedAccount ${args.reconnectingConnectedAccountId}: not found in this workspace for the requested provider, or not usable by this member.`,
ConnectionProviderExceptionCode.FORBIDDEN,
);
}
}
+ await this.appConnectionAccessService.validateCallerCanManageConnection({
+ isWorkspaceShared:
+ args.visibility === 'workspace' ||
+ reconnectTarget?.visibility === 'workspace',
+ workspaceId,
+ userWorkspaceId,
+ });
+
const { clientId } =
await this.oauthProviderService.getClientCredentials(connectionProvider);
@@ -310,11 +323,9 @@ export class ConnectionProviderOAuthFlowService {
};
if (isDefined(reconnectingConnectedAccountId)) {
- // Workspace-scope both the update and the read so a foreign id can't
- // leak through findOneByOrFail.
await this.connectedAccountRepository.update(
{ id: reconnectingConnectedAccountId, workspaceId },
- sharedFields,
+ { ...sharedFields, userWorkspaceId },
);
return this.connectedAccountRepository.findOneByOrFail({
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts
index 3ae95b39e21..d424046a3e7 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts
@@ -1,6 +1,7 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
+import { AppConnectionAccessService } from 'src/engine/core-modules/application/connection-provider/app-connection-access.service';
import { ApplicationConnectionProviderResolver } from 'src/engine/core-modules/application/connection-provider/application-connection-provider.resolver';
import { ConnectionProviderEntity } from 'src/engine/core-modules/application/connection-provider/connection-provider.entity';
import { ConnectionProviderLifecycleHookService } from 'src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service';
@@ -17,6 +18,7 @@ import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';
import { FlatConnectionProviderModule } from 'src/engine/metadata-modules/flat-connection-provider/flat-connection-provider.module';
+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@Module({
@@ -36,8 +38,10 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
FlatConnectionProviderModule,
ConnectedAccountTokenEncryptionModule,
WorkspaceCacheModule,
+ PermissionsModule,
],
providers: [
+ AppConnectionAccessService,
ConnectionProviderService,
ConnectionProviderOAuthFlowService,
ConnectionProviderLifecycleHookService,
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 fc30aa45c0a..4b90dc30fc9 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
@@ -3,7 +3,6 @@ import { InjectRepository } from '@nestjs/typeorm';
import { In, IsNull, Repository } from 'typeorm';
-import { PermissionFlagType } from 'twenty-shared/constants';
import { ConnectedAccountProvider, EmailOperation } from 'twenty-shared/types';
import {
assertUnreachable,
@@ -26,6 +25,7 @@ import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-ac
import { type ConnectedAccountDeletedEvent } from 'src/engine/metadata-modules/connected-account/types/connected-account-deleted.type';
import { type ConnectedAccountUsableByCaller } from 'src/engine/metadata-modules/connected-account/types/connected-account-usable-by-caller.type';
import { buildConnectedAccountUsableByCallerWhere } from 'src/engine/metadata-modules/connected-account/utils/build-connected-account-usable-by-caller-where.util';
+import { getConnectedAccountAdministrationPermissionFlag } from 'src/engine/metadata-modules/connected-account/utils/get-connected-account-administration-permission-flag.util';
import { isConnectedAccountUsableByCaller } from 'src/engine/metadata-modules/connected-account/utils/is-connected-account-usable-by-caller.util';
import { MESSAGE_CHANNEL_DELETED_EVENT } from 'src/engine/metadata-modules/message-channel/constants/message-channel-deleted.constant';
import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
@@ -221,7 +221,7 @@ export class ConnectedAccountMetadataService {
}: {
connectedAccount: Pick<
ConnectedAccountEntity,
- 'visibility' | 'userWorkspaceId'
+ 'visibility' | 'userWorkspaceId' | 'provider'
>;
userWorkspaceId: string;
workspaceId: string;
@@ -237,7 +237,9 @@ export class ConnectedAccountMetadataService {
userWorkspaceId,
workspaceId,
applicationId,
- setting: PermissionFlagType.WORKSPACE,
+ setting: getConnectedAccountAdministrationPermissionFlag(
+ connectedAccount.provider,
+ ),
});
case 'user':
return false;
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/application-connected-account.dto.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/application-connected-account.dto.ts
index efb8cf3d352..823d2356e9b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/application-connected-account.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/application-connected-account.dto.ts
@@ -7,6 +7,9 @@ import { ConnectedAccountPublicDTO } from 'src/engine/metadata-modules/connected
@ObjectType('ApplicationConnectedAccountDTO')
export class ApplicationConnectedAccountDTO extends ConnectedAccountPublicDTO {
@IsBoolean()
- @Field(() => Boolean)
+ @Field(() => Boolean, {
+ deprecationReason:
+ 'Ownership no longer gates connection actions, every application admin manages a workspace-shared connection',
+ })
isOwnedByCurrentUser: boolean;
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/utils/__tests__/get-connected-account-administration-permission-flag.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/utils/__tests__/get-connected-account-administration-permission-flag.util.spec.ts
new file mode 100644
index 00000000000..04766261582
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/utils/__tests__/get-connected-account-administration-permission-flag.util.spec.ts
@@ -0,0 +1,30 @@
+import { PermissionFlagType } from 'twenty-shared/constants';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+
+import { getConnectedAccountAdministrationPermissionFlag } from 'src/engine/metadata-modules/connected-account/utils/get-connected-account-administration-permission-flag.util';
+
+describe('getConnectedAccountAdministrationPermissionFlag', () => {
+ it('requires the Applications permission for an app connection', () => {
+ expect(
+ getConnectedAccountAdministrationPermissionFlag(
+ ConnectedAccountProvider.APP,
+ ),
+ ).toBe(PermissionFlagType.APPLICATIONS);
+ });
+
+ it('requires the Workspace permission for a group mailbox', () => {
+ expect(
+ getConnectedAccountAdministrationPermissionFlag(
+ ConnectedAccountProvider.EMAIL_GROUP,
+ ),
+ ).toBe(PermissionFlagType.WORKSPACE);
+ });
+
+ it('requires the Workspace permission for an email provider', () => {
+ expect(
+ getConnectedAccountAdministrationPermissionFlag(
+ ConnectedAccountProvider.GOOGLE,
+ ),
+ ).toBe(PermissionFlagType.WORKSPACE);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/utils/get-connected-account-administration-permission-flag.util.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/utils/get-connected-account-administration-permission-flag.util.ts
new file mode 100644
index 00000000000..36b194fd260
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/utils/get-connected-account-administration-permission-flag.util.ts
@@ -0,0 +1,9 @@
+import { PermissionFlagType } from 'twenty-shared/constants';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+
+export const getConnectedAccountAdministrationPermissionFlag = (
+ provider: ConnectedAccountProvider,
+): PermissionFlagType =>
+ provider === ConnectedAccountProvider.APP
+ ? PermissionFlagType.APPLICATIONS
+ : PermissionFlagType.WORKSPACE;
diff --git a/packages/twenty-server/test/integration/metadata/suites/connected-account/application-connected-accounts.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/connected-account/application-connected-accounts.integration-spec.ts
index e044fd2f112..a41769f3f54 100644
--- a/packages/twenty-server/test/integration/metadata/suites/connected-account/application-connected-accounts.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/connected-account/application-connected-accounts.integration-spec.ts
@@ -16,7 +16,6 @@ const APPLICATION_CONNECTED_ACCOUNTS_QUERY = gql`
query ApplicationConnectedAccounts($applicationId: UUID!) {
applicationConnectedAccounts(applicationId: $applicationId) {
id
- isOwnedByCurrentUser
}
}
`;
@@ -139,7 +138,7 @@ describe('applicationConnectedAccounts resolver (e2e)', () => {
});
}, 120000);
- it('returns workspace-shared connections and the caller own private ones, flagged by ownership', async () => {
+ it('returns workspace-shared connections and the caller own private ones', async () => {
const response = await makeMetadataAPIRequest({
query: APPLICATION_CONNECTED_ACCOUNTS_QUERY,
variables: { applicationId: applicationDbId },
@@ -148,14 +147,14 @@ describe('applicationConnectedAccounts resolver (e2e)', () => {
expect(response.status).toBe(200);
expect(response.body.errors).toBeUndefined();
- const accounts: { id: string; isOwnedByCurrentUser: boolean }[] =
+ const accounts: { id: string }[] =
response.body.data.applicationConnectedAccounts;
expect(accounts).toHaveLength(2);
expect(accounts).toEqual(
expect.arrayContaining([
- { id: SHARED_BY_TIM_ID, isOwnedByCurrentUser: false },
- { id: PRIVATE_OF_JANE_ID, isOwnedByCurrentUser: true },
+ { id: SHARED_BY_TIM_ID },
+ { id: PRIVATE_OF_JANE_ID },
]),
);
});
diff --git a/packages/twenty-server/test/integration/metadata/suites/connection-provider/app-connection-management-guards.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/connection-provider/app-connection-management-guards.integration-spec.ts
new file mode 100644
index 00000000000..b90b9796b0f
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/connection-provider/app-connection-management-guards.integration-spec.ts
@@ -0,0 +1,232 @@
+import request from 'supertest';
+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';
+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';
+import { setupApplicationForSync } from 'test/integration/metadata/suites/application/utils/setup-application-for-sync.util';
+import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';
+import { findConnectionProvidersByApplication } from 'test/integration/metadata/suites/connection-provider/utils/find-connection-providers-by-application.util';
+import { makeMetadataAPIRequestWithMemberRole } from 'test/integration/metadata/suites/utils/make-metadata-api-request-with-member-role.util';
+import { generateTransientToken } from 'test/integration/utils/generate-transient-token.util';
+import { getDataOrThrow } from 'test/integration/utils/query-messaging.util';
+import gql from 'graphql-tag';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import { v4 as uuidv4 } from 'uuid';
+
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';
+
+const APP_ID = uuidv4();
+const APP_ROLE_ID = uuidv4();
+const APP_PROVIDER_ID = uuidv4();
+
+const SHARED_BY_TIM_ID = uuidv4();
+const PRIVATE_OF_TIM_ID = uuidv4();
+const PRIVATE_OF_JONY_ID = uuidv4();
+
+describe('app connection management guards (e2e)', () => {
+ let applicationDbId: string;
+ let providerDbId: string;
+
+ const insertAppConnection = async ({
+ id,
+ visibility,
+ userWorkspaceId,
+ }: {
+ id: string;
+ visibility: 'user' | 'workspace';
+ userWorkspaceId: string;
+ }): Promise<void> => {
+ await globalThis.testDataSource.query(
+ `INSERT INTO core."connectedAccount"
+ (id, handle, provider, visibility, "workspaceId", "userWorkspaceId",
+ "applicationId", "connectionProviderId")
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
+ [
+ id,
+ ConnectedAccountProvider.APP,
+ visibility,
+ SEED_APPLE_WORKSPACE_ID,
+ userWorkspaceId,
+ applicationDbId,
+ providerDbId,
+ ],
+ );
+ };
+
+ const generateMemberTransientToken = async (): Promise<string> => {
+ const response = await makeMetadataAPIRequestWithMemberRole({
+ query: gql`
+ mutation GenerateTransientToken {
+ generateTransientToken {
+ transientToken {
+ token
+ }
+ }
+ }
+ `,
+ });
+
+ const data = getDataOrThrow(response) as {
+ generateTransientToken: { transientToken: { token: string } };
+ };
+
+ return data.generateTransientToken.transientToken.token;
+ };
+
+ const startAuthorizeAndGetErrorMessage = async ({
+ reconnectingConnectedAccountId,
+ visibility,
+ asMember = false,
+ }: {
+ reconnectingConnectedAccountId?: string;
+ visibility?: 'user' | 'workspace';
+ asMember?: boolean;
+ }): Promise<string> => {
+ const response = await request(`http://localhost:${APP_PORT}`)
+ .get('/auth/apps/authorize')
+ .query({
+ applicationId: applicationDbId,
+ providerName: 'slack',
+ transientToken: asMember
+ ? await generateMemberTransientToken()
+ : await generateTransientToken(),
+ ...(isDefined(reconnectingConnectedAccountId)
+ ? { reconnectingConnectedAccountId }
+ : {}),
+ ...(isDefined(visibility) ? { visibility } : {}),
+ });
+
+ expect(response.status).toBe(302);
+
+ return (
+ new URL(response.headers.location).searchParams.get('errorMessage') ?? ''
+ );
+ };
+
+ beforeAll(async () => {
+ await setupApplicationForSync({
+ applicationUniversalIdentifier: APP_ID,
+ name: 'test-app-connection-management-guards',
+ description: 'App for testing app connection management guards',
+ sourcePath: 'test-app-connection-management-guards',
+ });
+
+ await syncApplication({
+ manifest: buildBaseManifest({
+ appId: APP_ID,
+ roleId: APP_ROLE_ID,
+ overrides: {
+ connectionProviders: [
+ {
+ universalIdentifier: APP_PROVIDER_ID,
+ name: 'slack',
+ displayName: 'Slack',
+ type: 'oauth',
+ oauth: {
+ authorizationEndpoint: 'https://slack.com/oauth/v2/authorize',
+ tokenEndpoint: 'https://slack.com/api/oauth.v2.access',
+ scopes: ['chat:write'],
+ clientIdVariable: 'SLACK_CLIENT_ID',
+ clientSecretVariable: 'SLACK_CLIENT_SECRET',
+ },
+ },
+ ],
+ },
+ }),
+ expectToFail: false,
+ });
+
+ jest.useRealTimers();
+
+ const [provider] = await findConnectionProvidersByApplication(APP_ID);
+
+ applicationDbId = provider.applicationId;
+ providerDbId = provider.id;
+
+ await insertAppConnection({
+ id: SHARED_BY_TIM_ID,
+ visibility: 'workspace',
+ userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.TIM,
+ });
+ await insertAppConnection({
+ id: PRIVATE_OF_TIM_ID,
+ visibility: 'user',
+ userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.TIM,
+ });
+ await insertAppConnection({
+ id: PRIVATE_OF_JONY_ID,
+ visibility: 'user',
+ userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.JONY,
+ });
+ }, 180000);
+
+ afterAll(async () => {
+ await globalThis.testDataSource.query(
+ `DELETE FROM core."connectedAccount"
+ WHERE "workspaceId" = $1 AND "applicationId" = $2`,
+ [SEED_APPLE_WORKSPACE_ID, applicationDbId],
+ );
+
+ await cleanupApplicationAndAppRegistration({
+ applicationUniversalIdentifier: APP_ID,
+ });
+ }, 120000);
+
+ it('refuses to reconnect a private connection owned by another member', async () => {
+ const errorMessage = await startAuthorizeAndGetErrorMessage({
+ reconnectingConnectedAccountId: PRIVATE_OF_TIM_ID,
+ });
+
+ expect(errorMessage).toContain(
+ `Cannot reconnect connectedAccount ${PRIVATE_OF_TIM_ID}`,
+ );
+ });
+
+ it('lets a member with the Applications permission reconnect a workspace-shared connection', async () => {
+ const errorMessage = await startAuthorizeAndGetErrorMessage({
+ reconnectingConnectedAccountId: SHARED_BY_TIM_ID,
+ });
+
+ expect(errorMessage).not.toContain('Cannot reconnect connectedAccount');
+ expect(errorMessage).not.toContain('does not have permission');
+ });
+
+ it('refuses a member without the Applications permission to reconnect a workspace-shared connection', async () => {
+ const errorMessage = await startAuthorizeAndGetErrorMessage({
+ reconnectingConnectedAccountId: SHARED_BY_TIM_ID,
+ asMember: true,
+ });
+
+ expect(errorMessage).toContain('does not have permission');
+ });
+
+ it('refuses a member without the Applications permission to create a workspace-shared connection', async () => {
+ const errorMessage = await startAuthorizeAndGetErrorMessage({
+ visibility: 'workspace',
+ asMember: true,
+ });
+
+ expect(errorMessage).toContain('does not have permission');
+ });
+
+ it('refuses a member without the Applications permission to share their own private connection', async () => {
+ const errorMessage = await startAuthorizeAndGetErrorMessage({
+ reconnectingConnectedAccountId: PRIVATE_OF_JONY_ID,
+ visibility: 'workspace',
+ asMember: true,
+ });
+
+ expect(errorMessage).toContain('does not have permission');
+ });
+
+ it('lets a member without the Applications permission reconnect their own private connection', async () => {
+ const errorMessage = await startAuthorizeAndGetErrorMessage({
+ reconnectingConnectedAccountId: PRIVATE_OF_JONY_ID,
+ asMember: true,
+ });
+
+ expect(errorMessage).not.toContain('Cannot reconnect connectedAccount');
+ expect(errorMessage).not.toContain('does not have permission');
+ });
+});
diff --git a/packages/twenty-server/test/integration/utils/connect-messaging-account.util.ts b/packages/twenty-server/test/integration/utils/connect-messaging-account.util.ts
index cd844ed4a8d..ba360b73a01 100644
--- a/packages/twenty-server/test/integration/utils/connect-messaging-account.util.ts
+++ b/packages/twenty-server/test/integration/utils/connect-messaging-account.util.ts
@@ -1,4 +1,3 @@
-import gql from 'graphql-tag';
import request from 'supertest';
import {
@@ -7,13 +6,12 @@ import {
MessageChannelVisibility,
} from 'twenty-shared/types';
+import { generateTransientToken } from 'test/integration/utils/generate-transient-token.util';
import {
deleteConnectedAccount,
- getDataOrThrow,
queryCalendarChannels,
queryMessageChannels,
} from 'test/integration/utils/query-messaging.util';
-import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { waitForAllJobsToFinish } from 'test/integration/utils/wait-for-all-jobs-to-finish.util';
type ConnectMessagingAccountInput = {
@@ -35,26 +33,6 @@ const OAUTH_CALLBACK_PATH: Partial<Record<ConnectedAccountProvider, string>> = {
[ConnectedAccountProvider.MICROSOFT]: '/auth/microsoft-apis/get-access-token',
};
-const generateTransientToken = async (): Promise<string> => {
- const response = await makeMetadataAPIRequest({
- query: gql`
- mutation GenerateTransientToken {
- generateTransientToken {
- transientToken {
- token
- }
- }
- }
- `,
- });
-
- const data = getDataOrThrow(response) as {
- generateTransientToken: { transientToken: { token: string } };
- };
-
- return data.generateTransientToken.transientToken.token;
-};
-
export const connectMessagingAccount = async ({
provider,
handle,
diff --git a/packages/twenty-server/test/integration/utils/generate-transient-token.util.ts b/packages/twenty-server/test/integration/utils/generate-transient-token.util.ts
new file mode 100644
index 00000000000..9a2455930c5
--- /dev/null
+++ b/packages/twenty-server/test/integration/utils/generate-transient-token.util.ts
@@ -0,0 +1,24 @@
+import gql from 'graphql-tag';
+
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { getDataOrThrow } from 'test/integration/utils/query-messaging.util';
+
+export const generateTransientToken = async (): Promise<string> => {
+ const response = await makeMetadataAPIRequest({
+ query: gql`
+ mutation GenerateTransientToken {
+ generateTransientToken {
+ transientToken {
+ token
+ }
+ }
+ }
+ `,
+ });
+
+ const data = getDataOrThrow(response) as {
+ generateTransientToken: { transientToken: { token: string } };
+ };
+
+ return data.generateTransientToken.transientToken.token;
+};