* Merge messages and threads * rename messageChannelSync to messageChannelMessage * add merge logic * remove deprecated methods * restore enqueue GmailFullSyncJob after connectedAccount creation
This commit is contained in:
@ -21,13 +21,14 @@ export class GoogleGmailService {
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
) {}
|
||||
|
||||
providerName = 'google';
|
||||
|
||||
async saveConnectedAccount(
|
||||
saveConnectedAccountInput: SaveConnectedAccountInput,
|
||||
) {
|
||||
const {
|
||||
handle,
|
||||
workspaceId,
|
||||
provider,
|
||||
accessToken,
|
||||
refreshToken,
|
||||
workspaceMemberId,
|
||||
@ -43,7 +44,7 @@ export class GoogleGmailService {
|
||||
|
||||
const connectedAccount = await workspaceDataSource?.query(
|
||||
`SELECT * FROM ${dataSourceMetadata.schema}."connectedAccount" WHERE "handle" = $1 AND "provider" = $2 AND "accountOwnerId" = $3`,
|
||||
[handle, provider, workspaceMemberId],
|
||||
[handle, this.providerName, workspaceMemberId],
|
||||
);
|
||||
|
||||
if (connectedAccount.length > 0) {
|
||||
@ -60,7 +61,7 @@ export class GoogleGmailService {
|
||||
[
|
||||
connectedAccountId,
|
||||
handle,
|
||||
provider,
|
||||
this.providerName,
|
||||
accessToken,
|
||||
refreshToken,
|
||||
workspaceMemberId,
|
||||
@ -69,7 +70,7 @@ export class GoogleGmailService {
|
||||
|
||||
await manager.query(
|
||||
`INSERT INTO ${dataSourceMetadata.schema}."messageChannel" ("visibility", "handle", "connectedAccountId", "type") VALUES ($1, $2, $3, $4)`,
|
||||
['share_everything', handle, connectedAccountId, 'gmail'],
|
||||
['share_everything', handle, connectedAccountId, 'email'],
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user