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 Team Admin permissions (#5211)
Adrian Gruntkowski77fa590ed3ae
diff --git a/lib/plausible/teams/memberships.ex b/lib/plausible/teams/memberships.exindex a5b357520e..e8824d8d80 100644--- a/lib/plausible/teams/memberships.ex+++ b/lib/plausible/teams/memberships.ex@@ -158,6 +158,8 @@ defmodule Plausible.Teams.Memberships dodefp can_grant_role_to_other?(:owner, :editor), do: truedefp can_grant_role_to_other?(:owner, :admin), do: truedefp can_grant_role_to_other?(:owner, :viewer), do: true+ defp can_grant_role_to_other?(:admin, :editor), do: true+ defp can_grant_role_to_other?(:admin, :viewer), do: truedefp can_grant_role_to_other?(:editor, :editor), do: truedefp can_grant_role_to_other?(:editor, :viewer), do: truedefp can_grant_role_to_other?(_, _), do: falsediff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heexindex 0d9c25f296..19e8e5b6f7 100644--- a/lib/plausible_web/templates/site/settings_people.html.heex+++ b/lib/plausible_web/templates/site/settings_people.html.heex@@ -65,7 +65,7 @@</.dropdown_item><.dropdown_divider /><.dropdown_item- :if={@conn.assigns[:site_role] == :owner}+ :if={@site_role in [:owner, :admin]}class="text-red-600 dark:text-red-500 hover:text-red-600"href={Routes.membership_path(diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex 1863ed8a94..54f866d78e 100644--- a/test/plausible_web/controllers/site/membership_controller_test.exs+++ b/test/plausible_web/controllers/site/membership_controller_test.exs@@ -300,6 +300,20 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doassert_guest_membership(site.team, site, collaborator, :viewer)end+ test "team admin can update a site member's role by user id", %{conn: conn, user: user} do+ site = new_site()+ team = Plausible.Teams.complete_setup(site.team)+ add_member(team, user: user, role: :admin)+ collaborator = add_guest(site, role: :editor)+ assert_guest_membership(team, site, collaborator, :editor)++ conn = set_current_team(conn, team)++ put(conn, "/sites/#{site.domain}/memberships/u/#{collaborator.id}/role/viewer")++ assert_guest_membership(team, site, collaborator, :viewer)+ end+test "can downgrade yourself from admin to viewer, redirects to stats", %{conn: conn,user: user