Skip to content

Commit 8ee1eb6

Browse files
authored
Merge pull request #1502 from rocket-admin/backend_turnstile
Backend turnstile
2 parents 4d809c6 + 663dc3e commit 8ee1eb6

File tree

5 files changed

+659
-596
lines changed

5 files changed

+659
-596
lines changed

backend/src/app.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import { SaaSGatewayModule } from './microservices/gateways/saas-gateway.ts/saas
4040
import { SaasModule } from './microservices/saas-microservice/saas.module.js';
4141
import { AppLoggerMiddleware } from './middlewares/logging-middleware/app-logger-middlewate.js';
4242
import { DatabaseModule } from './shared/database/database.module.js';
43+
import { SharedModule } from './shared/shared.module.js';
4344
import { GetHelloUseCase } from './use-cases-app/get-hello.use.case.js';
4445
import { PersonalTableSettingsModule } from './entities/table-settings/personal-table-settings/personal-table-settings.module.js';
4546
import { SavedDbQueryModule } from './entities/visualizations/saved-db-query/saved-db-query.module.js';
@@ -71,6 +72,7 @@ import { DashboardWidgetModule } from './entities/visualizations/dashboard-widge
7172
UserActionModule,
7273
CronJobsModule,
7374
DatabaseModule,
75+
SharedModule,
7476
TableActionModule,
7577
SaasModule,
7678
CompanyInfoModule,

backend/src/entities/company-info/application/dto/invite-user-in-company-and-connection-group.dto.ts

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,26 @@ import { UserRoleEnum } from '../../../user/enums/user-role.enum.js';
33
import { IsEmail, IsEnum, IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
44

55
export class InviteUserInCompanyAndConnectionGroupDto {
6-
@IsOptional()
7-
@IsString()
8-
@IsNotEmpty()
9-
@IsUUID()
10-
@ApiProperty()
11-
groupId: string;
6+
@IsOptional()
7+
@IsString()
8+
@IsNotEmpty()
9+
@IsUUID()
10+
@ApiProperty()
11+
groupId: string;
1212

13-
@IsString()
14-
@IsNotEmpty()
15-
@IsEmail()
16-
@ApiProperty()
17-
email: string;
13+
@IsString()
14+
@IsNotEmpty()
15+
@IsEmail()
16+
@ApiProperty()
17+
email: string;
1818

19-
@IsNotEmpty()
20-
@IsEnum(UserRoleEnum)
21-
@ApiProperty({ enum: UserRoleEnum })
22-
role: UserRoleEnum;
19+
@IsNotEmpty()
20+
@IsEnum(UserRoleEnum)
21+
@ApiProperty({ enum: UserRoleEnum })
22+
role: UserRoleEnum;
23+
24+
@ApiProperty({ description: 'Cloudflare Turnstile token for bot protection' })
25+
@IsOptional()
26+
@IsString()
27+
turnstileToken: string;
2328
}

0 commit comments

Comments
 (0)