admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[calendar/messaging] fix google refresh token transaction (#4989)

Browse Source 
## Context
The full-sync job was enqueued within a transaction, which means it
could be executed before the transaction was commit and
connected-account was not created yet.
This PR re-arrange the code a bit to avoid this

cc @bosiraphael thx for flagging this!
This commit is contained in:
Weiko
2024-04-16 15:06:37 +02:00
committed by GitHub
parent cd6ed867be
commit 4bf23780a1
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
View File

@ -84,23 +84,23 @@ export class GoogleAPIsService {
const isCalendarEnabled =
this.environmentService.get('CALENDAR_PROVIDER_GOOGLE_ENABLED') &&
!!isCalendarEnabledFlag;
!!isCalendarEnabledFlag?.value;
const connectedAccounts =
await this.connectedAccountRepository.getAllByHandleAndWorkspaceMemberId(
handle,
workspaceMemberId,
workspaceId,
);
const existingAccountId = connectedAccounts?.[0]?.id;
const newOrExistingConnectedAccountId = existingAccountId ?? v4();
await workspaceDataSource?.transaction(async (manager: EntityManager) => {
const connectedAccounts =
await this.connectedAccountRepository.getAllByHandleAndWorkspaceMemberId(
handle,
workspaceMemberId,
workspaceId,
manager,
);
if (!connectedAccounts || connectedAccounts?.length === 0) {
const newConnectedAccountId = v4();
if (!existingAccountId) {
await this.connectedAccountRepository.create(
{
id: newConnectedAccountId,
id: newOrExistingConnectedAccountId,
handle,
provider: ConnectedAccountProvider.GOOGLE,
accessToken: input.accessToken,
@ -114,7 +114,7 @@ export class GoogleAPIsService {
await this.messageChannelRepository.create(
{
id: v4(),
connectedAccountId: newConnectedAccountId,
connectedAccountId: newOrExistingConnectedAccountId,
type: MessageChannelType.EMAIL,
handle,
visibility: MessageChannelVisibility.SHARE_EVERYTHING,
@ -127,7 +127,7 @@ export class GoogleAPIsService {
await this.calendarChannelRepository.create(
{
id: v4(),
connectedAccountId: newConnectedAccountId,
connectedAccountId: newOrExistingConnectedAccountId,
handle,
visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
},
@ -135,34 +135,28 @@ export class GoogleAPIsService {
manager,
);
}
await this.enqueueSyncJobs(
newConnectedAccountId,
workspaceId,
isCalendarEnabled,
);
} else {
await this.connectedAccountRepository.updateAccessTokenAndRefreshToken(
input.accessToken,
input.refreshToken,
connectedAccounts[0].id,
newOrExistingConnectedAccountId,
workspaceId,
manager,
);
await this.messageChannelRepository.resetSync(
connectedAccounts[0].id,
newOrExistingConnectedAccountId,
workspaceId,
manager,
);
await this.enqueueSyncJobs(
connectedAccounts[0].id,
workspaceId,
isCalendarEnabled,
);
}
});
await this.enqueueSyncJobs(
newOrExistingConnectedAccountId,
workspaceId,
isCalendarEnabled,
);
}
private async enqueueSyncJobs(