📈 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: minor bugs
Blue Mouse9089a67af133
diff --git a/backend/apps/cloud/src/project/project.controller.ts b/backend/apps/cloud/src/project/project.controller.tsindex 5107bc838..c966ad7bc 100644--- a/backend/apps/cloud/src/project/project.controller.ts+++ b/backend/apps/cloud/src/project/project.controller.ts@@ -1942,7 +1942,20 @@ export class ProjectController {throw new NotFoundException('Project was not found in the database')}- if (project.isPasswordProtected && _isEmpty(headers['x-password'])) {+ let allowedToViewNoPassword = false++ try {+ this.projectService.allowedToView(project, uid)+ allowedToViewNoPassword = true+ } catch {+ allowedToViewNoPassword = false+ }++ if (+ !allowedToViewNoPassword &&+ project.isPasswordProtected &&+ _isEmpty(headers['x-password'])+ ) {return {isPasswordProtected: true,id: project.id,diff --git a/web/app/api/index.ts b/web/app/api/index.tsindex 6c5d45404..c17b9188f 100644--- a/web/app/api/index.ts+++ b/web/app/api/index.ts@@ -12,7 +12,7 @@ import { getRefreshToken, removeRefreshToken } from '~/utils/refreshToken'import { DEFAULT_ALERTS_TAKE, API_URL, DEFAULT_MONITORS_TAKE } from '~/lib/constants'import { User } from '~/lib/models/User'import { Auth } from '~/lib/models/Auth'-import { Project, Overall, LiveStats } from '~/lib/models/Project'+import { Project, Overall, LiveStats, Funnel } from '~/lib/models/Project'import { Alerts } from '~/lib/models/Alerts'import { Subscriber } from '~/lib/models/Subscriber'import { Filter, ProjectViewCustomEvent } from '~/pages/Project/View/interfaces/traffic'@@ -732,7 +732,7 @@ export const getFunnels = (pid: string, password: string | undefined = '') =>'x-password': password,},})- .then((response) => response.data)+ .then((response): Funnel[] => response.data).catch((error) => {throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message})diff --git a/web/app/pages/Project/ProjectProtectedPassword/index.tsx b/web/app/pages/Project/ProjectProtectedPassword/index.tsxindex c85a570fd..5b77bb11d 100644--- a/web/app/pages/Project/ProjectProtectedPassword/index.tsx+++ b/web/app/pages/Project/ProjectProtectedPassword/index.tsx@@ -70,8 +70,8 @@ const ProjectProtectedPassword = ({ ssrTheme, embedded, isAuth }: ProjectProtectif (!isLoading) {setIsLoading(true)await checkPassword(id, data.password)- .then((res) => {- if (res) {+ .then((result) => {+ if (result) {dispatch(UIActions.setProjectPassword({id,@@ -82,6 +82,7 @@ const ProjectProtectedPassword = ({ ssrTheme, embedded, isAuth }: ProjectProtectpathname: _replace(routes.project, ':id', id),search: `?embedded=${embedded}&theme=${ssrTheme}`,})+ return}setErrors({password: t('apiNotifications.incorrectPassword'),diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex bdfca7c67..1c9e3c74a 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -515,7 +515,8 @@ const ViewProject = () => {}try {- await getFunnels(id, projectPassword)+ const funnels = await getFunnels(id, projectPassword)+ setProject((prev) => (prev ? { ...prev, funnels } : null))} catch (reason: any) {console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)}@@ -539,7 +540,8 @@ const ViewProject = () => {}try {- await getFunnels(id, projectPassword)+ const funnels = await getFunnels(id, projectPassword)+ setProject((prev) => (prev ? { ...prev, funnels } : null))} catch (reason: any) {console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)}@@ -563,7 +565,8 @@ const ViewProject = () => {}try {- await getFunnels(id, projectPassword)+ const funnels = await getFunnels(id, projectPassword)+ setProject((prev) => (prev ? { ...prev, funnels } : null))} catch (reason: any) {console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)}