📈 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
lint:fix
Blue Mousec45888831925
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.tsindex 07f93fd58..3589026dc 100644--- a/apps/production/src/analytics/analytics.controller.ts+++ b/apps/production/src/analytics/analytics.controller.ts@@ -260,8 +260,8 @@ export class AnalyticsController {async getData(@Query() data: AnalyticsGET_DTO,@CurrentUserId() uid: string,- isCaptcha = false,@Headers() headers: { 'x-password'?: string },+ isCaptcha = false,): Promise<any> {const {pid,@@ -294,7 +294,11 @@ export class AnalyticsController {period,safeTimezone,)- await this.analyticsService.checkProjectAccess(pid, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ pid,+ uid,+ headers['x-password'],+ )let queryCustoms = `SELECT ev, count() FROM customEV WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`let subQuery = `FROM ${@@ -401,7 +405,11 @@ export class AnalyticsController {period,safeTimezone,)- await this.analyticsService.checkProjectAccess(pid, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ pid,+ uid,+ headers['x-password'],+ )let subQuery = `FROM analytics WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`let customEVFilterApplied = false@@ -473,7 +481,11 @@ export class AnalyticsController {period,safeTimezone,)- await this.analyticsService.checkProjectAccess(pid, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ pid,+ uid,+ headers['x-password'],+ )const subQuery = `FROM performance WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`@@ -536,7 +548,11 @@ export class AnalyticsController {period,safeTimezone,)- await this.analyticsService.checkProjectAccess(pid, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ pid,+ uid,+ headers['x-password'],+ )const paramsData = {params: {@@ -585,7 +601,11 @@ export class AnalyticsController {this.analyticsService.validatePeriod(period)}- await this.analyticsService.checkProjectAccess(pid, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ pid,+ uid,+ headers['x-password'],+ )const safeTimezone = this.analyticsService.getSafeTimezone(timezone)const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(@@ -632,7 +652,11 @@ export class AnalyticsController {// fix needed// fix needed// passwords and for projects protected []- await this.analyticsService.checkProjectAccess(currentPID, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ currentPID,+ uid,+ headers['x-password'],+ )})await Promise.all(validationPromises)@@ -700,7 +724,11 @@ export class AnalyticsController {const validationPromises = _map(pidsArray, async currentPID => {this.analyticsService.validatePID(currentPID)- await this.analyticsService.checkProjectAccess(currentPID, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ currentPID,+ uid,+ headers['x-password'],+ )})await Promise.all(validationPromises)@@ -733,7 +761,11 @@ export class AnalyticsController {const { pid } = datathis.analyticsService.validatePID(pid)- await this.analyticsService.checkProjectAccess(pid, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ pid,+ uid,+ headers['x-password'],+ )const keys = await redis.keys(`sd:*:${pid}`)@@ -1056,7 +1088,11 @@ export class AnalyticsController {this.analyticsService.validateTimebucket(timeBucket)const [filtersQuery, filtersParams, parsedFilters] =this.analyticsService.getFiltersQuery(filters, DataType.ANALYTICS)- await this.analyticsService.checkProjectAccess(pid, uid, headers['x-password'])+ await this.analyticsService.checkProjectAccess(+ pid,+ uid,+ headers['x-password'],+ )const safeTimezone = this.analyticsService.getSafeTimezone(timezone)const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.tsindex cae883d36..6fc42f15d 100644--- a/apps/production/src/analytics/analytics.service.ts+++ b/apps/production/src/analytics/analytics.service.ts@@ -213,7 +213,11 @@ export enum DataType {export class AnalyticsService {constructor(private readonly projectService: ProjectService) {}- async checkProjectAccess(pid: string, uid: string | null, password?: string): Promise<void> {+ async checkProjectAccess(+ pid: string,+ uid: string | null,+ password?: string,+ ): Promise<void> {const project = await this.projectService.getRedisProject(pid)this.projectService.allowedToView(project, uid, password)}diff --git a/apps/production/src/project/dto/project-password.dto.ts b/apps/production/src/project/dto/project-password.dto.tsindex d22890d20..7a402993d 100644--- a/apps/production/src/project/dto/project-password.dto.ts+++ b/apps/production/src/project/dto/project-password.dto.ts@@ -1,10 +1,18 @@-import { IsOptional, IsString, MaxLength, MinLength, ValidateIf } from 'class-validator'+import {+ IsOptional,+ IsString,+ MaxLength,+ MinLength,+ ValidateIf,+} from 'class-validator'export const MAX_PROJECT_PASSWORD_LENGTH = 80export class ProjectPasswordDto {@IsString()- @MaxLength(MAX_PROJECT_PASSWORD_LENGTH, { message: 'Max length is $constraint1 characters' })+ @MaxLength(MAX_PROJECT_PASSWORD_LENGTH, {+ message: 'Max length is $constraint1 characters',+ })@MinLength(1, { message: 'Min length is $constraint1 characters' })password?: string | nulldiff --git a/apps/production/src/project/dto/update-project.dto.ts b/apps/production/src/project/dto/update-project.dto.tsindex 2b3ada91f..5b92796b4 100644--- a/apps/production/src/project/dto/update-project.dto.ts+++ b/apps/production/src/project/dto/update-project.dto.ts@@ -13,4 +13,4 @@ export class UpdateProjectDto extends IntersectionType('isCaptcha',] as const),ProjectPasswordDto,-) {}\ No newline at end of file+) {}diff --git a/apps/production/src/project/project.controller.ts b/apps/production/src/project/project.controller.tsindex a1d588b8b..ba0027d97 100644--- a/apps/production/src/project/project.controller.ts+++ b/apps/production/src/project/project.controller.ts@@ -980,7 +980,7 @@ export class ProjectController {@Param('projectId') projectId: string,@CurrentUserId() userId: string,@Headers() headers: { 'x-password'?: string },- ): Promise<Boolean> {+ ): Promise<boolean> {this.logger.log({ projectId }, 'GET /project/password/:projectId')const project = await this.projectService.getProjectById(projectId)@@ -1222,7 +1222,10 @@ export class ProjectController {@Body() projectDTO: UpdateProjectDto,@CurrentUserId() uid: string,): Promise<any> {- this.logger.log({ ..._omit(projectDTO, ['password']), 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'],diff --git a/apps/production/src/project/project.service.ts b/apps/production/src/project/project.service.tsindex f942d16d9..c8cdff574 100644--- a/apps/production/src/project/project.service.ts+++ b/apps/production/src/project/project.service.ts@@ -297,18 +297,23 @@ export class ProjectService {return this.projectsRepository.findOne({ where, ...params })}- allowedToView(project: Project, uid: string | null, password?: string | null): void {+ allowedToView(+ project: Project,+ uid: string | null,+ password?: string | null,+ ): void {if (project.isPasswordProtected && password) {- if (_size(password) <= MAX_PROJECT_PASSWORD_LENGTH && compareSync(password, project.passwordHash)) {+ if (+ _size(password) <= MAX_PROJECT_PASSWORD_LENGTH &&+ compareSync(password, project.passwordHash)+ ) {return null}throw new ConflictException('Incorrect password')}- if (- (project.isPasswordProtected && uid !== project.admin?.id)- ) {+ if (project.isPasswordProtected && uid !== project.admin?.id) {throw new ForbiddenException('This project is password protected')}