remove IMAP_SMTP_CALDAV feature flag (#16695)

To be merged after https://github.com/twentyhq/twenty/pull/16479 https://github.com/twentyhq/twenty/pull/16694
2025-12-19 22:50:12 +05:30
parent 6355557356
commit d30580fc4e
12 changed files with 7 additions and 50 deletions
@@ -1309,7 +1309,6 @@ export enum FeatureFlagKey {
  IS_DASHBOARD_V2_ENABLED = 'IS_DASHBOARD_V2_ENABLED',
  IS_EMAILING_DOMAIN_ENABLED = 'IS_EMAILING_DOMAIN_ENABLED',
  IS_GLOBAL_WORKSPACE_DATASOURCE_ENABLED = 'IS_GLOBAL_WORKSPACE_DATASOURCE_ENABLED',
-  IS_IMAP_SMTP_CALDAV_ENABLED = 'IS_IMAP_SMTP_CALDAV_ENABLED',
  IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
  IS_PAGE_LAYOUT_ENABLED = 'IS_PAGE_LAYOUT_ENABLED',
  IS_POSTGRESQL_INTEGRATION_ENABLED = 'IS_POSTGRESQL_INTEGRATION_ENABLED',
@@ -1292,7 +1292,6 @@ export enum FeatureFlagKey {
  IS_DASHBOARD_V2_ENABLED = 'IS_DASHBOARD_V2_ENABLED',
  IS_EMAILING_DOMAIN_ENABLED = 'IS_EMAILING_DOMAIN_ENABLED',
  IS_GLOBAL_WORKSPACE_DATASOURCE_ENABLED = 'IS_GLOBAL_WORKSPACE_DATASOURCE_ENABLED',
-  IS_IMAP_SMTP_CALDAV_ENABLED = 'IS_IMAP_SMTP_CALDAV_ENABLED',
  IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
  IS_PAGE_LAYOUT_ENABLED = 'IS_PAGE_LAYOUT_ENABLED',
  IS_POSTGRESQL_INTEGRATION_ENABLED = 'IS_POSTGRESQL_INTEGRATION_ENABLED',
@@ -1,4 +1,5 @@
 import { createState } from 'twenty-ui/utilities';
+
 export const isImapSmtpCaldavEnabledState = createState<boolean>({
  key: 'isImapSmtpCaldavEnabled',
  defaultValue: false,
@@ -1,10 +1,10 @@
 import { isGoogleCalendarEnabledState } from '@/client-config/states/isGoogleCalendarEnabledState';
 import { isGoogleMessagingEnabledState } from '@/client-config/states/isGoogleMessagingEnabledState';
+import { isImapSmtpCaldavEnabledState } from '@/client-config/states/isImapSmtpCaldavEnabledState';
 import { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicrosoftCalendarEnabledState';
 import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';
 import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { SettingsCard } from '@/settings/components/SettingsCard';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useLingui } from '@lingui/react/macro';
@@ -13,7 +13,6 @@ import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
 import { getSettingsPath } from 'twenty-shared/utils';
 import { IconAt, IconGoogle, IconMicrosoft } from 'twenty-ui/display';
 import { UndecoratedLink } from 'twenty-ui/navigation';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';

 const StyledCardsContainer = styled.div`
  display: flex;
@@ -40,9 +39,7 @@ export const SettingsAccountsListEmptyStateCard = () => {
    isMicrosoftCalendarEnabledState,
  );

-  const isImapSmtpCaldavFeatureFlagEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IS_IMAP_SMTP_CALDAV_ENABLED,
-  );
+  const isImapSmtpCaldavEnabled = useRecoilValue(isImapSmtpCaldavEnabledState);

  return (
    <StyledCardsContainer>
@@ -62,7 +59,7 @@ export const SettingsAccountsListEmptyStateCard = () => {
        />
      )}

-      {isImapSmtpCaldavFeatureFlagEnabled && (
+      {isImapSmtpCaldavEnabled && (
        <UndecoratedLink
          to={getSettingsPath(SettingsPath.NewImapSmtpCaldavConnection)}
        >
@@ -15,7 +15,7 @@ FRONTEND_URL=http://localhost:3001
 # REFRESH_TOKEN_EXPIRES_IN=90d
 # FILE_TOKEN_EXPIRES_IN=1d
 # MESSAGING_PROVIDER_GMAIL_ENABLED=false
-# IS_IMAP_SMTP_CALDAV_ENABLED=false
+# IS_IMAP_SMTP_CALDAV_ENABLED=true
 # CALENDAR_PROVIDER_GOOGLE_ENABLED=false
 # MESSAGING_PROVIDER_MICROSOFT_ENABLED=false
 # CALENDAR_PROVIDER_MICROSOFT_ENABLED=false
@@ -12,7 +12,7 @@ FRONTEND_URL=http://localhost:3001

 AUTH_GOOGLE_ENABLED=false
 MESSAGING_PROVIDER_GMAIL_ENABLED=false
-IS_IMAP_SMTP_CALDAV_ENABLED=false
+IS_IMAP_SMTP_CALDAV_ENABLED=true
 CALENDAR_PROVIDER_GOOGLE_ENABLED=false
 MESSAGING_PROVIDER_MICROSOFT_ENABLED=false
 CALENDAR_PROVIDER_MICROSOFT_ENABLED=false
@@ -12,16 +12,6 @@ export type PublicFeatureFlag = {
 };

 export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [
-  {
-    key: FeatureFlagKey.IS_IMAP_SMTP_CALDAV_ENABLED,
-    metadata: {
-      label: 'IMAP, SMTP, CalDAV',
-      description:
-        'Easily add email accounts from any provider that supports IMAP, send emails with SMTP (and soon, sync calendars with CalDAV)',
-      imagePath:
-        'https://twenty.com/images/lab/is-imap-smtp-caldav-enabled.png',
-    },
-  },
  {
    key: FeatureFlagKey.IS_PAGE_LAYOUT_ENABLED,
    metadata: {
@@ -6,7 +6,6 @@ export enum FeatureFlagKey {
  IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
  IS_AI_ENABLED = 'IS_AI_ENABLED',
  IS_APPLICATION_ENABLED = 'IS_APPLICATION_ENABLED',
-  IS_IMAP_SMTP_CALDAV_ENABLED = 'IS_IMAP_SMTP_CALDAV_ENABLED',
  IS_PAGE_LAYOUT_ENABLED = 'IS_PAGE_LAYOUT_ENABLED',
  IS_RECORD_PAGE_LAYOUT_ENABLED = 'IS_RECORD_PAGE_LAYOUT_ENABLED',
  IS_PUBLIC_DOMAIN_ENABLED = 'IS_PUBLIC_DOMAIN_ENABLED',
@@ -1,10 +1,4 @@
-import {
-  HttpException,
-  HttpStatus,
-  UseFilters,
-  UseGuards,
-  UsePipes,
-} from '@nestjs/common';
+import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';

 import { PermissionFlagType } from 'twenty-shared/constants';
@@ -12,8 +6,6 @@ import { isDefined } from 'twenty-shared/utils';

 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
 import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
 import { ConnectedImapSmtpCaldavAccountDTO } from 'src/engine/core-modules/imap-smtp-caldav-connection/dtos/imap-smtp-caldav-connected-account.dto';
@@ -36,7 +28,6 @@ export class ImapSmtpCaldavResolver {
  constructor(
    private readonly ImapSmtpCaldavConnectionService: ImapSmtpCaldavService,
    private readonly imapSmtpCaldavApisService: ImapSmtpCalDavAPIService,
-    private readonly featureFlagService: FeatureFlagService,
    private readonly mailConnectionValidatorService: ImapSmtpCaldavValidatorService,
  ) {}

@@ -78,19 +69,6 @@ export class ImapSmtpCaldavResolver {
    @AuthWorkspace() workspace: WorkspaceEntity,
    @Args('id', { type: () => UUIDScalarType, nullable: true }) id?: string,
  ): Promise<ImapSmtpCaldavConnectionSuccessDTO> {
-    const isImapSmtpCaldavFeatureFlagEnabled =
-      await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IS_IMAP_SMTP_CALDAV_ENABLED,
-        workspace.id,
-      );
-
-    if (!isImapSmtpCaldavFeatureFlagEnabled) {
-      throw new HttpException(
-        'IMAP, SMTP, CalDAV feature is not enabled for this workspace',
-        HttpStatus.FORBIDDEN,
-      );
-    }
-
    const validatedParams = await this.validateAndTestConnectionParameters(
      connectionParameters,
      handle,
@@ -232,7 +232,6 @@ describe('WorkspaceEntityManager', () => {
        IS_JSON_FILTER_ENABLED: false,
        IS_AI_ENABLED: false,
        IS_APPLICATION_ENABLED: false,
-        IS_IMAP_SMTP_CALDAV_ENABLED: false,
        IS_PAGE_LAYOUT_ENABLED: false,
        IS_RECORD_PAGE_LAYOUT_ENABLED: false,
        IS_PUBLIC_DOMAIN_ENABLED: false,
@@ -51,11 +51,6 @@ export const seedFeatureFlags = async ({
        workspaceId: workspaceId,
        value: true,
      },
-      {
-        key: FeatureFlagKey.IS_IMAP_SMTP_CALDAV_ENABLED,
-        workspaceId: workspaceId,
-        value: true,
-      },
      {
        key: FeatureFlagKey.IS_PAGE_LAYOUT_ENABLED,
        workspaceId: workspaceId,