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

2813 create message channel data model (#2952)

Browse Source 
* create model

* finished model

* modidied visibility type to select

* changed back to TEXT

* handle instead of email

* handle instead of email

* handle instead of email

* modified according to comment
This commit is contained in:
bosiraphael
2023-12-12 15:14:18 +01:00
committed by GitHub
parent 44f1fe54e1
commit 6bc7a58902
8 changed files with 88 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-server/src/core/auth/controllers/google-gmail-auth.controller.ts
View File

@ -36,7 +36,7 @@ export class GoogleGmailAuthController {
await this.tokenService.verifyTransientToken(transientToken);
this.googleGmailService.saveConnectedAccount({
email,
handle: email,
workspaceMemberId: workspaceMemberId,
workspaceId: workspaceId,
provider: 'gmail',

6
packages/twenty-server/src/core/auth/dto/save-connected-account.ts
View File

@ -1,13 +1,13 @@
import { ArgsType, Field } from '@nestjs/graphql';
import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
import { IsNotEmpty, IsString } from 'class-validator';
@ArgsType()
export class SaveConnectedAccountInput {
@Field(() => String)
@IsNotEmpty()
@IsEmail()
email: string;
@IsString()
handle: string;
@Field(() => String)
@IsNotEmpty()

10
packages/twenty-server/src/core/auth/services/google-gmail.service.ts
View File

@ -15,7 +15,7 @@ export class GoogleGmailService {
saveConnectedAccountInput: SaveConnectedAccountInput,
) {
const {
email,
handle,
workspaceId,
provider,
accessToken,
@ -33,8 +33,8 @@ export class GoogleGmailService {
);
const connectedAccount = await workspaceDataSource?.query(
`SELECT * FROM ${dataSourceMetadata.schema}."connectedAccount" WHERE "email" = $1 AND "provider" = $2 AND "accountOwnerId" = $3`,
[email, provider, workspaceMemberId],
`SELECT * FROM ${dataSourceMetadata.schema}."connectedAccount" WHERE "handle" = $1 AND "provider" = $2 AND "accountOwnerId" = $3`,
[handle, provider, workspaceMemberId],
);
if (connectedAccount.length > 0) {
@ -44,8 +44,8 @@ export class GoogleGmailService {
}
await workspaceDataSource?.query(
`INSERT INTO ${dataSourceMetadata.schema}."connectedAccount" ("email", "provider", "accessToken", "refreshToken", "accountOwnerId") VALUES ($1, $2, $3, $4, $5)`,
[email, provider, accessToken, refreshToken, workspaceMemberId],
`INSERT INTO ${dataSourceMetadata.schema}."connectedAccount" ("handle", "provider", "accessToken", "refreshToken", "accountOwnerId") VALUES ($1, $2, $3, $4, $5)`,
[handle, provider, accessToken, refreshToken, workspaceMemberId],
);
return;