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
Set current_team when user has team membership in viewed site (#5284)
Adrian Gruntkowski659cae50aa16
diff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.exindex a2d1a6ad0b..5533213b52 100644--- a/lib/plausible/teams/invitations.ex+++ b/lib/plausible/teams/invitations.ex@@ -461,19 +461,16 @@ defmodule Plausible.Teams.Invitations doenddef send_transfer_accepted_email(site_transfer, team) do- initiator_as_editor? =- Teams.Memberships.site_role(site_transfer.site, site_transfer.initiator) == {:ok, :editor}-- initiator_as_guest? =- Teams.Memberships.team_role(team, site_transfer.initiator) == {:ok, :guest}+ initiator_as_guest_editor? =+ Teams.Memberships.site_role(site_transfer.site, site_transfer.initiator) ==+ {:ok, {:guest_member, :editor}}PlausibleWeb.Email.ownership_transfer_accepted(site_transfer.email,site_transfer.initiator.email,team,site_transfer.site,- initiator_as_editor?,- initiator_as_guest?+ initiator_as_guest_editor?)|> Plausible.Mailer.send()end@@ -508,16 +505,12 @@ defmodule Plausible.Teams.Invitations doendend- def check_invitation_permissions(%Plausible.Site{} = site, inviter, invitation_role, opts) do+ def check_invitation_permissions(%Plausible.Site{} = site, inviter, _invitation_role, opts) docheck_permissions? = Keyword.get(opts, :check_permissions, true)if check_permissions? docase Teams.Memberships.site_role(site, inviter) do- {:ok, inviter_role} when inviter_role in [:owner, :admin] and invitation_role == :owner ->- :ok-- {:ok, inviter_role}- when inviter_role in [:owner, :admin, :editor] and invitation_role != :owner ->+ {:ok, {:team_member, inviter_role}} when inviter_role in [:owner, :admin] ->:ok_ ->diff --git a/lib/plausible/teams/membership.ex b/lib/plausible/teams/membership.exindex a52a2b8cb7..c7fec4593b 100644--- a/lib/plausible/teams/membership.ex+++ b/lib/plausible/teams/membership.ex@@ -11,6 +11,8 @@ defmodule Plausible.Teams.Membership do@type t() :: %__MODULE__{}+ @type role() :: unquote(Enum.reduce(@roles, &{:|, [], [&1, &2]}))+schema "team_memberships" dofield :role, Ecto.Enum, values: @rolesfield :is_autocreated, :boolean, default: falsediff --git a/lib/plausible/teams/memberships.ex b/lib/plausible/teams/memberships.exindex 81d6d4fd5f..1db6867cae 100644--- a/lib/plausible/teams/memberships.ex+++ b/lib/plausible/teams/memberships.ex@@ -66,6 +66,9 @@ defmodule Plausible.Teams.Memberships doendend+ @spec site_role(Plausible.Site.t(), Auth.User.t() | nil) ::+ {:ok, {:team_member | :guest_member, Teams.Membership.role()}} | {:error, :not_a_member}+def site_role(_site, nil), do: {:error, :not_a_member}def site_role(site, user) do@@ -80,8 +83,8 @@ defmodule Plausible.Teams.Memberships do|> Repo.one()case result do- {:guest, role} -> {:ok, role}- {role, _} -> {:ok, role}+ {:guest, role} -> {:ok, {:guest_member, role}}+ {role, _} -> {:ok, {:team_member, role}}_ -> {:error, :not_a_member}endend@@ -93,9 +96,10 @@ defmodule Plausible.Teams.Memberships doendend- def has_admin_access?(site, user) do+ @spec has_editor_access?(Plausible.Site.t(), Auth.User.t() | nil) :: boolean()+ def has_editor_access?(site, user) docase site_role(site, user) do- {:ok, role} when role in [:editor, :admin, :owner] ->+ {:ok, {_, role}} when role in [:editor, :admin, :owner] ->true_ ->diff --git a/lib/plausible_web/controllers/api/internal_controller.ex b/lib/plausible_web/controllers/api/internal_controller.exindex 3b54c7fdb1..c34b4fb51b 100644--- a/lib/plausible_web/controllers/api/internal_controller.ex+++ b/lib/plausible_web/controllers/api/internal_controller.ex@@ -29,7 +29,7 @@ defmodule PlausibleWeb.Api.InternalController dowith %User{id: user_id} = user <- conn.assigns[:current_user],site <- Sites.get_by_domain(domain),true <-- Plausible.Teams.Memberships.has_admin_access?(site, user) ||+ Plausible.Teams.Memberships.has_editor_access?(site, user) ||Auth.is_super_admin?(user_id),{:ok, mod} <- Map.fetch(@features, feature),{:ok, _site} <- mod.toggle(site, user, override: false) dodiff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 8002b037bb..387fd8f860 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -776,7 +776,7 @@ defmodule PlausibleWeb.Api.StatsController dois_admin =if current_user = conn.assigns[:current_user] do- Plausible.Teams.Memberships.has_admin_access?(site, current_user)+ Plausible.Teams.Memberships.has_editor_access?(site, current_user)elsefalseenddiff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.exindex 5043efc1b9..01b2996a0d 100644--- a/lib/plausible_web/email.ex+++ b/lib/plausible_web/email.ex@@ -365,8 +365,7 @@ defmodule PlausibleWeb.Email doinviter_email,team,site,- initiator_as_editor?,- initiator_as_guest?+ initiator_as_guest_editor?) dopriority_email()|> to(inviter_email)@@ -378,8 +377,7 @@ defmodule PlausibleWeb.Email donew_owner_email: new_owner_email,team: team,site: site,- initiator_as_editor?: initiator_as_editor?,- initiator_as_guest?: initiator_as_guest?+ initiator_as_guest_editor?: initiator_as_guest_editor?)enddiff --git a/lib/plausible_web/live/goal_settings.ex b/lib/plausible_web/live/goal_settings.exindex bc3ee54773..7734e42cd0 100644--- a/lib/plausible_web/live/goal_settings.ex+++ b/lib/plausible_web/live/goal_settings.ex@@ -19,7 +19,7 @@ defmodule PlausibleWeb.Live.GoalSettings do|> Plausible.Sites.get_for_user!(domain, [:owner, :admin, :editor, :super_admin])end)|> assign_new(:site_role, fn %{site: site, current_user: current_user} ->- {:ok, role} = Plausible.Teams.Memberships.site_role(site, current_user)+ {:ok, {_, role}} = Plausible.Teams.Memberships.site_role(site, current_user)roleend)|> assign_new(:all_goals, fn %{site: site} ->diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.exindex 03549558a4..589cac5ff7 100644--- a/lib/plausible_web/plugs/authorize_site_access.ex+++ b/lib/plausible_web/plugs/authorize_site_access.ex@@ -38,6 +38,8 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess doimport Plug.Connimport Phoenix.Controller, only: [get_format: 1]+ alias Plausible.Teams+@all_roles [:public, :viewer, :admin, :editor, :super_admin, :owner, :billing]def init([]), do: {@all_roles, nil}@@ -77,7 +79,7 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess docurrent_user = conn.assigns[:current_user]with {:ok, domain} <- get_domain(conn, site_param),- {:ok, %{site: site, role: membership_role}} <-+ {:ok, %{site: site, role: membership_role, member_type: member_type}} <-get_site_with_role(conn, current_user, domain),{:ok, shared_link} <- maybe_get_shared_link(conn, site) dorole =@@ -112,11 +114,19 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess do|> Repo.preload([:owners,:completed_imports,- team: [subscription: Plausible.Teams.last_subscription_query()]+ team: [:owners, subscription: Teams.last_subscription_query()]])conn = merge_assigns(conn, site: site, site_role: role)+ # Switch current team if user is a team member in it+ conn =+ if member_type == :team_member do+ set_current_team(conn, site.team)+ else+ conn+ end+if not is_nil(current_user) and role not in [:public, nil] doassign(conn, :site_team, site.team)else@@ -128,6 +138,18 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess doendend+ defp set_current_team(conn, team) do+ current_team = conn.assigns[:current_team]++ if !current_team || team.id != current_team.id do+ conn+ |> assign(:current_team, team)+ |> Plug.Conn.put_session("current_team_id", team.identifier)+ else+ conn+ end+ end+defp valid_path_fragment?(fragment), do: is_binary(fragment) and String.valid?(fragment)defp get_domain(conn, nil) do@@ -154,13 +176,13 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess dosite = Repo.get_by(Plausible.Site, domain: domain)if site do- site_role =- case Plausible.Teams.Memberships.site_role(site, current_user) do- {:ok, role} -> role- _ -> nil+ {member_type, site_role} =+ case Teams.Memberships.site_role(site, current_user) do+ {:ok, {member_type, role}} -> {member_type, role}+ _ -> {nil, nil}end- {:ok, %{site: site, role: site_role}}+ {:ok, %{site: site, role: site_role, member_type: member_type}}elseerror_not_found(conn)enddiff --git a/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heex b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heexindex 339d4c5e92..15e95ec23f 100644--- a/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heex+++ b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.heex@@ -1,8 +1,6 @@{@new_owner_email} has accepted the ownership transfer of {@site.domain}. They will be responsible for billing of it going-forward<%= if @initiator_as_guest? and @initiator_as_editor? do %>- and your role has been changed to <b>guest editor</b>-<% end %>.-<%= if @initiator_as_guest? do %>+forward<%= if @initiator_as_guest_editor? do %>+ and your role has been changed to <b>guest editor</b>.<a href={Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @site.domain) <> "?__team=none"}>Click here</a>diff --git a/test/plausible/site/memberships/create_invitation_test.exs b/test/plausible/site/memberships/create_invitation_test.exsindex 56af7b632a..a327e9a459 100644--- a/test/plausible/site/memberships/create_invitation_test.exs+++ b/test/plausible/site/memberships/create_invitation_test.exs@@ -70,7 +70,7 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest do[owner, inviter, invitee] = for _ <- 1..3, do: new_user()site = new_site(owner: owner)- inviter = add_guest(site, user: inviter, role: :editor)+ inviter = add_member(site.team, user: inviter, role: :admin)for _ <- 1..4, do: add_guest(site, role: :viewer)assert {:error, {:over_limit, 3}} =@@ -130,7 +130,7 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest do)end- test "admin initiate ownership transfer too" do+ test "admin can initiate ownership transfer too" doinviter = new_user()site = new_site()add_member(site.team, user: inviter, role: :admin)@@ -182,16 +182,16 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest doinviter = new_user()owner = new_user()site = new_site(owner: owner)- add_guest(site, user: inviter, role: :viewer)+ add_member(site.team, user: inviter, role: :viewer)assert {:error, :forbidden} =CreateInvitation.create_invitation(site, inviter, "[email protected]", :viewer)end- test "allows admins to invite other admins" do+ test "allows admins to invite editors" doinviter = new_user()site = new_site()- add_guest(site, user: inviter, role: :editor)+ add_member(site.team, user: inviter, role: :admin)assert {:ok, %Plausible.Teams.GuestInvitation{}} =CreateInvitation.create_invitation(site, inviter, "[email protected]", :editor)diff --git a/test/plausible_web/plugs/authorize_site_access_test.exs b/test/plausible_web/plugs/authorize_site_access_test.exsindex 6c1494c4b8..3440325ba1 100644--- a/test/plausible_web/plugs/authorize_site_access_test.exs+++ b/test/plausible_web/plugs/authorize_site_access_test.exs@@ -247,7 +247,7 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccessTest doendfor role <- [:viewer, :editor] do- test "allows user based on their #{role} membership", %{conn: conn, user: user} do+ test "allows user based on their #{role} guest membership", %{conn: conn, user: user} dosite = new_site()add_guest(site, user: user, role: unquote(role))@@ -259,6 +259,33 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccessTest do|> get("/plug-tests/#{site.domain}/with-domain")|> AuthorizeSiteAccess.call(opts)+ # Does not set current team for guest membership+ refute get_session(conn, "current_team_id") == site.team.identifier+ refute conn.assigns.current_team.id == site.team.id++ refute conn.halted+ assert conn.assigns.site.id == site.id+ assert conn.assigns.site_role == unquote(role)+ end+ end++ for role <- [:viewer, :editor, :admin, :billing] do+ test "allows user based on their #{role} team membership", %{conn: conn, user: user} do+ site = new_site()+ add_member(site.team, user: user, role: unquote(role))++ opts = AuthorizeSiteAccess.init([unquote(role)])++ conn =+ conn+ |> bypass_through(PlausibleWeb.Router)+ |> get("/plug-tests/#{site.domain}/with-domain")+ |> AuthorizeSiteAccess.call(opts)++ # Sets current team for team membership+ assert get_session(conn, "current_team_id") == site.team.identifier+ assert conn.assigns.current_team.id == site.team.id+refute conn.haltedassert conn.assigns.site.id == site.idassert conn.assigns.site_role == unquote(role)