The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(messaging): pin Google OAuth2 client to native fetch (#21668)
neo773b076c35848ff
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-service-availability.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-service-availability.service.tsindex 35c89916f5b..f445eddc16f 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-service-availability.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-service-availability.service.ts@@ -20,10 +20,11 @@ export class GoogleApisServiceAvailabilityService {async checkServicesAvailability(accessToken: string,): Promise<GoogleApisServiceAvailability> {- const oAuth2Client = new google.auth.OAuth2(- this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_ID'),- this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_SECRET'),- );+ const oAuth2Client = new google.auth.OAuth2({+ clientId: this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_ID'),+ clientSecret: this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_SECRET'),+ transporterOptions: { fetchImplementation: fetch },+ });oAuth2Client.setCredentials({access_token: accessToken,diff --git a/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/google/google-oauth2-client.provider.ts b/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/google/google-oauth2-client.provider.tsindex f78e34613c6..6d4a3a3d4d6 100644--- a/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/google/google-oauth2-client.provider.ts+++ b/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/google/google-oauth2-client.provider.ts@@ -72,7 +72,11 @@ export class GoogleOAuth2ClientProvider {);try {- const oAuth2Client = new google.auth.OAuth2(clientId, clientSecret);+ const oAuth2Client = new google.auth.OAuth2({+ clientId,+ clientSecret,+ transporterOptions: { fetchImplementation: fetch },+ });oAuth2Client.setCredentials({ refresh_token: plaintextRefreshToken });diff --git a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.ts b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.tsindex 997aff47ea8..1e93b04bb97 100644--- a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.ts+++ b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.ts@@ -19,10 +19,11 @@ export class GoogleAPIRefreshAccessTokenService {async refreshTokens(refreshToken: PlaintextString,): Promise<ConnectedAccountPlaintextTokens> {- const oAuth2Client = new google.auth.OAuth2(- this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_ID'),- this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_SECRET'),- );+ const oAuth2Client = new google.auth.OAuth2({+ clientId: this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_ID'),+ clientSecret: this.twentyConfigService.get('AUTH_GOOGLE_CLIENT_SECRET'),+ transporterOptions: { fetchImplementation: fetch },+ });oAuth2Client.setCredentials({refresh_token: refreshToken,