📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Changed the structure of project transfer routes
Yevhenii Kulisidic73b45e58b5a
diff --git a/src/project/dto/cancel-transfer-project.dto.ts b/src/project/dto/cancel-transfer-project.dto.tsindex d63de0dee..f92e40c84 100644--- a/src/project/dto/cancel-transfer-project.dto.ts+++ b/src/project/dto/cancel-transfer-project.dto.ts@@ -1,9 +1,4 @@-import { IsUUID, Matches } from 'class-validator'--export class CancelTransferProjectParamsDto {- @Matches(/^(?!.*--)[a-zA-Z0-9-]{12}$/)- readonly projectId: string-}+import { IsUUID } from 'class-validator'export class CancelTransferProjectQueriesDto {@IsUUID('4')diff --git a/src/project/dto/confirm-transfer-project.dto.ts b/src/project/dto/confirm-transfer-project.dto.tsindex fcdfea92f..b0b2382b5 100644--- a/src/project/dto/confirm-transfer-project.dto.ts+++ b/src/project/dto/confirm-transfer-project.dto.ts@@ -1,9 +1,4 @@-import { IsUUID, Matches } from 'class-validator'--export class ConfirmTransferProjectParamsDto {- @Matches(/^(?!.*--)[a-zA-Z0-9-]{12}$/)- readonly projectId: string-}+import { IsUUID } from 'class-validator'export class ConfirmTransferProjectQueriesDto {@IsUUID('4')diff --git a/src/project/dto/transfer-project.dto.ts b/src/project/dto/transfer-project.dto.tsindex de0184b84..d148c2a99 100644--- a/src/project/dto/transfer-project.dto.ts+++ b/src/project/dto/transfer-project.dto.ts@@ -1,11 +1,9 @@import { IsEmail, Matches } from 'class-validator'-export class TransferProjectParamsDto {+export class TransferProjectBodyDto {@Matches(/^(?!.*--)[a-zA-Z0-9-]{12}$/)readonly projectId: string-}-export class TransferProjectBodyDto {@IsEmail()readonly email: string}diff --git a/src/project/project.controller.ts b/src/project/project.controller.tsindex b2043adf8..d30bc96c5 100644--- a/src/project/project.controller.ts+++ b/src/project/project.controller.ts@@ -81,11 +81,8 @@ import {UpdateSubscriberParamsDto,UpdateSubscriberBodyDto,RemoveSubscriberParamsDto,- TransferProjectParamsDto,TransferProjectBodyDto,- ConfirmTransferProjectParamsDto,ConfirmTransferProjectQueriesDto,- CancelTransferProjectParamsDto,CancelTransferProjectQueriesDto,} from './dto'@@ -1271,16 +1268,15 @@ export class ProjectController {)}- @Post(':projectId/transfer')+ @Post('transfer')@Auth([UserType.ADMIN, UserType.CUSTOMER])async transferProject(- @Param() params: TransferProjectParamsDto,@Body() body: TransferProjectBodyDto,@CurrentUserId() userId: string,@Headers() headers: { origin: string },) {const project = await this.projectService.getOwnProject(- params.projectId,+ body.projectId,userId,)@@ -1299,7 +1295,7 @@ export class ProjectController {}await this.projectService.transferProject(- params.projectId,+ body.projectId,project.name,user.id,user.email,@@ -1307,61 +1303,61 @@ export class ProjectController {)}- @Get(':projectId/transfer')+ @Get('transfer')async confirmTransferProject(- @Param() params: ConfirmTransferProjectParamsDto,@Query() queries: ConfirmTransferProjectQueriesDto,) {- const project = await this.projectService.getProjectById(params.projectId)-- if (!project) {- throw new NotFoundException('Project not found.')- }-const actionToken = await this.actionTokensService.getActionToken(queries.token,)if (!actionToken ||- actionToken.action !== ActionTokenType.TRANSFER_PROJECT ||- actionToken.newValue !== params.projectId+ actionToken.action !== ActionTokenType.TRANSFER_PROJECT) {throw new BadRequestException('Invalid token.')}+ const project = await this.projectService.getProjectById(+ actionToken.newValue,+ )++ if (!project) {+ throw new NotFoundException('Project not found.')+ }+await this.projectService.confirmTransferProject(- params.projectId,+ actionToken.newValue,actionToken.user.id,project.admin.id,actionToken.id,)}- @Delete(':projectId/transfer')+ @Delete('transfer')@Auth([UserType.ADMIN, UserType.CUSTOMER])async cancelTransferProject(- @Param() params: CancelTransferProjectParamsDto,@Query() queries: CancelTransferProjectQueriesDto,) {- const project = await this.projectService.getProjectById(params.projectId)-- if (!project) {- throw new NotFoundException('Project not found.')- }-const actionToken = await this.actionTokensService.getActionToken(queries.token,)if (!actionToken ||- actionToken.action !== ActionTokenType.TRANSFER_PROJECT ||- actionToken.newValue !== params.projectId+ actionToken.action !== ActionTokenType.TRANSFER_PROJECT) {throw new BadRequestException('Invalid token.')}+ const project = await this.projectService.getProjectById(+ actionToken.newValue,+ )++ if (!project) {+ throw new NotFoundException('Project not found.')+ }+await this.projectService.cancelTransferProject(actionToken.id)}}