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
Remove Editor->Admin site role conversion and limit permissions (#5210)
Adrian Gruntkowskia715ed2f32a8
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 079406c167..46fcb89b99 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -42,6 +42,7 @@ All notable changes to this project will be documented in this file.- Main graph now shows revenue with relevant currency symbol when hovering a data point- Main graph now shows `-` instead of `0` for visit duration, scroll depth when hovering a data point with no visit data- Make Stats and Sites API keys scoped to teams they are created in+- Remove permissions to manage sites guests and run destructive actions from team editor and guest editor roles in favour of team admin role### Fixeddiff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.exindex 9d5d7907c8..87221d0e9d 100644--- a/lib/plausible/site/admin.ex+++ b/lib/plausible/site/admin.ex@@ -82,7 +82,7 @@ defmodule Plausible.SiteAdmin dopublic: nil,team: %{value: &get_team/1},owners: %{value: &get_owners/1},- other_members: %{value: &get_other_members/1},+ other_guest_members: %{value: &get_other_members/1},limits: %{value: fn site ->rate_limiting_status =@@ -251,7 +251,7 @@ defmodule Plausible.SiteAdmin dorole = html_escape(m.role)"""- <a href="/crm/auth/user/#{id}">#{email} (#{role})</a>+ <a href="/crm/auth/user/#{id}">#{email} (guest #{role})</a>"""end)|> Phoenix.HTML.raw()diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex 0d09a458e6..e4777a5619 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -96,17 +96,7 @@ defmodule Plausible.Sites dowhere: gm.site_id == ^site.id,select: %{user: u,- role:- fragment(- """- CASE- WHEN ? = 'editor' THEN 'admin'- ELSE ?- END- """,- gm.role,- gm.role- )+ role: gm.role})|> Repo.all()@@ -121,17 +111,7 @@ defmodule Plausible.Sites doselect: %{invitation_id: gi.invitation_id,email: ti.email,- role:- fragment(- """- CASE- WHEN ? = 'editor' THEN 'admin'- ELSE ?- END- """,- gi.role,- gi.role- )+ role: gi.role})|> Repo.all()diff --git a/lib/plausible/teams/memberships.ex b/lib/plausible/teams/memberships.exindex e8824d8d80..81d6d4fd5f 100644--- a/lib/plausible/teams/memberships.ex+++ b/lib/plausible/teams/memberships.ex@@ -110,7 +110,7 @@ defmodule Plausible.Teams.Memberships do{:ok, guest_membership} ->can_grant_role? =if guest_membership.team_membership.user_id == current_user.id do- can_grant_role_to_self?(current_user_role, new_role)+ falseelsecan_grant_role_to_other?(current_user_role, new_role)end@@ -152,16 +152,10 @@ defmodule Plausible.Teams.Memberships doendend- defp can_grant_role_to_self?(:editor, :viewer), do: true- defp can_grant_role_to_self?(_, _), do: false-defp can_grant_role_to_other?(:owner, :editor), do: true- defp can_grant_role_to_other?(:owner, :admin), do: truedefp can_grant_role_to_other?(:owner, :viewer), do: truedefp can_grant_role_to_other?(:admin, :editor), do: truedefp can_grant_role_to_other?(:admin, :viewer), do: true- defp can_grant_role_to_other?(:editor, :editor), do: true- defp can_grant_role_to_other?(:editor, :viewer), do: truedefp can_grant_role_to_other?(_, _), do: falsedefp send_site_member_removed_email(guest_membership) dodiff --git a/lib/plausible_web/components/team/notice.ex b/lib/plausible_web/components/team/notice.exindex a2140b5c9e..02ea7f8b66 100644--- a/lib/plausible_web/components/team/notice.ex+++ b/lib/plausible_web/components/team/notice.ex@@ -4,12 +4,35 @@ defmodule PlausibleWeb.Team.Notice do"""use PlausibleWeb, :component- def inviting_banner(assigns) do+ def owner_cta_banner(assigns) do~H"""<aside class="mt-4 mb-4">- <.notice title="Inviting people to your team" class="shadow-md dark:shadow-none mt-4">+ <.notice+ title="A Better Way of Inviting People to Your Team"+ class="shadow-md dark:shadow-none mt-4"+ >+ <p>+ You can now create a team and assign different roles to team members, such as admin,+ editor, viewer or billing. Team members will gain access to all your sites. <a href={+ Routes.team_setup_path(PlausibleWeb.Endpoint, :setup)+ }>Create your team here</a>.+ </p>+ </.notice>+ </aside>+ """+ end++ def guest_cta_banner(assigns) do+ ~H"""+ <aside class="mt-4 mb-4">+ <.notice+ title="A Better Way of Inviting People to a Team"+ class="shadow-md dark:shadow-none mt-4"+ ><p>- You can also invite people to your team and give them different roles like admin, editor, viewer or billing. Team members can have full access to all sites.+ It is now possible to create a team and assign different roles to team members, such as+ admin, editor, viewer or billing. Team members can gain access to all the sites. Please+ contact the site owner to create your team.</p></.notice></aside>diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.exindex ec8bb6075f..ac768f3b50 100644--- a/lib/plausible_web/controllers/invitation_controller.ex+++ b/lib/plausible_web/controllers/invitation_controller.ex@@ -4,7 +4,7 @@ defmodule PlausibleWeb.InvitationController doplug PlausibleWeb.RequireAccountPlugplug PlausibleWeb.Plugs.AuthorizeSiteAccess,- [:owner, :editor, :admin] when action in [:remove_invitation]+ [:owner, :admin] when action in [:remove_invitation]def accept_invitation(conn, %{"invitation_id" => invitation_id}) docurrent_user = conn.assigns.current_userdiff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.exindex 7714707acd..244b18ef43 100644--- a/lib/plausible_web/controllers/site/membership_controller.ex+++ b/lib/plausible_web/controllers/site/membership_controller.ex@@ -2,9 +2,8 @@ defmodule PlausibleWeb.Site.MembershipController do@moduledoc """This controller deals with user management via the UI in Site Settings -> People. It's important to enforce permissions in this controller.- Owner - Can manage users, can trigger a 'transfer ownership' request- Admin and Editor - Can manage users- Viewer - Can not access user management settings+ Owner and Admin - Can manage users, can trigger a 'transfer ownership' request+ Editor and Viewer - Can not access user management settingsAnyone - Can accept invitationsEverything else should be explicitly disallowed.@@ -15,20 +14,9 @@ defmodule PlausibleWeb.Site.MembershipController douse Plausiblealias Plausible.Site.Memberships- @only_owner_and_admin_is_allowed_to [- :transfer_ownership_form,- :transfer_ownership,- :change_team,- :change_team_form- ]-plug PlausibleWeb.RequireAccountPlug- plug PlausibleWeb.Plugs.AuthorizeSiteAccess,- [:owner, :admin] when action in @only_owner_and_admin_is_allowed_to-- plug PlausibleWeb.Plugs.AuthorizeSiteAccess,- [:owner, :admin, :editor] when action not in @only_owner_and_admin_is_allowed_to+ plug PlausibleWeb.Plugs.AuthorizeSiteAccess, [:owner, :admin]def invite_member_form(conn, _params) dosite =diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex fc2713ad11..3d53d93678 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -5,11 +5,22 @@ defmodule PlausibleWeb.SiteController doalias Plausible.Sites+ @unrestricted_actions [:new, :create_site]+ @destructive_actions [:settings_danger_zone, :reset_stats, :delete_site]++ @special_cased_actions @unrestricted_actions ++ @destructive_actions+plug(PlausibleWeb.RequireAccountPlug)plug(PlausibleWeb.Plugs.AuthorizeSiteAccess,- [:owner, :admin, :editor, :super_admin] when action not in [:new, :create_site]+ [:owner, :admin, :editor, :super_admin]+ when action not in @special_cased_actions+ )++ plug(+ PlausibleWeb.Plugs.AuthorizeSiteAccess,+ [:owner, :admin, :super_admin] when action in @destructive_actions)def new(conn, params) do@@ -134,7 +145,7 @@ defmodule PlausibleWeb.SiteController doenddef settings_people(conn, _params) do- site = conn.assigns.site+ site = Repo.preload(conn.assigns.site, :team)%{memberships: memberships, invitations: invitations} =Sites.list_people(site)diff --git a/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heex b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heexindex 5b46aadae6..339d4c5e92 100644--- a/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heex+++ b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heex@@ -1,6 +1,6 @@{@new_owner_email} has accepted the ownership transfer of {@site.domain}. They will be responsible for billing of it goingforward<%= if @initiator_as_guest? and @initiator_as_editor? do %>- and your role has been changed to <b>admin</b>+ and your role has been changed to <b>guest editor</b><% end %>.<%= if @initiator_as_guest? do %><a href={Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @site.domain) <> "?__team=none"}>diff --git a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex b/lib/plausible_web/templates/site/membership/invite_member_form.html.heexindex 3cc0ff9161..8e2a05433b 100644--- a/lib/plausible_web/templates/site/membership/invite_member_form.html.heex+++ b/lib/plausible_web/templates/site/membership/invite_member_form.html.heex@@ -38,12 +38,12 @@<div class="mt-1 bg-white rounded-md -space-y-px dark:bg-gray-800"><labelclass="border-gray-200 dark:border-gray-500 rounded-tl-md rounded-tr-md relative border p-4 flex cursor-pointer"- x-class="{'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': selectedOption === 'admin', 'border-gray-200': selectedOption !== 'admin'}"+ x-class="{'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': selectedOption === 'editor', 'border-gray-200': selectedOption !== 'editor'}"><.inputtype="radio"field={f[:role]}- id="role_admin"+ id="role_editor"value="editor"x-model="selectedOption"required="true"@@ -53,15 +53,15 @@<div class="ml-3 flex flex-col"><spanclass="text-gray-900 dark:text-gray-100 block text-sm font-medium"- x-class="{'text-indigo-900 dark:text-white': selectedOption === 'admin', 'text-gray-900 dark:text-gray-100': selectedOption !== 'admin'}"+ x-class="{'text-indigo-900 dark:text-white': selectedOption === 'editor', 'text-gray-900 dark:text-gray-100': selectedOption !== 'editor'}">- Guest Admin+ Guest Editor</span><spanclass="text-gray-500 dark:text-gray-400 text-sm block"- x-class="{'text-indigo-700 dark:text-gray-100': selectedOption === 'admin', 'text-gray-500 dark:text-gray-200': selectedOption !== 'admin'}"+ x-class="{'text-indigo-700 dark:text-gray-100': selectedOption === 'editor', 'text-gray-500 dark:text-gray-200': selectedOption !== 'editor'}">- Can view stats, change site settings and invite other members+ Can view stats and change site settings</span></div></label>@@ -91,7 +91,7 @@class="text-gray-500 dark:text-gray-400 text-sm block"x-class="{'text-indigo-700 dark:text-gray-100': selectedOption === 'viewer', 'text-gray-500 dark:text-gray-200': selectedOption !== 'viewer'}">- Can view stats but cannot access settings or invite members+ Can view stats but cannot access settings</span></div></label>diff --git a/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.heex b/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.heexindex 4899285db4..8a889988e6 100644--- a/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.heex+++ b/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.heex@@ -8,7 +8,7 @@hours, the request will expire automatically. <br /><br />Do note that a subscription plan is not transferred alongside the site. Ifthey accept the transfer request, the new owner will need to have an active- subscription. Your access will be downgraded to <b>admin</b>+ subscription. Your access will be downgraded to <b>guest editor</b>and any othermember roles will stay the same.</:subtitle>diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heexindex ab31f357ba..15b39907c4 100644--- a/lib/plausible_web/templates/site/settings_people.html.heex+++ b/lib/plausible_web/templates/site/settings_people.html.heex@@ -1,13 +1,17 @@<.settings_tiles>- <PlausibleWeb.Team.Notice.inviting_banner :if={- @site_role in [:owner, :admin] and Plausible.Teams.setup?(@current_team)+ <PlausibleWeb.Team.Notice.owner_cta_banner :if={+ @site_role == :owner and not Plausible.Teams.setup?(@current_team)+ } />++ <PlausibleWeb.Team.Notice.guest_cta_banner :if={+ @site_role != :owner and not Plausible.Teams.setup?(@site.team)} /><.tile docs="users-roles"><:title>People</:title><:subtitle>Invite your friends or coworkers</:subtitle>- <.filter_bar filtering_enabled?={false}>+ <.filter_bar :if={@site_role in [:owner, :admin]} filtering_enabled?={false}><.button_linkmt?={false}href={Routes.membership_path(@conn, :invite_member_form, @site.domain)}@@ -89,9 +93,9 @@)}method="put"- disabled={membership.role == "admin"}+ disabled={@site_role not in [:owner, :admin] or membership.role == "editor"}>- <div>Guest Admin</div>+ <div>Guest Editor</div><div class="text-gray-500 dark:text-gray-400 text-xs/5">View stats and edit site settings</div>@@ -107,7 +111,7 @@)}method="put"- disabled={membership.role == "viewer"}+ disabled={@site_role not in [:owner, :admin] or membership.role == "viewer"}><div>Guest Viewer</div><div class="text-gray-500 dark:text-gray-400 text-xs/5">@@ -126,6 +130,7 @@}class="text-red-600 hover:text-red-600"method="delete"+ disabled={@site_role not in [:owner, :admin]}>Remove member</.dropdown_item>@@ -157,6 +162,7 @@<.td hide_on_mobile>{Phoenix.Naming.humanize(invitation.role)}</.td><.td actions><.delete_button+ :if={@site_role in [:owner, :admin]}href={Routes.invitation_path(@conn,diff --git a/lib/plausible_web/views/site_view.ex b/lib/plausible_web/views/site_view.exindex a7408bd97c..5e4883c116 100644--- a/lib/plausible_web/views/site_view.ex+++ b/lib/plausible_web/views/site_view.ex@@ -26,12 +26,12 @@ defmodule PlausibleWeb.SiteView doendend- def site_role(%{role: "viewer"}) do+ def site_role(%{role: :viewer}) do"Guest Viewer"end- def site_role(%{role: "admin"}) do- "Guest Admin"+ def site_role(%{role: :editor}) do+ "Guest Editor"enddef site_role(%{role: role}) dodiff --git a/test/plausible_web/controllers/api/external_sites_controller_test.exs b/test/plausible_web/controllers/api/external_sites_controller_test.exsindex 37526ad688..ff466975ff 100644--- a/test/plausible_web/controllers/api/external_sites_controller_test.exs+++ b/test/plausible_web/controllers/api/external_sites_controller_test.exs@@ -1039,7 +1039,7 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest doassert %{"role" => "viewer", "status" => "invited"} = json_response(conn2, 200)- assert %{memberships: [_], invitations: [%{role: "viewer"}]} =+ assert %{memberships: [_], invitations: [%{role: :viewer}]} =Plausible.Sites.list_people(site)assert_no_emails_delivered()diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex cf0ab81edd..2b1f09e9bc 100644--- a/test/plausible_web/controllers/invitation_controller_test.exs+++ b/test/plausible_web/controllers/invitation_controller_test.exs@@ -231,7 +231,8 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dotest "removes the invitation", %{conn: conn, user: user} doowner = new_user()site = new_site(owner: owner)- add_guest(site, user: user, role: :editor)+ team = Plausible.Teams.complete_setup(site.team)+ add_member(team, user: user, role: :admin)invitation = invite_guest(site, "[email protected]", inviter: owner, role: :editor)conn =@@ -248,7 +249,8 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dotest "removes the invitation for ownership transfer", %{conn: conn, user: user} doowner = new_user()site = new_site(owner: owner)- add_guest(site, user: user, role: :editor)+ team = Plausible.Teams.complete_setup(site.team)+ add_member(team, user: user, role: :admin)transfer = invite_transfer(site, "[email protected]", inviter: owner)conn =@@ -265,7 +267,7 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dotest "fails to remove an invitation with insufficient permission", %{conn: conn, user: user} doowner = new_user()site = new_site(owner: owner)- add_guest(site, user: user, role: :viewer)+ add_guest(site, user: user, role: :editor)invitation = invite_guest(site, "[email protected]", inviter: owner, role: :editor)@@ -302,7 +304,8 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dotest "renders error for non-existent invitation", %{conn: conn, user: user} dosite = new_site()- add_guest(site, user: user, role: :editor)+ team = Plausible.Teams.complete_setup(site.team)+ add_member(team, user: user, role: :admin)remove_invitation_path =Routes.invitation_path(diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex 54f866d78e..69a06e3e05 100644--- a/test/plausible_web/controllers/site/membership_controller_test.exs+++ b/test/plausible_web/controllers/site/membership_controller_test.exs@@ -5,6 +5,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest douse Bamboo.Testuse Plausible.Teams.Test+ import Plausible.Teams.Testimport Plausible.Test.Support.HTML@subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "@@ -300,7 +301,10 @@ 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+ test "team admin can update a site member's role by user id (from editor to viewer)", %{+ conn: conn,+ user: user+ } dosite = new_site()team = Plausible.Teams.complete_setup(site.team)add_member(team, user: user, role: :admin)@@ -314,76 +318,98 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doassert_guest_membership(team, site, collaborator, :viewer)end- test "can downgrade yourself from admin to viewer, redirects to stats", %{+ test "team admin can update a site member's role by user id (from viewer to editor)", %{conn: conn,user: user} dosite = new_site()- add_guest(site, user: user, role: :editor)+ team = Plausible.Teams.complete_setup(site.team)+ add_member(team, user: user, role: :admin)+ collaborator = add_guest(site, role: :viewer)+ assert_guest_membership(team, site, collaborator, :viewer)- conn = put(conn, "/sites/#{site.domain}/memberships/u/#{user.id}/role/viewer")+ conn = set_current_team(conn, team)- assert_guest_membership(site.team, site, user, :viewer)+ put(conn, "/sites/#{site.domain}/memberships/u/#{collaborator.id}/role/editor")- assert redirected_to(conn) == "/#{URI.encode_www_form(site.domain)}"+ assert_guest_membership(team, site, collaborator, :editor)end- test "owner cannot make anyone else owner", %{+ test "team editor can't update site member's role", %{conn: conn, user: user} do+ site = new_site()+ team = Plausible.Teams.complete_setup(site.team)+ add_member(team, user: user, role: :editor)+ collaborator = add_guest(site, role: :editor)+ assert_guest_membership(team, site, collaborator, :editor)++ conn = set_current_team(conn, team)++ conn = put(conn, "/sites/#{site.domain}/memberships/u/#{collaborator.id}/role/viewer")++ assert html_response(conn, 404)++ assert_guest_membership(team, site, collaborator, :editor)+ end++ test "can't update role when an editor", %{conn: conn,user: user} dosite = new_site()- admin = add_guest(site, user: user, role: :editor)+ add_guest(site, user: user, role: :editor)- conn = put(conn, "/sites/#{site.domain}/memberships/u/#{admin.id}/role/owner")+ conn = put(conn, "/sites/#{site.domain}/memberships/u/#{user.id}/role/viewer")assert_guest_membership(site.team, site, user, :editor)- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==- "You are not allowed to grant the owner role"+ assert html_response(conn, 404)end- test "owner cannot downgrade themselves", %{+ test "can't update role when a viewer", %{conn: conn,user: user} do- site = new_site(owner: user)-- conn = put(conn, "/sites/#{site.domain}/memberships/u/#{user.id}/role/admin")+ site = new_site()+ add_guest(site, user: user, role: :viewer)+ another_guest = add_guest(site, role: :editor)- membership = Repo.get_by(Plausible.Teams.Membership, user_id: user.id)+ conn = put(conn, "/sites/#{site.domain}/memberships/u/#{another_guest.id}/role/viewer")- assert membership.role == :owner+ assert_guest_membership(site.team, site, another_guest, :editor)- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==- "You are not allowed to grant the admin role"+ assert html_response(conn, 404)end- test "admin can make another user admin", %{+ test "owner cannot make anyone else owner", %{conn: conn,user: user} do- site = new_site()+ site = new_site(owner: user)+ editor = new_user()+ add_guest(site, user: editor, role: :editor)- add_guest(site, user: user, role: :editor)- viewer = add_guest(site, user: new_user(), role: :viewer)+ conn = put(conn, "/sites/#{site.domain}/memberships/u/#{editor.id}/role/owner")- conn = put(conn, "/sites/#{site.domain}/memberships/u/#{viewer.id}/role/editor")+ assert_guest_membership(site.team, site, editor, :editor)- assert_guest_membership(site.team, site, viewer, :editor)- assert redirected_to(conn) == "/#{URI.encode_www_form(site.domain)}/settings/people"+ assert Phoenix.Flash.get(conn.assigns.flash, :error) ==+ "You are not allowed to grant the owner role"end- test "admin can't make themselves an owner", %{conn: conn, user: user} do- site = new_site()- add_guest(site, user: user, role: :editor)+ test "owner cannot downgrade themselves", %{+ conn: conn,+ user: user+ } do+ site = new_site(owner: user)- conn = put(conn, "/sites/#{site.domain}/memberships/u/#{user.id}/role/owner")+ conn = put(conn, "/sites/#{site.domain}/memberships/u/#{user.id}/role/admin")- assert_guest_membership(site.team, site, user, :editor)+ membership = Repo.get_by(Plausible.Teams.Membership, user_id: user.id)++ assert membership.role == :ownerassert Phoenix.Flash.get(conn.assigns.flash, :error) ==- "You are not allowed to grant the owner role"+ "You are not allowed to grant the admin role"endend@@ -453,13 +479,13 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doendtest "notifies the user who has been removed via email", %{conn: conn, user: user} do- site = new_site()- admin = add_guest(site, user: user, role: :editor)+ site = new_site(owner: user)+ editor = add_guest(site, role: :editor)- delete(conn, "/sites/#{site.domain}/memberships/u/#{admin.id}")+ delete(conn, "/sites/#{site.domain}/memberships/u/#{editor.id}")assert_email_delivered_with(- to: [nil: admin.email],+ to: [nil: editor.email],subject: @subject_prefix <> "Your access to #{site.domain} has been revoked")enddiff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex dad57bc911..7bbcf56d1f 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -552,7 +552,7 @@ defmodule PlausibleWeb.SiteControllerTest doassert owner_row =~ "Owner"assert editor_row =~ editor.email- assert editor_row_button == "Guest Admin"+ assert editor_row_button == "Guest Editor"refute editor_row =~ "Owner"assert viewer_row =~ viewer.email@@ -567,7 +567,8 @@ defmodule PlausibleWeb.SiteControllerTest doconn = get(conn, "/#{site.domain}/settings/people")resp = html_response(conn, 200)- assert text_of_element(resp, "#invitation-#{i1.invitation_id}") == "[email protected] Admin"+ assert text_of_element(resp, "#invitation-#{i1.invitation_id}") ==+ "[email protected] Editor"assert text_of_element(resp, "#invitation-#{i2.invitation_id}") =="[email protected] Viewer"@@ -586,11 +587,12 @@ defmodule PlausibleWeb.SiteControllerTest do"#{new_owner.email} Owner"end- test "renders team management notices", %{conn: conn, user: user} do+ test "renders distinct team management notices to owner", %{conn: conn, user: user} dosite = new_site(owner: user)resp = conn |> get("/#{site.domain}/settings/people") |> html_response(200)- refute resp =~ "You can also invite people to your team"+ refute resp =~ "A Better Way of Inviting People to a Team"+ assert resp =~ "A Better Way of Inviting People to Your Team"refute resp =~ "Team members automatically have access to this site."team = team_of(user)@@ -598,22 +600,27 @@ defmodule PlausibleWeb.SiteControllerTest doconn = set_current_team(conn, team)resp = conn |> get("/#{site.domain}/settings/people") |> html_response(200)- assert resp =~ "You can also invite people to your team"+ refute resp =~ "A Better Way of Inviting People to Your Team"assert resp =~ "Team members automatically have access to this site."end- test "does not render team management notices to editors", %{conn: conn, user: user} do+ test "renders distinct team management notices to editors", %{conn: conn, user: user} do# this can go away once we support multiple teamsuser |> team_of() |> Repo.delete!()owner = new_user()site = new_site(owner: owner)add_member(team_of(owner), user: user, role: :editor)+ resp = conn |> get("/#{site.domain}/settings/people") |> html_response(200)++ assert resp =~ "A Better Way of Inviting People to a Team"+ refute resp =~ "A Better Way of Inviting People to Your Team"+owner |> team_of() |> Teams.Team.setup_changeset() |> Repo.update!()resp = conn |> get("/#{site.domain}/settings/people") |> html_response(200)- refute resp =~ "You can also invite people to your team"+ refute resp =~ "A Better Way of Inviting People to a Team"refute resp =~ "Team members automatically have access to this site."endend