Skip to content

The open alternative to Salesforce, designed for AI.

Keep workspace-shared app connections off App preferences (#28088)

nitin7ec1c8d47386
diff --git a/packages/twenty-front/src/modules/settings/app-preferences/hooks/useMyAccountGroups.ts b/packages/twenty-front/src/modules/settings/app-preferences/hooks/useMyAccountGroups.ts
index 3d291274dd7..a60262bafc7 100644
--- a/packages/twenty-front/src/modules/settings/app-preferences/hooks/useMyAccountGroups.ts
+++ b/packages/twenty-front/src/modules/settings/app-preferences/hooks/useMyAccountGroups.ts
@@ -1,8 +1,10 @@
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
import { groupConnectedAccountsByNativeAccount } from '@/settings/app-preferences/utils/groupConnectedAccountsByNativeAccount';
+import { isPersonalConnectedAccount } from '@/settings/app-preferences/utils/isPersonalConnectedAccount';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
const ACCOUNT_GROUP_PROVIDERS: ReadonlySet<ConnectedAccountProvider> = new Set([
ConnectedAccountProvider.GOOGLE,
@@ -17,13 +19,16 @@ export const useMyAccountGroups = () => {
providers: ACCOUNT_GROUP_PROVIDERS,
});
+ const userWorkspaceId = currentWorkspaceMember?.userWorkspaceId;
+
+ const personalAccounts = isDefined(userWorkspaceId)
+ ? accounts.filter((account) =>
+ isPersonalConnectedAccount({ account, userWorkspaceId }),
+ )
+ : [];
+
return {
- groups: groupConnectedAccountsByNativeAccount(
- accounts.filter(
- (account) =>
- account.userWorkspaceId === currentWorkspaceMember?.userWorkspaceId,
- ),
- ),
+ groups: groupConnectedAccountsByNativeAccount(personalAccounts),
loading,
};
};
diff --git a/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/isPersonalConnectedAccount.test.ts b/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/isPersonalConnectedAccount.test.ts
new file mode 100644
index 00000000000..2e33b535cd1
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/app-preferences/utils/__tests__/isPersonalConnectedAccount.test.ts
@@ -0,0 +1,75 @@
+import { isPersonalConnectedAccount } from '@/settings/app-preferences/utils/isPersonalConnectedAccount';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+
+const MY_USER_WORKSPACE_ID = 'my-user-workspace-id';
+const TEAMMATE_USER_WORKSPACE_ID = 'teammate-user-workspace-id';
+
+const isMine = (
+ account: Parameters<typeof isPersonalConnectedAccount>[0]['account'],
+) =>
+ isPersonalConnectedAccount({
+ account,
+ userWorkspaceId: MY_USER_WORKSPACE_ID,
+ });
+
+describe('isPersonalConnectedAccount', () => {
+ it('keeps my native account', () => {
+ expect(
+ isMine({
+ provider: ConnectedAccountProvider.GOOGLE,
+ scope: 'USER',
+ userWorkspaceId: MY_USER_WORKSPACE_ID,
+ }),
+ ).toBe(true);
+ });
+
+ it('keeps my personal app connection', () => {
+ expect(
+ isMine({
+ provider: ConnectedAccountProvider.APP,
+ scope: 'USER',
+ userWorkspaceId: MY_USER_WORKSPACE_ID,
+ }),
+ ).toBe(true);
+ });
+
+ it('drops my app connection once it is shared with the workspace', () => {
+ expect(
+ isMine({
+ provider: ConnectedAccountProvider.APP,
+ scope: 'WORKSPACE',
+ userWorkspaceId: MY_USER_WORKSPACE_ID,
+ }),
+ ).toBe(false);
+ });
+
+ it('drops a teammate app connection shared with the workspace', () => {
+ expect(
+ isMine({
+ provider: ConnectedAccountProvider.APP,
+ scope: 'WORKSPACE',
+ userWorkspaceId: TEAMMATE_USER_WORKSPACE_ID,
+ }),
+ ).toBe(false);
+ });
+
+ it('drops a teammate native account', () => {
+ expect(
+ isMine({
+ provider: ConnectedAccountProvider.MICROSOFT,
+ scope: 'USER',
+ userWorkspaceId: TEAMMATE_USER_WORKSPACE_ID,
+ }),
+ ).toBe(false);
+ });
+
+ it('keeps my native account that is shared with the workspace', () => {
+ expect(
+ isMine({
+ provider: ConnectedAccountProvider.GOOGLE,
+ scope: 'WORKSPACE',
+ userWorkspaceId: MY_USER_WORKSPACE_ID,
+ }),
+ ).toBe(true);
+ });
+});
diff --git a/packages/twenty-front/src/modules/settings/app-preferences/utils/isPersonalConnectedAccount.ts b/packages/twenty-front/src/modules/settings/app-preferences/utils/isPersonalConnectedAccount.ts
new file mode 100644
index 00000000000..09acc542871
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/app-preferences/utils/isPersonalConnectedAccount.ts
@@ -0,0 +1,13 @@
+import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+
+export const isPersonalConnectedAccount = ({
+ account,
+ userWorkspaceId,
+}: {
+ account: Pick<ConnectedAccount, 'provider' | 'scope' | 'userWorkspaceId'>;
+ userWorkspaceId: string;
+}) =>
+ account.userWorkspaceId === userWorkspaceId &&
+ (account.provider !== ConnectedAccountProvider.APP ||
+ account.scope === 'USER');
diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx
index 2196f1b8a8f..ec7fb441d0a 100644
--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx
@@ -125,11 +125,26 @@ export const AccountsGroupedByEmail: Story = {
canvas.queryByRole('link', { name: '[email protected]' }),
).not.toBeInTheDocument();
- expect(canvas.getByText('[email protected]')).toBeVisible();
expect(canvas.queryByText('[email protected]')).not.toBeInTheDocument();
},
};
+export const WorkspaceSharedAppConnectionsStayOff: Story = {
+ ...accountGroupsStory,
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await canvas.findByText('[email protected]', undefined, { timeout: 3000 });
+
+ expect(canvas.queryByText('[email protected]')).not.toBeInTheDocument();
+ expect(
+ getTableRow(canvasElement, '[email protected]').queryByRole('img', {
+ name: 'Granola',
+ }),
+ ).not.toBeInTheDocument();
+ },
+};
+
export const AccountsHeaderStaysWhileLoading: Story = {
...accountGroupsStory,
parameters: {