5748 Create contacts for emails sent and received by email aliases

packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts

@@ -45,6 +45,11 @@ export const seedFeatureFlags = async (
         workspaceId: workspaceId,
         value: true,
       },
+      {
+        key: FeatureFlagKeys.IsProfileEmailsReadEnabled,
+        workspaceId: workspaceId,
+        value: true,
+      },
       {
         key: FeatureFlagKeys.IsGoogleCalendarSyncV2Enabled,
         workspaceId: workspaceId,

packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts

@@ -9,7 +9,6 @@ import {
 
 import { Response } from 'express';
 
-import { GoogleAPIsProviderEnabledGuard } from 'src/engine/core-modules/auth/guards/google-apis-provider-enabled.guard';
 import { GoogleAPIsOauthGuard } from 'src/engine/core-modules/auth/guards/google-apis-oauth.guard';
 import { GoogleAPIsRequest } from 'src/engine/core-modules/auth/strategies/google-apis.auth.strategy';
 import { GoogleAPIsService } from 'src/engine/core-modules/auth/services/google-apis.service';
@@ -29,22 +28,22 @@ export class GoogleAPIsAuthController {
   ) {}
 
   @Get()
-  @UseGuards(GoogleAPIsProviderEnabledGuard, GoogleAPIsOauthGuard)
+  @UseGuards(GoogleAPIsOauthGuard)
   async googleAuth() {
     // As this method is protected by Google Auth guard, it will trigger Google SSO flow
     return;
   }
 
   @Get('get-access-token')
-  @UseGuards(GoogleAPIsProviderEnabledGuard, GoogleAPIsOauthGuard)
+  @UseGuards()
   async googleAuthGetAccessToken(
     @Req() req: GoogleAPIsRequest,
     @Res() res: Response,
   ) {
     const { user } = req;
 
     const {
-      email,
+      emails,
       accessToken,
       refreshToken,
       transientToken,
@@ -68,14 +67,16 @@ export class GoogleAPIsAuthController {
       throw new Error('Workspace not found');
     }
 
+    const handle = emails[0].value;
+
     const googleAPIsServiceInstance =
       await this.loadServiceWithWorkspaceContext.load(
         this.googleAPIsService,
         workspaceId,
       );
 
     await googleAPIsServiceInstance.refreshGoogleRefreshToken({
-      handle: email,
+      handle,
       workspaceMemberId: workspaceMemberId,
       workspaceId: workspaceId,
       accessToken,

packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth.guard.ts

@@ -1,9 +1,32 @@
-import { ExecutionContext, Injectable } from '@nestjs/common';
+import {
+  ExecutionContext,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
+import {
+  GoogleAPIScopeConfig,
+  GoogleAPIsStrategy,
+} from 'src/engine/core-modules/auth/strategies/google-apis.auth.strategy';
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 
 @Injectable()
 export class GoogleAPIsOauthGuard extends AuthGuard('google-apis') {
-  constructor() {
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly tokenService: TokenService,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {
     super({
       prompt: 'select_account',
     });
@@ -16,6 +39,31 @@ export class GoogleAPIsOauthGuard extends AuthGuard('google-apis') {
     const calendarVisibility = request.query.calendarVisibility;
     const messageVisibility = request.query.messageVisibility;
 
+    if (
+      !this.environmentService.get('MESSAGING_PROVIDER_GMAIL_ENABLED') &&
+      !this.environmentService.get('CALENDAR_PROVIDER_GOOGLE_ENABLED')
+    ) {
+      throw new NotFoundException('Google apis auth is not enabled');
+    }
+
+    const { workspaceId } =
+      await this.tokenService.verifyTransientToken(transientToken);
+
+    const scopeConfig: GoogleAPIScopeConfig = {
+      isCalendarEnabled: !!this.environmentService.get(
+        'MESSAGING_PROVIDER_GMAIL_ENABLED',
+      ),
+      isProfileEmailsReadEnabled: !!(await this.featureFlagRepository.findOneBy(
+        {
+          workspaceId,
+          key: FeatureFlagKeys.IsProfileEmailsReadEnabled,
+          value: true,
+        },
+      )),
+    };
+
+    new GoogleAPIsStrategy(this.environmentService, scopeConfig);
+
     if (transientToken && typeof transientToken === 'string') {
       request.params.transientToken = transientToken;
     }

packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis.auth.strategy.ts

@@ -15,7 +15,7 @@ export type GoogleAPIsRequest = Omit<
   user: {
     firstName?: string | null;
     lastName?: string | null;
-    email: string;
+    emails: { value: string }[];
     picture: string | null;
     workspaceInviteHash?: string;
     accessToken: string;
@@ -29,6 +29,7 @@ export type GoogleAPIsRequest = Omit<
 
 export type GoogleAPIScopeConfig = {
   isCalendarEnabled?: boolean;
+  isProfileEmailsReadEnabled?: boolean;
 };
 
 @Injectable()
@@ -53,6 +54,10 @@ export class GoogleAPIsStrategy extends PassportStrategy(
       scope.push('https://www.googleapis.com/auth/calendar.events');
     }
 
+    if (scopeConfig?.isProfileEmailsReadEnabled) {
+      scope.push('https://www.googleapis.com/auth/profile.emails.read');
+    }
+
     super({
       clientID: environmentService.get('AUTH_GOOGLE_CLIENT_ID'),
       clientSecret: environmentService.get('AUTH_GOOGLE_CLIENT_SECRET'),
@@ -93,7 +98,7 @@ export class GoogleAPIsStrategy extends PassportStrategy(
         : undefined;
 
     const user: GoogleAPIsRequest['user'] = {
-      email: emails[0].value,
+      emails,
       firstName: name.givenName,
       lastName: name.familyName,
       picture: photos?.[0]?.value,

packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts

@@ -22,6 +22,7 @@ export enum FeatureFlagKeys {
   IsPostgreSQLIntegrationEnabled = 'IS_POSTGRESQL_INTEGRATION_ENABLED',
   IsStripeIntegrationEnabled = 'IS_STRIPE_INTEGRATION_ENABLED',
   IsContactCreationForSentAndReceivedEmailsEnabled = 'IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED',
+  IsProfileEmailsReadEnabled = 'IS_PROFILE_EMAILS_READ_ENABLED',
   IsGoogleCalendarSyncV2Enabled = 'IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED',
 }
 

packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts

@@ -5,6 +5,7 @@ import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
 
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { IsFeatureEnabledService } from 'src/engine/core-modules/feature-flag/services/is-feature-enabled.service';
 
 @Module({
   imports: [
@@ -17,7 +18,7 @@ import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-
       resolvers: [],
     }),
   ],
-  exports: [],
-  providers: [],
+  exports: [IsFeatureEnabledService],
+  providers: [IsFeatureEnabledService],
 })
 export class FeatureFlagModule {}

packages/twenty-server/src/engine/core-modules/feature-flag/services/is-feature-enabled.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import {
+  FeatureFlagEntity,
+  FeatureFlagKeys,
+} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+
+@Injectable()
+export class IsFeatureEnabledService {
+  constructor(
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+  ) {}
+
+  public async isFeatureEnabled(
+    key: FeatureFlagKeys,
+    workspaceId: string,
+  ): Promise<boolean> {
+    const featureFlag = await this.featureFlagRepository.findOneBy({
+      workspaceId,
+      key,
+      value: true,
+    });
+
+    return !!featureFlag?.value;
+  }
+}

packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts

@@ -59,6 +59,7 @@ export class AddStandardIdCommand extends CommandRunner {
             IS_POSTGRESQL_INTEGRATION_ENABLED: true,
             IS_STRIPE_INTEGRATION_ENABLED: false,
             IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
+            IS_PROFILE_EMAILS_READ_ENABLED: true,
             IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED: true,
           },
         );
@@ -75,6 +76,7 @@ export class AddStandardIdCommand extends CommandRunner {
           IS_POSTGRESQL_INTEGRATION_ENABLED: true,
           IS_STRIPE_INTEGRATION_ENABLED: false,
           IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
+          IS_PROFILE_EMAILS_READ_ENABLED: true,
           IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED: true,
         },
       );

packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts

@@ -136,6 +136,7 @@ export const CONNECTED_ACCOUNT_STANDARD_FIELD_IDS = {
   authFailedAt: '20202020-d268-4c6b-baff-400d402b430a',
   messageChannels: '20202020-24f7-4362-8468-042204d1e445',
   calendarChannels: '20202020-af4a-47bb-99ec-51911c1d3977',
+  emailAliases: '20202020-8a3d-46be-814f-6228af16c47b',
 };
 
 export const EVENT_STANDARD_FIELD_IDS = {

packages/twenty-server/src/modules/calendar/jobs/google-calendar-sync.job.ts

@@ -2,6 +2,9 @@ import { Logger, Scope } from '@nestjs/common';
 
 import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service';
 import { GoogleCalendarSyncService } from 'src/modules/calendar/services/google-calendar-sync/google-calendar-sync.service';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
@@ -21,6 +24,8 @@ export class GoogleCalendarSyncJob {
   constructor(
     private readonly googleAPIsRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
     private readonly googleCalendarSyncService: GoogleCalendarSyncService,
+    @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
   ) {}
 
   @Process(GoogleCalendarSyncJob.name)
@@ -29,9 +34,22 @@ export class GoogleCalendarSyncJob {
       `google calendar sync for workspace ${data.workspaceId} and account ${data.connectedAccountId}`,
     );
     try {
+      const { connectedAccountId, workspaceId } = data;
+
+      const connectedAccount = await this.connectedAccountRepository.getById(
+        connectedAccountId,
+        workspaceId,
+      );
+
+      if (!connectedAccount) {
+        throw new Error(
+          `No connected account found for ${connectedAccountId} in workspace ${workspaceId}`,
+        );
+      }
+
       await this.googleAPIsRefreshAccessTokenService.refreshAndSaveAccessToken(
-        data.workspaceId,
-        data.connectedAccountId,
+        connectedAccount,
+        workspaceId,
       );
     } catch (e) {
       this.logger.error(

packages/twenty-server/src/modules/calendar/services/google-calendar-sync/google-calendar-sync.service.ts

@@ -109,9 +109,8 @@ export class GoogleCalendarSyncService {
     const calendarChannelId = calendarChannel.id;
 
     const { events, nextSyncToken } = await this.getEventsFromGoogleCalendar(
-      refreshToken,
+      connectedAccount,
       workspaceId,
-      connectedAccountId,
       emailOrDomainToReimport,
       syncToken,
     );
@@ -322,9 +321,8 @@ export class GoogleCalendarSyncService {
   }
 
   public async getEventsFromGoogleCalendar(
-    refreshToken: string,
+    connectedAccount: ObjectRecord<ConnectedAccountWorkspaceEntity>,
     workspaceId: string,
-    connectedAccountId: string,
     emailOrDomainToReimport?: string,
     syncToken?: string,
   ): Promise<{
@@ -333,7 +331,7 @@ export class GoogleCalendarSyncService {
   }> {
     const googleCalendarClient =
       await this.googleCalendarClientProvider.getGoogleCalendarClient(
-        refreshToken,
+        connectedAccount,
       );
 
     const startTime = Date.now();
@@ -361,15 +359,15 @@ export class GoogleCalendarSyncService {
 
           await this.calendarChannelRepository.update(
             {
-              id: connectedAccountId,
+              id: connectedAccount.id,
             },
             {
               syncCursor: '',
             },
           );
 
           this.logger.log(
-            `Sync token is no longer valid for connected account ${connectedAccountId} in workspace ${workspaceId}, resetting sync cursor.`,
+            `Sync token is no longer valid for connected account ${connectedAccount.id} in workspace ${workspaceId}, resetting sync cursor.`,
           );
 
           return {
@@ -400,9 +398,9 @@ export class GoogleCalendarSyncService {
     const endTime = Date.now();
 
     this.logger.log(
-      `google calendar sync for workspace ${workspaceId} and account ${connectedAccountId} getting events list in ${
-        endTime - startTime
-      }ms.`,
+      `google calendar sync for workspace ${workspaceId} and account ${
+        connectedAccount.id
+      } getting events list in ${endTime - startTime}ms.`,
     );
 
     return { events, nextSyncToken };