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!

some improvments

kruzhambusf166869ae3f7
diff --git a/apps/production/src/project/dto/project-password.dto.ts b/apps/production/src/project/dto/project-password.dto.ts
index 39c79664d..d04e8de8f 100644
--- a/apps/production/src/project/dto/project-password.dto.ts
+++ b/apps/production/src/project/dto/project-password.dto.ts
@@ -10,7 +10,7 @@ export class ProjectPasswordDto {
'Password must contain at least 8 characters, one uppercase, one lowercase, one number and one special character (!@#$%^&*).',
},
)
- passwordHash?: string | null
+ password?: string | null
@IsOptional()
@ValidateIf(o => o.isPasswordProtected !== null)
diff --git a/apps/production/src/project/project.controller.ts b/apps/production/src/project/project.controller.ts
index 4a1704b69..67da59fbc 100644
--- a/apps/production/src/project/project.controller.ts
+++ b/apps/production/src/project/project.controller.ts
@@ -981,7 +981,7 @@ export class ProjectController {
async checkPassword(
@Param('projectId') projectId: string,
@CurrentUserId() userId: string,
- @Body() body: ProjectPasswordDto,
+ @Headers() body: ProjectPasswordDto,
): Promise<Boolean> {
this.logger.log({ projectId }, 'GET /project/password/:projectId')
@@ -991,8 +991,10 @@ export class ProjectController {
throw new NotFoundException('Project not found.')
}
+ console.log(body.password)
+ console.log(body)
try {
- this.projectService.allowedToView(project, userId, body.passwordHash)
+ this.projectService.allowedToView(project, userId, body.password)
} catch {
return false
}
@@ -1243,9 +1245,9 @@ export class ProjectController {
project.name = projectDTO.name
project.public = projectDTO.public
- if (projectDTO.isPasswordProtected && projectDTO.passwordHash) {
+ if (projectDTO.isPasswordProtected && projectDTO.password) {
project.isPasswordProtected = true
- project.passwordHash = await hash(projectDTO.passwordHash, 10)
+ project.passwordHash = await hash(projectDTO.password, 10)
} else {
project.isPasswordProtected = false
project.passwordHash = null
@@ -1304,7 +1306,7 @@ export class ProjectController {
async getOne(
@Param('id') id: string,
@CurrentUserId() uid: string,
- @Body() body: ProjectPasswordDto,
+ @Headers() body: ProjectPasswordDto,
): Promise<Project | object> {
this.logger.log({ id }, 'GET /project/:id')
if (!isValidPID(id)) {
@@ -1321,7 +1323,7 @@ export class ProjectController {
throw new NotFoundException('Project was not found in the database')
}
- if (project.isPasswordProtected && _isEmpty(body.passwordHash)) {
+ if (project.isPasswordProtected && _isEmpty(body.password)) {
return {
isPasswordProtected: true,
id: project.id,
diff --git a/apps/production/src/project/project.service.ts b/apps/production/src/project/project.service.ts
index d65a49068..ba0469300 100644
--- a/apps/production/src/project/project.service.ts
+++ b/apps/production/src/project/project.service.ts
@@ -298,6 +298,7 @@ export class ProjectService {
allowedToView(project: Project, uid: string | null, password?: string | null): void {
if (project.isPasswordProtected && password) {
+ console.log('project.passwordHash', project.passwordHash, password)
if (compareSync(password, project.passwordHash)) {
return null
}