📈 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
fix: Org / Project admin permissions for alerts, notification channels, feature flags and experiments
Blue Mouse3839036bf49c
diff --git a/backend/apps/cloud/src/alert/alert.controller.ts b/backend/apps/cloud/src/alert/alert.controller.tsindex f3864c5d7..0fa1017c5 100644--- a/backend/apps/cloud/src/alert/alert.controller.ts+++ b/backend/apps/cloud/src/alert/alert.controller.ts@@ -164,18 +164,11 @@ export class AlertController {throw new ForbiddenException('User not found')}- const maxAlerts = ACCOUNT_PLANS[user.planCode]?.maxAlerts ?? ALERTS_MAXIMUM-if (!user.isActive) {throw new ForbiddenException('Please, verify your email address first')}- const project = await this.projectService.findOne({- where: {- id: alertDTO.pid,- },- relations: ['alerts', 'admin'],- })+ const project = await this.projectService.getFullProject(alertDTO.pid)if (_isEmpty(project)) {throw new NotFoundException('Project not found')@@ -187,19 +180,23 @@ export class AlertController {'You are not allowed to add alerts to this project',)- const pids = await this.projectService.getProjectIdsByAdminId(uid)+ const maxAlerts =+ ACCOUNT_PLANS[project.admin.planCode]?.maxAlerts ?? ALERTS_MAXIMUM+ const pids = await this.projectService.getProjectIdsByAdminId(+ project.admin.id,+ )const alertsCount = await this.alertService.count({where: { project: { id: In(pids) } },})- if (user.planCode === PlanCode.none) {+ if (project.admin.planCode === PlanCode.none) {throw new HttpException('You cannot create new alerts due to no active subscription. Please upgrade your account plan to continue.',HttpStatus.PAYMENT_REQUIRED,)}- if (user.isAccountBillingSuspended) {+ if (project.admin.isAccountBillingSuspended) {throw new HttpException('The account that owns this site is currently suspended, this is because of a billing issue. Please resolve the issue to continue.',HttpStatus.PAYMENT_REQUIRED,diff --git a/backend/apps/cloud/src/alert/alert.service.ts b/backend/apps/cloud/src/alert/alert.service.tsindex 9149747f8..54b8b8bb4 100644--- a/backend/apps/cloud/src/alert/alert.service.ts+++ b/backend/apps/cloud/src/alert/alert.service.ts@@ -39,7 +39,16 @@ export class AlertService {findOneWithRelations(id: string): Promise<Alert | null> {return this.alertsReporsitory.findOne({where: { id },- relations: ['project', 'project.admin', 'channels'],+ relations: [+ 'project',+ 'project.admin',+ 'project.share',+ 'project.share.user',+ 'project.organisation',+ 'project.organisation.members',+ 'project.organisation.members.user',+ 'channels',+ ],})}diff --git a/backend/apps/cloud/src/experiment/experiment.controller.ts b/backend/apps/cloud/src/experiment/experiment.controller.tsindex 10b78d9d7..c50c8e636 100644--- a/backend/apps/cloud/src/experiment/experiment.controller.ts+++ b/backend/apps/cloud/src/experiment/experiment.controller.ts@@ -242,12 +242,7 @@ export class ExperimentController {throw new ForbiddenException('Please, verify your email address first')}- const project = await this.projectService.findOne({- where: {- id: experimentDto.pid,- },- relations: ['experiments', 'admin'],- })+ const project = await this.projectService.getFullProject(experimentDto.pid)if (_isEmpty(project)) {throw new NotFoundException('Project not found')diff --git a/backend/apps/cloud/src/experiment/experiment.service.ts b/backend/apps/cloud/src/experiment/experiment.service.tsindex 523317ab7..bc1c5a185 100644--- a/backend/apps/cloud/src/experiment/experiment.service.ts+++ b/backend/apps/cloud/src/experiment/experiment.service.ts@@ -59,6 +59,11 @@ export class ExperimentService {relations: ['project','project.admin',+ 'project.share',+ 'project.share.user',+ 'project.organisation',+ 'project.organisation.members',+ 'project.organisation.members.user','variants','goal','featureFlag',diff --git a/backend/apps/cloud/src/feature-flag/feature-flag.controller.ts b/backend/apps/cloud/src/feature-flag/feature-flag.controller.tsindex 106e45eff..e59875ba6 100644--- a/backend/apps/cloud/src/feature-flag/feature-flag.controller.ts+++ b/backend/apps/cloud/src/feature-flag/feature-flag.controller.ts@@ -374,12 +374,7 @@ export class FeatureFlagController {throw new ForbiddenException('Please, verify your email address first')}- const project = await this.projectService.findOne({- where: {- id: flagDto.pid,- },- relations: ['featureFlags', 'admin'],- })+ const project = await this.projectService.getFullProject(flagDto.pid)if (_isEmpty(project)) {throw new NotFoundException('Project not found')diff --git a/backend/apps/cloud/src/feature-flag/feature-flag.service.ts b/backend/apps/cloud/src/feature-flag/feature-flag.service.tsindex edec2cca5..69ce82f59 100644--- a/backend/apps/cloud/src/feature-flag/feature-flag.service.ts+++ b/backend/apps/cloud/src/feature-flag/feature-flag.service.ts@@ -66,7 +66,15 @@ export class FeatureFlagService {findOneWithRelations(id: string): Promise<FeatureFlag | null> {return this.featureFlagRepository.findOne({where: { id },- relations: ['project', 'project.admin'],+ relations: [+ 'project',+ 'project.admin',+ 'project.share',+ 'project.share.user',+ 'project.organisation',+ 'project.organisation.members',+ 'project.organisation.members.user',+ ],})}diff --git a/backend/apps/cloud/src/project/project.controller.ts b/backend/apps/cloud/src/project/project.controller.tsindex b2273605b..cdf6ae2b1 100644--- a/backend/apps/cloud/src/project/project.controller.ts+++ b/backend/apps/cloud/src/project/project.controller.ts@@ -1205,6 +1205,9 @@ export class ProjectController {'project.admin','project.share','project.share.user',+ 'project.organisation',+ 'project.organisation.members',+ 'project.organisation.members.user',],})@@ -1212,7 +1215,6 @@ export class ProjectController {throw new NotFoundException(`Share with ID ${shareId} does not exist`)}- // TODO: ORGthis.projectService.allowedToManage(share.project, uid)const adminShare = _find(diff --git a/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx b/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsxindex d8f135067..8d48d4644 100644--- a/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx+++ b/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx@@ -273,10 +273,11 @@ const ProjectAlertsInner = ({const pageAmount = Math.ceil(total / DEFAULT_ALERTS_TAKE)const limits = PLAN_LIMITS[user?.planCode || 'trial']- const isLimitReached = isAuthenticated && total >= limits?.maxAlerts+ const isLimitReached =+ projectRole === 'owner' && isAuthenticated && total >= limits?.maxAlerts- // Check if user has permission to view alerts- const canManageAlerts = projectRole === 'owner' && isAuthenticated+ const canManageAlerts =+ (projectRole === 'owner' || projectRole === 'admin') && isAuthenticated// Get active alert from URL paramsconst activeAlertId = searchParams.get('alertId')diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex 0be1a7ac5..1a5324081 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -295,7 +295,9 @@ const ProjectSettings = () => {description: t('project.settings.tabs.alertsDesc'),icon: BellRingingIcon,iconColor: 'text-cyan-500',- visible: !isSelfhosted && project?.role === 'owner',+ visible:+ !isSelfhosted &&+ (project?.role === 'owner' || project?.role === 'admin'),},{id: 'channels',@@ -303,7 +305,9 @@ const ProjectSettings = () => {description: t('project.settings.tabs.channelsDesc'),icon: BellRingingIcon,iconColor: 'text-pink-500',- visible: !isSelfhosted && project?.role === 'owner',+ visible:+ !isSelfhosted &&+ (project?.role === 'owner' || project?.role === 'admin'),},{id: 'revenue',