Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix: create captcha

kruzhambus17e7a0df8361
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index e376c8b42..82f4f2c51 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -177,6 +177,7 @@ export class ProjectController {
return _map(projects, (p: Project) => ({
id: p.id,
name: p.name,
+ isCaptchaProject: p.isCaptchaProject,
}))
}
@@ -1249,6 +1250,65 @@ export class ProjectController {
}
}
+ @Put('captcha/inherited/:id')
+ @HttpCode(200)
+ @UseGuards(JwtAccessTokenGuard, RolesGuard)
+ @Roles(UserType.CUSTOMER, UserType.ADMIN)
+ @ApiResponse({ status: 200, type: Project })
+ async createCaptchaInherited(
+ @Param('id') id: string,
+ @CurrentUserId() uid: string,
+ ): Promise<any> {
+ this.logger.log({ uid, id }, 'PUT /project/captcha/inherited/:id')
+
+ if (!isValidPID(id)) {
+ throw new BadRequestException(
+ 'The provided Project ID (pid) is incorrect',
+ )
+ }
+
+ let project
+
+ project = await this.projectService.findOne(id, {
+ relations: ['admin', 'share', 'share.user'],
+ })
+ const user = await this.userService.findOne(uid)
+
+ if (_isEmpty(project)) {
+ throw new NotFoundException()
+ }
+
+ this.projectService.allowedToManage(project, uid, user.roles)
+
+ if (project.isCaptchaProject) {
+ throw new BadRequestException(
+ 'This project is already a CAPTCHA project',
+ )
+ }
+
+ if (project.isAnalyticsProject) {
+ const captchaProjects = _filter(
+ user.projects,
+ (fProject: Project) => fProject.isCaptchaProject,
+ )
+ const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjects
+
+ if (_size(captchaProjects >= (maxProjects || PROJECTS_MAXIMUM))) {
+ throw new ForbiddenException(
+ `You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,
+ )
+ }
+
+ project.isCaptchaProject = true
+ project.isCaptchaEnabled = true
+ }
+
+ await this.projectService.update(id, _omit(project, ['share', 'admin']))
+
+ return project
+ }
+
+
@Put('/:id')
@HttpCode(200)
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@@ -1296,23 +1356,6 @@ export class ProjectController {
project.name = projectDTO.name
project.public = projectDTO.public
- if (project.isAnalyticsProject && projectDTO.isCaptcha) {
- const captchaProjects = _filter(
- user.projects,
- (fProject: Project) => fProject.isCaptchaProject,
- )
- const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjects
-
- if (_size(captchaProjects >= (maxProjects || PROJECTS_MAXIMUM))) {
- throw new ForbiddenException(
- `You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,
- )
- }
-
- project.isCaptchaProject = true
- project.isCaptchaEnabled = true
- }
-
await this.projectService.update(id, _omit(project, ['share', 'admin']))
}