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!

update controller

kruzhambus12aa90510bee
diff --git a/apps/production/src/project/project.controller.ts b/apps/production/src/project/project.controller.ts
index c67cf7f14..bdc27d0db 100644
--- a/apps/production/src/project/project.controller.ts
+++ b/apps/production/src/project/project.controller.ts
@@ -1196,10 +1196,10 @@ export class ProjectController {
@ApiResponse({ status: 200, type: Project })
async update(
@Param('id') id: string,
- @Body() projectDTO: ProjectDTO,
+ @Body() projectDTO: UpdateProjectDto,
@CurrentUserId() uid: string,
): Promise<any> {
- this.logger.log({ projectDTO, uid, id }, 'PUT /project/:id')
+ this.logger.log({ ..._omit(projectDTO, ['password']), uid, id }, 'PUT /project/:id')
this.projectService.validateProject(projectDTO)
const project = await this.projectService.findOne(id, {
relations: ['admin', 'share', 'share.user'],
@@ -1218,7 +1218,15 @@ export class ProjectController {
project.name = projectDTO.name
project.public = projectDTO.public
- await this.projectService.update(id, _omit(project, ['share', 'admin']))
+ if (projectDTO.isPasswordProtected && projectDTO.password) {
+ project.isPasswordProtected = true
+ project.passwordHash = await hash(projectDTO.password, 10)
+ } else {
+ project.isPasswordProtected = false
+ project.passwordHash = null
+ }
+
+ await this.projectService.update(id, _omit(project, ['share', 'admin', 'passwordHash']))
// await updateProjectRedis(id, project)
await deleteProjectRedis(id)
@@ -1271,6 +1279,7 @@ export class ProjectController {
async getOne(
@Param('id') id: string,
@CurrentUserId() uid: string,
+ @Body() body: ProjectPasswordDto,
): Promise<Project | object> {
this.logger.log({ id }, 'GET /project/:id')
if (!isValidPID(id)) {
@@ -1286,6 +1295,13 @@ export class ProjectController {
if (_isEmpty(project)) {
throw new NotFoundException('Project was not found in the database')
}
+
+ if (project.isPasswordProtected && _isEmpty(body.password)) {
+ return {
+ isPasswordProtected: true,
+ id: project.id,
+ }
+ }
this.projectService.allowedToView(project, uid)
diff --git a/apps/production/src/project/project.service.ts b/apps/production/src/project/project.service.ts
index d3edb9095..d65a49068 100644
--- a/apps/production/src/project/project.service.ts
+++ b/apps/production/src/project/project.service.ts
@@ -297,7 +297,7 @@ export class ProjectService {
}
allowedToView(project: Project, uid: string | null, password?: string | null): void {
- if (project.public && project.isPasswordProtected && password) {
+ if (project.isPasswordProtected && password) {
if (compareSync(password, project.passwordHash)) {
return null
}