Deprecate and backfill delete ConnectedAccount twenty standard object (#20752)

# Introduction Following connected account permissions refactor and encryption Removing the old workspace schema twenty standard application connectedAccount objects and related standard fields and index - a lot of deadcode - instance command backfill cleaning the connected account object from workspaces
2026-05-21 13:42:09 +02:00
parent f1b2be041a
commit 9b9c97a049
46 changed files with 1424 additions and 3864 deletions
@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { isNonEmptyString } from '@sniptt/guards';
 import { Command } from 'nest-commander';
 import { type FeatureFlagKey } from 'twenty-shared/types';
-import { Repository } from 'typeorm';
+import { type DeepPartial, Repository } from 'typeorm';

 import { ActiveOrSuspendedWorkspaceCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspace.command-runner';
 import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
@@ -16,10 +16,26 @@ import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-ac
 import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
 import { MessageFolderEntity } from 'src/engine/metadata-modules/message-folder/entities/message-folder.entity';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
-import { type ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { type MessageFolderWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-folder.workspace-entity';
 import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';

+type LegacyConnectedAccountWorkspaceEntity = {
+  id: string;
+  createdAt: Date;
+  updatedAt: Date;
+  handle: string | null;
+  provider: string;
+  accessToken: string | null;
+  refreshToken: string | null;
+  lastSyncHistoryId: string | null;
+  lastCredentialsRefreshedAt: Date | null;
+  authFailedAt: Date | null;
+  accountOwnerId: string;
+  handleAliases: string | null;
+  scopes: string[] | null;
+  connectionParameters: Record<string, unknown> | null;
+};
+
@RegisteredWorkspaceCommand('1.21.0', 1775500012000)
@Command({
  name: 'upgrade:1-21:migrate-messaging-infrastructure-to-metadata',
@@ -65,7 +81,7 @@ export class MigrateMessagingInfrastructureToMetadataCommand extends ActiveOrSus
    const isDryRun = options.dryRun ?? false;

    const connectedAccountWorkspaceRepository =
-      await this.twentyORMGlobalManager.getRepository<ConnectedAccountWorkspaceEntity>(
+      await this.twentyORMGlobalManager.getRepository<LegacyConnectedAccountWorkspaceEntity>(
        workspaceId,
        'connectedAccount',
      );
@@ -203,7 +219,9 @@ export class MigrateMessagingInfrastructureToMetadataCommand extends ActiveOrSus
        });

      if (coreConnectedAccounts.length > 0) {
-        await this.connectedAccountRepository.save(coreConnectedAccounts);
+        await this.connectedAccountRepository.save(
+          coreConnectedAccounts as DeepPartial<ConnectedAccountEntity>[],
+        );
        this.logger.log(
          `Migrated ${coreConnectedAccounts.length} connected accounts for workspace ${workspaceId}`,
        );
@@ -1,8 +1,9 @@
 import { Module } from '@nestjs/common';

 import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
-import { DropFavoriteObjectsCommand } from 'src/database/commands/upgrade-version-command/2-7/2-7-workspace-command-1798000030000-drop-favorite-objects.command';
 import { SyncCommandMenuItemAvailabilityExpressionsCommand } from 'src/database/commands/upgrade-version-command/2-7/2-7-workspace-command-1798000020000-sync-command-menu-item-availability-expressions.command';
+import { DropFavoriteObjectsCommand } from 'src/database/commands/upgrade-version-command/2-7/2-7-workspace-command-1798000030000-drop-favorite-objects.command';
+import { DropConnectedAccountStandardObjectCommand } from 'src/database/commands/upgrade-version-command/2-7/2-7-workspace-command-1798000040000-drop-connected-account-standard-object.command';
 import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@@ -19,6 +20,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
  providers: [
    DropFavoriteObjectsCommand,
    SyncCommandMenuItemAvailabilityExpressionsCommand,
+    DropConnectedAccountStandardObjectCommand,
  ],
 })
 export class V2_7_UpgradeVersionCommandModule {}
@@ -0,0 +1,144 @@
+import { Command } from 'nest-commander';
+
+import { ActiveOrSuspendedWorkspaceCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+const CONNECTED_ACCOUNT_OBJECT_UNIVERSAL_IDENTIFIER =
+  '20202020-977e-46b2-890b-c3002ddfd5c5';
+
+const WORKSPACE_MEMBER_CONNECTED_ACCOUNTS_FIELD_UNIVERSAL_IDENTIFIER =
+  '20202020-e322-4bde-a525-727079b4a100';
+
+const MESSAGE_CHANNEL_CONNECTED_ACCOUNT_FIELD_UNIVERSAL_IDENTIFIER =
+  '20202020-49a2-44a4-b470-282c0440d15d';
+
+const CALENDAR_CHANNEL_CONNECTED_ACCOUNT_FIELD_UNIVERSAL_IDENTIFIER =
+  '20202020-95b1-4f44-82dc-61b042ae2414';
+
+@RegisteredWorkspaceCommand('2.7.0', 1798000040000)
+@Command({
+  name: 'upgrade:2-7:drop-connected-account-standard-object',
+  description:
+    'Drop the connectedAccount standard object from workspace schemas (moved to core metadata)',
+})
+export class DropConnectedAccountStandardObjectCommand extends ActiveOrSuspendedWorkspaceCommandRunner {
+  constructor(
+    protected readonly workspaceIteratorService: WorkspaceIteratorService,
+    private readonly applicationService: ApplicationService,
+    private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+    private readonly workspaceCacheService: WorkspaceCacheService,
+  ) {
+    super(workspaceIteratorService);
+  }
+
+  override async runOnWorkspace({
+    workspaceId,
+    options,
+  }: RunOnWorkspaceArgs): Promise<void> {
+    const isDryRun = options.dryRun ?? false;
+
+    this.logger.log(
+      `${isDryRun ? '[DRY RUN] ' : ''}Starting connectedAccount standard object removal for workspace ${workspaceId}`,
+    );
+
+    const { flatObjectMetadataMaps, flatFieldMetadataMaps } =
+      await this.workspaceCacheService.getOrRecompute(workspaceId, [
+        'flatObjectMetadataMaps',
+        'flatFieldMetadataMaps',
+      ]);
+
+    const connectedAccountObjectMetadata =
+      findFlatEntityByUniversalIdentifier<FlatObjectMetadata>({
+        flatEntityMaps: flatObjectMetadataMaps,
+        universalIdentifier: CONNECTED_ACCOUNT_OBJECT_UNIVERSAL_IDENTIFIER,
+      });
+
+    const relationFieldsToDelete = [
+      WORKSPACE_MEMBER_CONNECTED_ACCOUNTS_FIELD_UNIVERSAL_IDENTIFIER,
+      MESSAGE_CHANNEL_CONNECTED_ACCOUNT_FIELD_UNIVERSAL_IDENTIFIER,
+      CALENDAR_CHANNEL_CONNECTED_ACCOUNT_FIELD_UNIVERSAL_IDENTIFIER,
+    ]
+      .map((universalIdentifier) =>
+        findFlatEntityByUniversalIdentifier<FlatFieldMetadata>({
+          flatEntityMaps: flatFieldMetadataMaps,
+          universalIdentifier,
+        }),
+      )
+      .filter((field): field is FlatFieldMetadata => field !== undefined);
+
+    if (
+      !connectedAccountObjectMetadata &&
+      relationFieldsToDelete.length === 0
+    ) {
+      this.logger.log(
+        `connectedAccount standard object already absent for workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    if (isDryRun) {
+      this.logger.log(
+        `[DRY RUN] Would delete connectedAccount standard object and ${relationFieldsToDelete.length} relation fields for workspace ${workspaceId}`,
+      );
+
+      return;
+    }
+
+    const { twentyStandardFlatApplication } =
+      await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+        { workspaceId },
+      );
+
+    const validateAndBuildResult =
+      await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+        {
+          allFlatEntityOperationByMetadataName: {
+            ...(connectedAccountObjectMetadata
+              ? {
+                  objectMetadata: {
+                    flatEntityToCreate: [],
+                    flatEntityToDelete: [connectedAccountObjectMetadata],
+                    flatEntityToUpdate: [],
+                  },
+                }
+              : {}),
+            ...(relationFieldsToDelete.length > 0
+              ? {
+                  fieldMetadata: {
+                    flatEntityToCreate: [],
+                    flatEntityToDelete: relationFieldsToDelete,
+                    flatEntityToUpdate: [],
+                  },
+                }
+              : {}),
+          },
+          workspaceId,
+          applicationUniversalIdentifier:
+            twentyStandardFlatApplication.universalIdentifier,
+        },
+      );
+
+    if (validateAndBuildResult.status === 'fail') {
+      this.logger.error(
+        `Failed to delete connectedAccount standard object:\n${JSON.stringify(validateAndBuildResult, null, 2)}`,
+      );
+
+      throw new Error(
+        `Failed to delete connectedAccount standard object for workspace ${workspaceId}`,
+      );
+    }
+
+    this.logger.log(
+      `Deleted connectedAccount standard object and relation fields for workspace ${workspaceId}`,
+    );
+  }
+}