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!

password for protected projects in annalytics controller

kruzhambus8f6edda60473
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.ts
index 390a80687..76c3a012a 100644
--- a/apps/production/src/analytics/analytics.controller.ts
+++ b/apps/production/src/analytics/analytics.controller.ts
@@ -46,6 +46,7 @@ import { EventsDTO } from './dto/events.dto'
import { AnalyticsGET_DTO } from './dto/getData.dto'
import { GetUserFlowDTO } from './dto/getUserFlow.dto'
import { AppLoggerService } from '../logger/logger.service'
+import { ProjectPasswordDto } from '../project/dto/project-password.dto'
import {
REDIS_LOG_DATA_CACHE_KEY,
REDIS_LOG_PERF_CACHE_KEY,
@@ -260,6 +261,7 @@ export class AnalyticsController {
async getData(
@Query() data: AnalyticsGET_DTO,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
isCaptcha = false,
): Promise<any> {
const {
@@ -293,7 +295,7 @@ export class AnalyticsController {
period,
safeTimezone,
)
- await this.analyticsService.checkProjectAccess(pid, uid)
+ await this.analyticsService.checkProjectAccess(pid, uid, body.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 ${
@@ -371,6 +373,7 @@ export class AnalyticsController {
async getChartData(
@Query() data: AnalyticsGET_DTO,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
): Promise<any> {
const {
pid,
@@ -399,7 +402,7 @@ export class AnalyticsController {
period,
safeTimezone,
)
- await this.analyticsService.checkProjectAccess(pid, uid)
+ await this.analyticsService.checkProjectAccess(pid, uid, body.password)
let subQuery = `FROM analytics WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`
let customEVFilterApplied = false
@@ -442,6 +445,7 @@ export class AnalyticsController {
async getPerfData(
@Query() data: AnalyticsGET_DTO,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
): Promise<any> {
const {
pid,
@@ -470,7 +474,7 @@ export class AnalyticsController {
period,
safeTimezone,
)
- await this.analyticsService.checkProjectAccess(pid, uid)
+ await this.analyticsService.checkProjectAccess(pid, uid, body.password)
const subQuery = `FROM performance WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`
@@ -504,6 +508,7 @@ export class AnalyticsController {
async getPerfChartData(
@Query() data: AnalyticsGET_DTO,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
): Promise<any> {
const {
pid,
@@ -532,7 +537,7 @@ export class AnalyticsController {
period,
safeTimezone,
)
- await this.analyticsService.checkProjectAccess(pid, uid)
+ await this.analyticsService.checkProjectAccess(pid, uid, body.password)
const paramsData = {
params: {
@@ -572,6 +577,7 @@ export class AnalyticsController {
async getUserFlow(
@Query() data: GetUserFlowDTO,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
): Promise<IUserFlow | { appliedFilters: any[] }> {
const { pid, period, from, to, timezone = DEFAULT_TIMEZONE, filters } = data
this.analyticsService.validatePID(pid)
@@ -580,7 +586,7 @@ export class AnalyticsController {
this.analyticsService.validatePeriod(period)
}
- await this.analyticsService.checkProjectAccess(pid, uid)
+ await this.analyticsService.checkProjectAccess(pid, uid, body.password)
const safeTimezone = this.analyticsService.getSafeTimezone(timezone)
const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(
@@ -615,13 +621,19 @@ export class AnalyticsController {
async getOverallStats(
@Query() data,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
): Promise<any> {
const { pids, pid } = data
const pidsArray = getPIDsArray(pids, pid)
const validationPromises = _map(pidsArray, async currentPID => {
this.analyticsService.validatePID(currentPID)
- await this.analyticsService.checkProjectAccess(currentPID, uid)
+ // fix needed
+ // fix needed
+ // fix needed
+ // fix needed
+ // passwords and for projects protected []
+ await this.analyticsService.checkProjectAccess(currentPID, uid, body.password)
})
await Promise.all(validationPromises)
@@ -716,11 +728,12 @@ export class AnalyticsController {
async getLiveVisitors(
@Query() data,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
): Promise<object> {
const { pid } = data
this.analyticsService.validatePID(pid)
- await this.analyticsService.checkProjectAccess(pid, uid)
+ await this.analyticsService.checkProjectAccess(pid, uid, body.password)
const keys = await redis.keys(`sd:*:${pid}`)
@@ -1022,6 +1035,7 @@ export class AnalyticsController {
async getCustomEvents(
@Query() data: GetCustomEventsDto,
@CurrentUserId() uid: string,
+ @Headers() body: ProjectPasswordDto,
): Promise<any> {
const {
pid,
@@ -1042,7 +1056,7 @@ export class AnalyticsController {
this.analyticsService.validateTimebucket(timeBucket)
const [filtersQuery, filtersParams, parsedFilters] =
this.analyticsService.getFiltersQuery(filters, DataType.ANALYTICS)
- await this.analyticsService.checkProjectAccess(pid, uid)
+ await this.analyticsService.checkProjectAccess(pid, uid, body.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.ts
index 34cac9b64..cae883d36 100644
--- a/apps/production/src/analytics/analytics.service.ts
+++ b/apps/production/src/analytics/analytics.service.ts
@@ -213,9 +213,9 @@ export enum DataType {
export class AnalyticsService {
constructor(private readonly projectService: ProjectService) {}
- async checkProjectAccess(pid: string, uid: string | null): 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)
+ this.projectService.allowedToView(project, uid, password)
}
checkOrigin(project: Project, origin: string): void {