fixed file typo, featureflag, env var example

2026-03-20 04:04:04 +00:00 · 2024-10-25 22:03:48 +02:00
parent 823d6d860c
commit 0b48e3dd23
14 changed files with 61 additions and 13 deletions
--- a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx
@@ -1,7 +1,7 @@
 import { InformationBanner } from '@/information-banner/components/InformationBanner';
 import { useAccountToReconnect } from '@/information-banner/hooks/useAccountToReconnect';
 import { InformationBannerKeys } from '@/information-banner/types/InformationBannerKeys';
-import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth';
+import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { IconRefresh } from 'twenty-ui';

 export const InformationBannerReconnectAccountEmailAliases = () => {
--- a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx
@@ -1,7 +1,7 @@
 import { InformationBanner } from '@/information-banner/components/InformationBanner';
 import { useAccountToReconnect } from '@/information-banner/hooks/useAccountToReconnect';
 import { InformationBannerKeys } from '@/information-banner/types/InformationBannerKeys';
-import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth';
+import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { IconRefresh } from 'twenty-ui';

 export const InformationBannerReconnectAccountInsufficientPermissions = () => {
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
@@ -1,11 +1,12 @@
 import styled from '@emotion/styled';
 import { IconGoogle, IconMicrosoft } from 'twenty-ui';

-import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth';
+import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { Button } from '@/ui/input/button/components/Button';
 import { Card } from '@/ui/layout/card/components/Card';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
 import { CardHeader } from '@/ui/layout/card/components/CardHeader';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';

 const StyledHeader = styled(CardHeader)`
  align-items: center;
@@ -27,6 +28,9 @@ export const SettingsAccountsListEmptyStateCard = ({
  label,
 }: SettingsAccountsListEmptyStateCardProps) => {
  const { triggerApisOAuth } = useTriggerApisOAuth();
+  const isMicrosoftSyncEnabled = useIsFeatureEnabled(
+    'IS_MICROSOFT_SYNC_ENABLED',
+  );

  return (
    <Card>
@@ -38,12 +42,14 @@ export const SettingsAccountsListEmptyStateCard = ({
          variant="secondary"
          onClick={() => triggerApisOAuth('google')}
        />
-        <Button
-          Icon={IconMicrosoft}
-          title="Connect with Microsoft"
-          variant="secondary"
-          onClick={() => triggerApisOAuth('microsoft')}
-        />
+        {isMicrosoftSyncEnabled && (
+          <Button
+            Icon={IconMicrosoft}
+            title="Connect with Microsoft"
+            variant="secondary"
+            onClick={() => triggerApisOAuth('microsoft')}
+          />
+        )}
      </StyledBody>
    </Card>
  );
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
@@ -10,7 +10,7 @@ import {
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useDestroyOneRecord } from '@/object-record/hooks/useDestroyOneRecord';
-import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth';
+import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
--- a/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerApiOAuth.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerApiOAuth.ts
--- a/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormSendEmail.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowEditActionFormSendEmail.tsx
@@ -2,7 +2,7 @@ import { GMAIL_SEND_SCOPE } from '@/accounts/constants/GmailSendScope';
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth';
+import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { Select, SelectOption } from '@/ui/input/components/Select';
 import { TextArea } from '@/ui/input/components/TextArea';
 import { WorkflowEditActionFormBase } from '@/workflow/components/WorkflowEditActionFormBase';
--- a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts
+++ b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts
@@ -15,4 +15,5 @@ export type FeatureFlagKey =
  | 'IS_ANALYTICS_V2_ENABLED'
  | 'IS_SSO_ENABLED'
  | 'IS_UNIQUE_INDEXES_ENABLED'
-  | 'IS_ARRAY_AND_JSON_FILTER_ENABLED';
+  | 'IS_ARRAY_AND_JSON_FILTER_ENABLED'
+  | 'IS_MICROSOFT_SYNC_ENABLED';
--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
@@ -10,7 +10,7 @@ import { Title } from '@/auth/components/Title';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { OnboardingSyncEmailsSettingsCard } from '@/onboarding/components/OnboardingSyncEmailsSettingsCard';
 import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
-import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth';
+import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { MainButton } from '@/ui/input/button/components/MainButton';
--- a/packages/twenty-server/.env.example
+++ b/packages/twenty-server/.env.example
@@ -32,6 +32,7 @@ REDIS_URL=redis://localhost:6379
 # AUTH_MICROSOFT_TENANT_ID=replace_me_with_azure_tenant_id
 # AUTH_MICROSOFT_CLIENT_SECRET=replace_me_with_azure_client_secret
 # AUTH_MICROSOFT_CALLBACK_URL=http://localhost:3000/auth/microsoft/redirect
+# AUTH_MICROSOFT_APIS_CALLBACK_URL=http://localhost:3000/auth/microsoft-apis/get-access-token
 # AUTH_GOOGLE_ENABLED=false
 # AUTH_GOOGLE_CLIENT_ID=replace_me_with_google_client_id
 # AUTH_GOOGLE_CLIENT_SECRET=replace_me_with_google_client_secret
--- a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
@@ -75,6 +75,11 @@ export const seedFeatureFlags = async (
        workspaceId: workspaceId,
        value: false,
      },
+      {
+        key: FeatureFlagKey.IsMicrosoftSyncEnabled,
+        workspaceId: workspaceId,
+        value: true,
+      },
    ])
    .execute();
 };
--- a/packages/twenty-server/src/engine/core-modules/auth/guards/mircosoft-apis-oauth-request-code.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/mircosoft-apis-oauth-request-code.guard.ts
@@ -1,10 +1,15 @@
 import { ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';

+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
 import { MicrosoftAPIsOauthRequestCodeStrategy } from 'src/engine/core-modules/auth/strategies/microsoft-apis-oauth-request-code.auth.strategy';
 import { TokenService } from 'src/engine/core-modules/auth/token/services/token.service';
 import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+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';

@Injectable()
@@ -24,6 +29,22 @@ export class MicrosoftAPIsOauthRequestCodeGuard extends AuthGuard(
  async canActivate(context: ExecutionContext) {
    const request = context.switchToHttp().getRequest();

+    const { workspaceId } = await this.tokenService.verifyTransientToken(
+      request.query.transientToken,
+    );
+    const isMicrosoftSyncEnabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IsMicrosoftSyncEnabled,
+        workspaceId,
+      );
+
+    if (!isMicrosoftSyncEnabled) {
+      throw new AuthException(
+        'Microsoft sync is not enabled',
+        AuthExceptionCode.FORBIDDEN_EXCEPTION,
+      );
+    }
+
    new MicrosoftAPIsOauthRequestCodeStrategy(this.environmentService);
    setRequestExtraParams(request, {
      transientToken: request.query.transientToken,
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts
@@ -14,4 +14,5 @@ export enum FeatureFlagKey {
  IsGmailSendEmailScopeEnabled = 'IS_GMAIL_SEND_EMAIL_SCOPE_ENABLED',
  IsAnalyticsV2Enabled = 'IS_ANALYTICS_V2_ENABLED',
  IsUniqueIndexesEnabled = 'IS_UNIQUE_INDEXES_ENABLED',
+  IsMicrosoftSyncEnabled = 'IS_MICROSOFT_SYNC_ENABLED',
 }
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
@@ -35,6 +35,12 @@ export class MessagingGetMessageListService {
        return this.gmailGetMessageListService.getFullMessageList(
          connectedAccount,
        );
+      case 'microsoft':
+        // TODO: Placeholder
+        return {
+          messageExternalIds: [],
+          nextSyncCursor: '',
+        };
      default:
        throw new MessageImportException(
          `Provider ${connectedAccount.provider} is not supported`,
@@ -56,6 +62,12 @@ export class MessagingGetMessageListService {
          connectedAccount,
          syncCursor,
        );
+      case 'microsoft':
+        return {
+          messageExternalIds: [],
+          messageExternalIdsToDelete: [],
+          nextSyncCursor: '',
+        };
      default:
        throw new MessageImportException(
          `Provider ${connectedAccount.provider} is not supported`,
--- a/packages/twenty-website/src/content/developers/self-hosting/self-hosting-var.mdx
+++ b/packages/twenty-website/src/content/developers/self-hosting/self-hosting-var.mdx
@@ -79,6 +79,7 @@ yarn command:prod cron:calendar:calendar-event-list-fetch
    ['AUTH_MICROSOFT_TENANT_ID', '', 'Microsoft tenant ID'],
    ['AUTH_MICROSOFT_CLIENT_SECRET', '', 'Microsoft client secret'],
    ['AUTH_MICROSOFT_CALLBACK_URL', 'http://[YourDomain]/auth/microsoft/redirect', 'Microsoft auth callback'],
+    ['AUTH_GOOGLE_APIS_CALLBACK_URL', 'http://[YourDomain]/auth/microsoft-apis/get-access-token', 'Microsoft APIs auth callback'],
    ['FRONT_AUTH_CALLBACK_URL', 'http://localhost:3001/verify ', 'Callback used for Login page'],
    ['IS_SIGN_UP_DISABLED', 'false', 'Disable sign-up'],
    ['PASSWORD_RESET_TOKEN_EXPIRES_IN', '5m', 'Password reset token expiration time'],