Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix permissions for guests (#5957)
Uku Taht0e1fcb1b4f44
diff --git a/extra/lib/plausible_web/live/funnel_settings.ex b/extra/lib/plausible_web/live/funnel_settings.exindex 85ed95994f..3497c49999 100644--- a/extra/lib/plausible_web/live/funnel_settings.ex+++ b/extra/lib/plausible_web/live/funnel_settings.ex@@ -57,7 +57,7 @@ defmodule PlausibleWeb.Live.FunnelSettings doshow_content?={!Plausible.Billing.Feature.Funnels.opted_out?(@site)}site={@site}current_user={@current_user}- current_team={@current_team}+ current_team={@site_team}><:title>Funnelsdiff --git a/lib/plausible_web/live/props_settings.ex b/lib/plausible_web/live/props_settings.exindex 9377d2a45c..269d748d71 100644--- a/lib/plausible_web/live/props_settings.ex+++ b/lib/plausible_web/live/props_settings.ex@@ -49,7 +49,7 @@ defmodule PlausibleWeb.Live.PropsSettings doshow_content?={!Plausible.Billing.Feature.Props.opted_out?(@site)}site={@site}current_user={@current_user}- current_team={@current_team}+ current_team={@site_team}><:title>Custom propertiesdiff --git a/lib/plausible_web/live/shared_link_settings.ex b/lib/plausible_web/live/shared_link_settings.exindex 97839539d0..1592b7a390 100644--- a/lib/plausible_web/live/shared_link_settings.ex+++ b/lib/plausible_web/live/shared_link_settings.ex@@ -31,6 +31,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do{:ok,assign(socket,site_id: site_id,+ site_team: socket.assigns.site.team,domain: domain,form_shared_link: nil)}@@ -46,7 +47,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings dofeature_mod={Plausible.Billing.Feature.SharedLinks}site={@site}current_user={@current_user}- current_team={@current_team}+ current_team={@site_team}><:title>Shared linksdiff --git a/test/plausible_web/live/funnel_settings_test.exs b/test/plausible_web/live/funnel_settings_test.exsindex 9a51d59396..2fb874b2a4 100644--- a/test/plausible_web/live/funnel_settings_test.exs+++ b/test/plausible_web/live/funnel_settings_test.exs@@ -8,7 +8,6 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest dodescribe "GET /:domain/settings/funnels" dosetup [:create_user, :log_in, :create_site]- @tag :ee_onlytest "premium feature notice renders", %{conn: conn, site: site, user: user} douser|> team_of()@@ -21,6 +20,21 @@ defmodule PlausibleWeb.Live.FunnelSettingsTest doassert text(resp) =~ "upgrade your subscription"end+ test "guest editors should be able to access funnel settings", %{site: site, conn: conn} do+ guest_user = new_user()+ add_guest(site, user: guest_user, role: :editor)++ {:ok, conn: conn} = log_in(%{user: guest_user, conn: conn})++ lock_notice =+ conn+ |> get("/#{site.domain}/settings/funnels")+ |> html_response(200)+ |> text_of_element("#lock-notice")++ refute lock_notice =~ "upgrade your subscription"+ end+test "lists funnels for the site and renders help link", %{conn: conn, site: site} do{:ok, _} = setup_funnels(site)conn = get(conn, "/#{site.domain}/settings/funnels")diff --git a/test/plausible_web/live/props_settings_test.exs b/test/plausible_web/live/props_settings_test.exsindex 98e73ac6a4..1e36e4c632 100644--- a/test/plausible_web/live/props_settings_test.exs+++ b/test/plausible_web/live/props_settings_test.exs@@ -39,6 +39,22 @@ defmodule PlausibleWeb.Live.PropsSettingsTest dorefute lock_notice =~ "upgrade your subscription"end+ @tag :ee_only+ test "guest editors should be able to access prop settings", %{site: site, conn: conn} do+ guest_user = new_user()+ add_guest(site, user: guest_user, role: :editor)++ {:ok, conn: conn} = log_in(%{user: guest_user, conn: conn})++ lock_notice =+ conn+ |> get("/#{site.domain}/settings/properties")+ |> html_response(200)+ |> text_of_element("#lock-notice")++ refute lock_notice =~ "upgrade your subscription"+ end+test "lists props for the site and renders links", %{conn: conn, site: site} do{:ok, site} = Plausible.Props.allow(site, ["amount", "logged_in", "is_customer"])conn = get(conn, "/#{site.domain}/settings/properties")diff --git a/test/plausible_web/live/shared_link_settings_test.exs b/test/plausible_web/live/shared_link_settings_test.exsindex a3dbe90494..39fb55d679 100644--- a/test/plausible_web/live/shared_link_settings_test.exs+++ b/test/plausible_web/live/shared_link_settings_test.exs@@ -10,6 +10,22 @@ defmodule PlausibleWeb.Live.SharedLinkSettingsTest do{:ok, session: %{"site_id" => site.id, "domain" => site.domain}}end+ test "guest editors should be able to access shared link settings", %{+ site: site,+ conn: conn,+ session: session+ } do+ insert(:shared_link, site: site, name: "Link 1")+ guest_user = new_user()+ add_guest(site, user: guest_user, role: :editor)++ {:ok, conn: conn} = log_in(%{user: guest_user, conn: conn})+ lv = get_liveview(conn, session)+ lock_notice = render(lv) |> text_of_element("#lock-notice")++ refute lock_notice =~ "upgrade your subscription"+ end+test "allows shared link deletion", %{conn: conn, site: site, session: session} dolink1 = insert(:shared_link, site: site, name: "Link 1")link2 = insert(:shared_link, site: site, name: "Link 2")