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
Add billing role (#5171)
hq1841abf5e5383
diff --git a/assets/js/dashboard/user-context.tsx b/assets/js/dashboard/user-context.tsxindex 8b07291024..cc425bcf14 100644--- a/assets/js/dashboard/user-context.tsx+++ b/assets/js/dashboard/user-context.tsx@@ -6,7 +6,8 @@ export enum Role {admin = 'admin',viewer = 'viewer',editor = 'editor',- public = 'public'+ public = 'public',+ billing = 'billing'}const userContextDefaultValue = {diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.exindex 76a5a9aae4..0999e76c4d 100644--- a/lib/plausible/billing/billing.ex+++ b/lib/plausible/billing/billing.ex@@ -89,7 +89,7 @@ defmodule Plausible.Billing dosubscription =Subscription|> Repo.get_by(paddle_subscription_id: params["subscription_id"])- |> Repo.preload(team: :owners)+ |> Repo.preload(team: [:owners, :billing_members])if subscription dochangeset =@@ -99,8 +99,8 @@ defmodule Plausible.Billing doupdated = Repo.update!(changeset)- for owner <- subscription.team.owners do- owner+ for recipient <- subscription.team.owners ++ subscription.team.billing_members do+ recipient|> PlausibleWeb.Email.cancellation_email()|> Plausible.Mailer.send()enddiff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.exindex df871331e2..e694bbc35e 100644--- a/lib/plausible/billing/site_locker.ex+++ b/lib/plausible/billing/site_locker.ex@@ -26,7 +26,7 @@ defmodule Plausible.Billing.SiteLocker doPlausible.Teams.end_grace_period(team)if send_email? do- team = Repo.preload(team, :owners)+ team = Repo.preload(team, [:owners, :billing_members])send_grace_period_end_email(team)end@@ -64,8 +64,8 @@ defmodule Plausible.Billing.SiteLocker dousage = Teams.Billing.monthly_pageview_usage(team)suggested_plan = Plausible.Billing.Plans.suggest(team, usage.last_cycle.total)- for owner <- team.owners do- owner+ for recipient <- team.owners ++ team.billing_members do+ recipient|> PlausibleWeb.Email.dashboard_locked(usage, suggested_plan)|> Plausible.Mailer.send()enddiff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.exindex 184e44c2be..91d73f76a4 100644--- a/lib/plausible/segments/segments.ex+++ b/lib/plausible/segments/segments.ex@@ -6,7 +6,7 @@ defmodule Plausible.Segments doalias Plausible.Repoimport Ecto.Query- @roles_with_personal_segments [:viewer, :editor, :admin, :owner, :super_admin]+ @roles_with_personal_segments [:billing, :viewer, :editor, :admin, :owner, :super_admin]@roles_with_maybe_site_segments [:editor, :admin, :owner, :super_admin]@type error_not_enough_permissions() :: {:error, :not_enough_permissions}diff --git a/lib/plausible/teams/membership.ex b/lib/plausible/teams/membership.exindex bf610f0d9a..a52a2b8cb7 100644--- a/lib/plausible/teams/membership.ex+++ b/lib/plausible/teams/membership.ex@@ -7,7 +7,7 @@ defmodule Plausible.Teams.Membership doimport Ecto.Changeset- @roles [:guest, :viewer, :editor, :admin, :owner]+ @roles [:guest, :viewer, :editor, :admin, :owner, :billing]@type t() :: %__MODULE__{}diff --git a/lib/plausible/teams/memberships/update_role.ex b/lib/plausible/teams/memberships/update_role.exindex 6f0294eb3d..a903c57291 100644--- a/lib/plausible/teams/memberships/update_role.ex+++ b/lib/plausible/teams/memberships/update_role.ex@@ -73,20 +73,26 @@ defmodule Plausible.Teams.Memberships.UpdateRole dodefp can_grant_role_to_self?(:owner, :admin), do: truedefp can_grant_role_to_self?(:owner, :editor), do: truedefp can_grant_role_to_self?(:owner, :viewer), do: true+ defp can_grant_role_to_self?(:owner, :billing), do: truedefp can_grant_role_to_self?(:admin, :editor), do: truedefp can_grant_role_to_self?(:admin, :viewer), do: true+ defp can_grant_role_to_self?(:admin, :billing), do: truedefp can_grant_role_to_self?(_, _), do: falsedefp can_grant_role_to_other?(:owner, _, _), do: truedefp can_grant_role_to_other?(:admin, :admin, :admin), do: truedefp can_grant_role_to_other?(:admin, :admin, :editor), do: truedefp can_grant_role_to_other?(:admin, :admin, :viewer), do: true+ defp can_grant_role_to_other?(:admin, :admin, :billing), do: truedefp can_grant_role_to_other?(:admin, :editor, :admin), do: truedefp can_grant_role_to_other?(:admin, :editor, :editor), do: truedefp can_grant_role_to_other?(:admin, :editor, :viewer), do: true+ defp can_grant_role_to_other?(:admin, :editor, :billing), do: truedefp can_grant_role_to_other?(:admin, :viewer, :admin), do: truedefp can_grant_role_to_other?(:admin, :viewer, :editor), do: truedefp can_grant_role_to_other?(:admin, :viewer, :viewer), do: true+ defp can_grant_role_to_other?(:admin, :viewer, :billing), do: true+ defp can_grant_role_to_other?(:admin, :billing, :billing), do: truedefp can_grant_role_to_other?(_, _, _), do: falsedefp maybe_prune_guest_memberships(%Teams.Membership{role: :guest}),diff --git a/lib/plausible/teams/team.ex b/lib/plausible/teams/team.exindex 86be4b75b9..0c36bf7ab3 100644--- a/lib/plausible/teams/team.ex+++ b/lib/plausible/teams/team.ex@@ -44,7 +44,12 @@ defmodule Plausible.Teams.Team dowhere: [role: :owner],preload_order: [asc: :id]+ has_many :billing_memberships, Plausible.Teams.Membership,+ where: [role: :billing],+ preload_order: [asc: :id]+has_many :owners, through: [:ownerships, :user]+ has_many :billing_members, through: [:billing_memberships, :user]timestamps()enddiff --git a/lib/plausible_web/controllers/billing_controller.ex b/lib/plausible_web/controllers/billing_controller.exindex 6a6837be41..2624cb74db 100644--- a/lib/plausible_web/controllers/billing_controller.ex+++ b/lib/plausible_web/controllers/billing_controller.ex@@ -8,6 +8,8 @@ defmodule PlausibleWeb.BillingController doplug PlausibleWeb.RequireAccountPlug+ plug Plausible.Plugs.AuthorizeTeamAccess, [:owner, :admin, :billing]+def ping_subscription(%Plug.Conn{} = conn, _params) dosubscribed? = Plausible.Teams.Billing.has_active_subscription?(conn.assigns.current_team)diff --git a/lib/plausible_web/controllers/settings_controller.ex b/lib/plausible_web/controllers/settings_controller.exindex 763ad0b6d3..6eda6e2927 100644--- a/lib/plausible_web/controllers/settings_controller.ex+++ b/lib/plausible_web/controllers/settings_controller.ex@@ -8,6 +8,12 @@ defmodule PlausibleWeb.SettingsController dorequire Logger+ plug Plausible.Plugs.AuthorizeTeamAccess,+ [:owner, :admin] when action in [:update_team_name]++ plug Plausible.Plugs.AuthorizeTeamAccess,+ [:owner, :admin, :billing] when action in [:invoices]+def index(conn, _params) doredirect(conn, to: Routes.settings_path(conn, :preferences))enddiff --git a/lib/plausible_web/live/auth_context.ex b/lib/plausible_web/live/auth_context.exindex b6d8356791..4f5bf137a9 100644--- a/lib/plausible_web/live/auth_context.ex+++ b/lib/plausible_web/live/auth_context.ex@@ -64,6 +64,23 @@ defmodule PlausibleWeb.Live.AuthContext do_ ->nilend)+ |> assign_new(+ :current_role,+ fn+ %{current_user: user = %{}, current_team: current_team = %{}} ->+ Enum.find_value(user.team_memberships, fn team_membership ->+ if team_membership.team_id == current_team.id do+ team_membership.role+ end+ end)++ %{my_team: %{}} ->+ :owner++ _ ->+ nil+ end+ )|> assign_new(:teams, fn%{current_user: nil} ->[]diff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex 76b3e80da5..4dd9a2da04 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -24,21 +24,17 @@ defmodule PlausibleWeb.Live.TeamManagement dodefp reset(%{assigns: %{current_user: current_user, current_team: current_team}} = socket) do{:ok, my_role} = Teams.Memberships.team_role(current_team, current_user)- if my_role not in [:owner, :admin] do- redirect(socket, to: Routes.settings_path(socket, :team_general))- else- layout = Layout.init(current_team)- team_members_limit = Plausible.Teams.Billing.team_member_limit(current_team)-- assign(socket,- team_members_limit: team_members_limit,- layout: layout,- my_role: my_role,- team_layout_changed?: false,- input_role: :viewer,- input_email: ""- )- end+ layout = Layout.init(current_team)+ team_members_limit = Plausible.Teams.Billing.team_member_limit(current_team)++ assign(socket,+ team_members_limit: team_members_limit,+ layout: layout,+ my_role: my_role,+ team_layout_changed?: false,+ input_role: :viewer,+ input_email: ""+ )enddef render(assigns) do@@ -64,7 +60,7 @@ defmodule PlausibleWeb.Live.TeamManagement dovalue={@input_email}placeholder="Enter e-mail to send invitation to"phx-debounce={200}- readonly={at_limit?(@layout, @team_members_limit)}+ readonly={at_limit?(@layout, @team_members_limit) or @my_role not in [:admin, :owner]}mt?={false}/></div>@@ -113,7 +109,7 @@ defmodule PlausibleWeb.Live.TeamManagement doid="invite-member"type="submit"mt?={false}- disabled={at_limit?(@layout, @team_members_limit)}+ disabled={at_limit?(@layout, @team_members_limit) or @my_role not in [:admin, :owner]}>Invite</.button>@@ -129,7 +125,10 @@ defmodule PlausibleWeb.Live.TeamManagement dolabel={entry_label(entry, @current_user)}my_role={@my_role}remove_disabled={not Layout.removable?(@layout, email)}- disabled={entry.role == :owner && Layout.owners_count(@layout) == 1}+ disabled={+ (entry.role == :owner && Layout.owners_count(@layout) == 1) or+ @my_role not in [:owner, :admin]+ }/></div>@@ -298,6 +297,13 @@ defmodule PlausibleWeb.Live.TeamManagement do{{:ok, _}, :team_management} ->reset(socket)+ {{:error, :permission_denied}, _} ->+ socket+ |> put_live_flash(+ :error,+ "Permission denied"+ )+{{:error, :only_one_owner}, _} ->socket|> put_live_flash(diff --git a/lib/plausible_web/plugs/auth_plug.ex b/lib/plausible_web/plugs/auth_plug.exindex 6985c252a1..08d9afaa3f 100644--- a/lib/plausible_web/plugs/auth_plug.ex+++ b/lib/plausible_web/plugs/auth_plug.ex@@ -22,11 +22,14 @@ defmodule PlausibleWeb.AuthPlug docurrent_team_id_from_session = Plug.Conn.get_session(conn, "current_team_id")current_team_id = conn.params["__team"] || current_team_id_from_session- current_team =+ {current_team, current_role} =if current_team_id do- user.team_memberships- |> Enum.find(%{}, &(&1.team.identifier == current_team_id))- |> Map.get(:team)+ team_membership =+ Enum.find(user.team_memberships, %{}, &(&1.team.identifier == current_team_id))++ {Map.get(team_membership, :team), Map.get(team_membership, :role)}+ else+ {nil, nil}endconn =@@ -63,6 +66,7 @@ defmodule PlausibleWeb.AuthPlug do|> assign(:current_user_session, user_session)|> assign(:my_team, my_team)|> assign(:current_team, current_team || my_team)+ |> assign(:current_role, current_role || (my_team && :owner))|> assign(:teams_count, teams_count)|> assign(:teams, teams)|> assign(:more_teams?, teams_count > 3)diff --git a/lib/plausible_web/plugs/authorize_team_access.ex b/lib/plausible_web/plugs/authorize_team_access.exnew file mode 100644index 0000000000..ff81f69684--- /dev/null+++ b/lib/plausible_web/plugs/authorize_team_access.ex@@ -0,0 +1,40 @@+defmodule Plausible.Plugs.AuthorizeTeamAccess do+ @moduledoc """+ Enforce team role to be within the declared set.+ `:current_role` is assumed to be populated by `PlausibleWeb.AuthPlug`.++ For cases where no `:current_team` exists, the plug is permissive,+ so that existing notices can be displayed still.+ """++ alias PlausibleWeb.Router.Helpers, as: Routes++ import Plug.Conn++ @all_roles Plausible.Teams.Membership.roles() -- [:guest]++ def init([]), do: @all_roles++ def init(roles) when is_list(roles) do+ true = Enum.all?(roles, &(&1 in @all_roles))+ roles+ end++ def call(conn, roles \\ @all_roles) do+ current_team = conn.assigns[:current_team]++ if current_team && Plausible.Teams.enabled?(current_team) do+ current_role = conn.assigns[:current_role]++ if current_role in roles do+ conn+ else+ conn+ |> Phoenix.Controller.redirect(to: Routes.site_path(conn, :index))+ |> halt()+ end+ else+ conn+ end+ end+enddiff --git a/lib/plausible_web/templates/settings/team_general.html.heex b/lib/plausible_web/templates/settings/team_general.html.heexindex d057dc0fa8..73ba1089a6 100644--- a/lib/plausible_web/templates/settings/team_general.html.heex+++ b/lib/plausible_web/templates/settings/team_general.html.heex@@ -20,9 +20,15 @@value={@current_team.identifier}/></div>- <.input type="text" field={f[:name]} label="Name" width="w-1/2" />+ <.input+ readonly={@current_role not in [:owner, :admin]}+ type="text"+ field={f[:name]}+ label="Name"+ width="w-1/2"+ />- <.button type="submit">+ <.button type="submit" disabled={@current_role not in [:owner, :admin]}>Change Name</.button></.form>diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.exindex 5576528977..1e79db9844 100644--- a/lib/plausible_web/views/layout_view.ex+++ b/lib/plausible_web/views/layout_view.ex@@ -97,6 +97,7 @@ defmodule PlausibleWeb.LayoutView dodef account_settings_sidebar(conn) docurrent_team = conn.assigns[:current_team]+ current_role = conn.assigns[:current_role]options = %{"Account Settings" =>@@ -116,11 +117,18 @@ defmodule PlausibleWeb.LayoutView do}if Teams.enabled?(current_team) and Teams.setup?(current_team) do- Map.put(options, "Team Settings", [- %{key: "General", value: "team/general", icon: :adjustments_horizontal},- %{key: "Subscription", value: "billing/subscription", icon: :circle_stack},- %{key: "Invoices", value: "billing/invoices", icon: :banknotes}- ])+ Map.put(+ options,+ "Team Settings",+ [+ %{key: "General", value: "team/general", icon: :adjustments_horizontal},+ %{key: "Subscription", value: "billing/subscription", icon: :circle_stack},+ if(current_role in [:owner, :admin, :billing],+ do: %{key: "Invoices", value: "billing/invoices", icon: :banknotes}+ )+ ]+ |> Enum.reject(&is_nil/1)+ )elseoptionsenddiff --git a/lib/workers/check_usage.ex b/lib/workers/check_usage.exindex a6e72e12cc..f5633dfa01 100644--- a/lib/workers/check_usage.ex+++ b/lib/workers/check_usage.ex@@ -41,6 +41,7 @@ defmodule Plausible.Workers.CheckUsage dofrom(t in Teams.Team,as: :team,inner_join: o in assoc(t, :owners),+ left_join: bm in assoc(t, :billing_members),inner_lateral_join: s in subquery(Teams.last_subscription_join_query()),on: true,left_join: ep in Plausible.Billing.EnterprisePlan,@@ -58,7 +59,7 @@ defmodule Plausible.Workers.CheckUsage doleast(day_of_month(s.last_bill_date), day_of_month(last_day_of_month(^yesterday))) ==day_of_month(^yesterday),order_by: t.id,- preload: [subscription: s, enterprise_plan: ep, owners: o]+ preload: [subscription: s, enterprise_plan: ep, owners: o, billing_members: bm]))@@ -110,7 +111,7 @@ defmodule Plausible.Workers.CheckUsage dosuggested_plan =Plausible.Billing.Plans.suggest(subscriber, pageview_usage.last_cycle.total)- for owner <- subscriber.owners do+ for owner <- subscriber.owners ++ subscriber.billing_members doPlausibleWeb.Email.over_limit_email(owner, pageview_usage, suggested_plan)|> Plausible.Mailer.send()end@@ -131,7 +132,7 @@ defmodule Plausible.Workers.CheckUsage donil{{_, pageview_usage}, {_, {site_usage, site_allowance}}} ->- for owner <- subscriber.owners do+ for owner <- subscriber.owners ++ subscriber.billing_members doPlausibleWeb.Email.enterprise_over_limit_internal_email(owner,pageview_usage,diff --git a/lib/workers/notify_annual_renewal.ex b/lib/workers/notify_annual_renewal.exindex aeb0f8385c..5013253bcc 100644--- a/lib/workers/notify_annual_renewal.ex+++ b/lib/workers/notify_annual_renewal.ex@@ -26,6 +26,7 @@ defmodule Plausible.Workers.NotifyAnnualRenewal dofrom t in Teams.Team,as: :team,inner_join: o in assoc(t, :owners),+ left_join: bm in assoc(t, :billing_members),inner_lateral_join: s in subquery(Teams.last_subscription_join_query()),on: true,left_join: sent in ^sent_notification,@@ -35,20 +36,22 @@ defmodule Plausible.Workers.NotifyAnnualRenewal dowhere:s.next_bill_date > fragment("now()::date") ands.next_bill_date <= fragment("now()::date + INTERVAL '7 days'"),- preload: [owners: o, subscription: s]+ preload: [owners: o, subscription: s, billing_members: bm])for team <- teams do+ recipients = team.owners ++ team.billing_members+case team.subscription.status doSubscription.Status.active() ->- for owner <- team.owners do- template = PlausibleWeb.Email.yearly_renewal_notification(team, owner)+ for recipient <- recipients do+ template = PlausibleWeb.Email.yearly_renewal_notification(team, recipient)Plausible.Mailer.send(template)endSubscription.Status.deleted() ->- for owner <- team.owners do- template = PlausibleWeb.Email.yearly_expiration_notification(team, owner)+ for recipient <- recipients do+ template = PlausibleWeb.Email.yearly_expiration_notification(team, recipient)Plausible.Mailer.send(template)end@@ -59,10 +62,10 @@ defmodule Plausible.Workers.NotifyAnnualRenewal do)end- for owner <- team.owners do+ for recipient <- recipients doRepo.insert_all("sent_renewal_notifications", [%{- user_id: owner.id,+ user_id: recipient.id,timestamp: NaiveDateTime.utc_now()}])diff --git a/lib/workers/send_trial_notifications.ex b/lib/workers/send_trial_notifications.exindex b5b67a0e65..5da79bab1f 100644--- a/lib/workers/send_trial_notifications.ex+++ b/lib/workers/send_trial_notifications.ex@@ -15,33 +15,36 @@ defmodule Plausible.Workers.SendTrialNotifications doRepo.all(from t in Teams.Team,inner_join: o in assoc(t, :owners),+ left_join: bm in assoc(t, :billing_members),left_join: s in assoc(t, :subscription),where: not is_nil(t.trial_expiry_date),where: is_nil(s.id),order_by: t.inserted_at,- preload: [owners: o]+ preload: [owners: o, billing_members: bm])for team <- teams do+ recipients = team.owners ++ team.billing_members+case Date.diff(team.trial_expiry_date, Date.utc_today()) do7 ->if Teams.has_active_sites?(team) do- send_one_week_reminder(team.owners)+ send_one_week_reminder(recipients)end1 ->if Teams.has_active_sites?(team) do- send_tomorrow_reminder(team.owners, team)+ send_tomorrow_reminder(recipients, team)end0 ->if Teams.has_active_sites?(team) do- send_today_reminder(team.owners, team)+ send_today_reminder(recipients, team)end-1 ->if Teams.has_active_sites?(team) do- send_over_reminder(team.owners)+ send_over_reminder(recipients)end_ ->diff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exsindex 2a8b135271..ca3a63f000 100644--- a/test/plausible/billing/billing_test.exs+++ b/test/plausible/billing/billing_test.exs@@ -489,13 +489,25 @@ defmodule Plausible.BillingTest douser = new_user()subscribe_to_growth_plan(user, status: Subscription.Status.active())+ team = team_of(user)+ billing_member = new_user()+ add_member(team, user: billing_member, role: :billing)+Billing.subscription_cancelled(%{"alert_name" => "subscription_cancelled","subscription_id" => subscription_of(user).paddle_subscription_id,"status" => "deleted"})- assert_email_delivered_with(subject: "Mind sharing your thoughts on Plausible?")+ assert_email_delivered_with(+ to: [nil: user.email],+ subject: "Mind sharing your thoughts on Plausible?"+ )++ assert_email_delivered_with(+ to: [nil: billing_member.email],+ subject: "Mind sharing your thoughts on Plausible?"+ )endenddiff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exsindex 70977d5862..28c53be63f 100644--- a/test/plausible/billing/site_locker_test.exs+++ b/test/plausible/billing/site_locker_test.exs@@ -104,6 +104,28 @@ defmodule Plausible.Billing.SiteLockerTest do)end+ test "sends email to billing members if grace period has ended" do+ grace_period = %Plausible.Teams.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}+ user = new_user(team: [grace_period: grace_period])+ subscribe_to_plan(user, "123")+ new_site(owner: user)+ team = team_of(user)+ billing_member = new_user()+ add_member(team, user: billing_member, role: :billing)++ assert SiteLocker.update_sites_for(team) == {:locked, :grace_period_ended_now}++ assert_email_delivered_with(+ to: [user],+ subject: "[Action required] Your Plausible dashboard is now locked"+ )++ assert_email_delivered_with(+ to: [billing_member],+ subject: "[Action required] Your Plausible dashboard is now locked"+ )+ end+test "does not send grace period email if site is already locked" dograce_period = %Plausible.Teams.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1),diff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exsindex ea4633a746..915a108fc7 100644--- a/test/plausible_web/controllers/billing_controller_test.exs+++ b/test/plausible_web/controllers/billing_controller_test.exs@@ -108,7 +108,7 @@ defmodule PlausibleWeb.BillingControllerTest doenddescribe "GET /billing/upgrade-success" do- setup [:create_user, :log_in]+ setup [:create_user, :create_team, :log_in]test "shows success page after user subscribes", %{conn: conn} doconn = get(conn, Routes.billing_path(conn, :upgrade_success))diff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex 71482dcd19..95eec975e9 100644--- a/test/plausible_web/live/team_management_test.exs+++ b/test/plausible_web/live/team_management_test.exs@@ -257,26 +257,38 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert_team_membership(user, team, :owner)assert_team_membership(member2, team, :owner)end- end-- describe "to be revisited" do- setup [:create_user, :log_in, :create_team, :setup_team]- @tag :capture_log- test "billing role is currently not supported by the underlying services",+ test "billing role is supported",%{conn: conn,team: team} do- Process.flag(:trap_exit, true)- _member2 = add_member(team, role: :admin)+ member2 = add_member(team, role: :admin)++ lv = get_liveview(conn)++ change_role(lv, 2, "billing")+ assert_team_membership(member2, team, :billing)+ end++ test "degrading owner to non-admin makes everything read-only", %{conn: conn, team: team} do+ _owner2 = add_member(team, role: :owner)lv = get_liveview(conn)- assert :unsupported == change_role(lv, 2, "billing")- catch- _, _ ->- :unsupported+ change_role(lv, 1, "billing")++ html = render(lv)++ options =+ lv+ |> render()+ |> find("#{member_el()} a")++ assert Enum.empty?(options)++ assert attr_defined?(html, ~s|#team-layout-form input[name="input-email"]|, "readonly")+ assert attr_defined?(html, ~s|#invite-member|, "disabled")endenddiff --git a/test/plausible_web/plugs/auth_plug_test.exs b/test/plausible_web/plugs/auth_plug_test.exsindex fc8a55d349..bf71d7189f 100644--- a/test/plausible_web/plugs/auth_plug_test.exs+++ b/test/plausible_web/plugs/auth_plug_test.exs@@ -25,6 +25,7 @@ defmodule PlausibleWeb.AuthPlugTest doassert conn.assigns[:current_user].id == user.idassert conn.assigns[:my_team].subscription.paddle_plan_id == "123"+ assert conn.assigns[:current_role] == :ownerendtest "looks up the latest subscription", %{conn: conn, user: user} do@@ -60,6 +61,7 @@ defmodule PlausibleWeb.AuthPlugTest do|> AuthPlug.call(%{})assert conn.assigns[:current_team].id == team.id+ assert conn.assigns[:current_role] == :ownerassert get_session(conn, "current_team_id") == team.identifierend@@ -104,4 +106,21 @@ defmodule PlausibleWeb.AuthPlugTest doassert conn.assigns[:current_team].id == team.idrefute get_session(conn, "current_team_id")end++ test "tracks current team role", %{conn: conn, user: user} do+ other_user = new_user()+ subscribe_to_plan(other_user, "123", inserted_at: NaiveDateTime.utc_now())+ team = team_of(other_user)++ add_member(team, user: user, role: :editor)+ conn = set_current_team(conn, team)++ conn =+ conn+ |> Plug.Adapters.Test.Conn.conn(:get, "/", %{})+ |> AuthPlug.call(%{})++ assert conn.assigns[:current_team].id == team.id+ assert conn.assigns[:current_role] == :editor+ endenddiff --git a/test/plausible_web/plugs/authorize_team_access_test.exs b/test/plausible_web/plugs/authorize_team_access_test.exsnew file mode 100644index 0000000000..5801ca33bc--- /dev/null+++ b/test/plausible_web/plugs/authorize_team_access_test.exs@@ -0,0 +1,55 @@+defmodule PlausibleWeb.Plugs.AuthorizeTeamAccessTest do+ use PlausibleWeb.ConnCase, async: true+ use Plausible.Teams.Test++ alias Plausible.Plugs.AuthorizeTeamAccess+ import Plug.Conn++ for role <- Plausible.Teams.Membership.roles() -- [:guest] do+ test "passes when valid current role: #{role}" do+ conn =+ build_conn()+ |> assign(:current_role, unquote(role))+ |> AuthorizeTeamAccess.call()++ refute conn.halted+ end+ end++ for role <- Plausible.Teams.Membership.roles() -- [:guest] do+ test "inits with role: #{role}" do+ assert AuthorizeTeamAccess.init([unquote(role)])+ end+ end++ test "fails to init with invalid role" do+ assert_raise MatchError, fn ->+ AuthorizeTeamAccess.init([:guest])+ end++ assert_raise MatchError, fn ->+ AuthorizeTeamAccess.init([:unknown])+ end+ end++ test "redirects to /sites on mismatch" do+ conn =+ build_conn()+ |> assign(:current_team, :some)+ |> assign(:current_role, :admin)+ |> AuthorizeTeamAccess.call([:owner])++ assert conn.halted+ assert redirected_to(conn, 302) == "/sites"+ end++ test "is permissive when no :current_team assigned" do+ conn =+ build_conn()+ |> assign(:current_team, nil)+ |> assign(:current_role, :admin)+ |> AuthorizeTeamAccess.call([:owner])++ refute conn.halted+ end+enddiff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exsindex fc3e53cc53..23ecd54392 100644--- a/test/workers/check_usage_test.exs+++ b/test/workers/check_usage_test.exs@@ -96,6 +96,50 @@ defmodule Plausible.Workers.CheckUsageTest do)end+ test "sends emails to billing members if available", %{user: user} do+ usage_stub =+ Plausible.Teams.Billing+ |> stub(:monthly_pageview_usage, fn _user ->+ %{+ penultimate_cycle: %{date_range: @date_range, total: 11_000},+ last_cycle: %{date_range: @date_range, total: 11_000}+ }+ end)++ user2 = new_user()+ user3 = new_user()+ new_site(owner: user)+ team = team_of(user)++ add_member(team, user: user2, role: :billing)+ add_member(team, user: user3, role: :viewer)++ subscribe_to_plan(+ user,+ @paddle_id_10k,+ last_bill_date: Date.shift(Date.utc_today(), day: -1),+ next_bill_date: Date.shift(Date.utc_today(), day: +5),+ status: :active+ )++ CheckUsage.perform(nil, usage_stub)++ assert_email_delivered_with(+ to: [user],+ subject: "[Action required] You have outgrown your Plausible subscription tier"+ )++ assert_email_delivered_with(+ to: [user2],+ subject: "[Action required] You have outgrown your Plausible subscription tier"+ )++ refute_email_delivered_with(+ to: [user3],+ subject: "[Action required] You have outgrown your Plausible subscription tier"+ )+ end+test "ignores user with paused subscription", %{user: user} dosubscribe_to_plan(user,diff --git a/test/workers/notify_annual_renewal_test.exs b/test/workers/notify_annual_renewal_test.exsindex 8f1c7f42e1..04dc557d1a 100644--- a/test/workers/notify_annual_renewal_test.exs+++ b/test/workers/notify_annual_renewal_test.exs@@ -64,12 +64,21 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest donext_bill_date: Date.shift(Date.utc_today(), day: 7))+ team = team_of(user)+ billing_member = new_user()+ add_member(team, user: billing_member, role: :billing)+NotifyAnnualRenewal.perform(nil)assert_email_delivered_with(to: [{user.name, user.email}],subject: "Your Plausible subscription is up for renewal")++ assert_email_delivered_with(+ to: [{billing_member.name, billing_member.email}],+ subject: "Your Plausible subscription is up for renewal"+ )endtest "sends renewal notification to user whose subscription is due for renewal in 2 days", %{diff --git a/test/workers/send_trial_notifications_test.exs b/test/workers/send_trial_notifications_test.exsindex 2a400e5335..406feb18f3 100644--- a/test/workers/send_trial_notifications_test.exs+++ b/test/workers/send_trial_notifications_test.exs@@ -58,6 +58,21 @@ defmodule Plausible.Workers.SendTrialNotificationsTest doassert_delivered_email(PlausibleWeb.Email.trial_one_week_reminder(user))end+ test "includes billing member in recipients" do+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 7))+ site = new_site(owner: user)+ team = team_of(user)+ billing_member = new_user()+ add_member(team, user: billing_member, role: :billing)++ populate_stats(site, [build(:pageview)])++ perform_job(SendTrialNotifications, %{})++ assert_delivered_email(PlausibleWeb.Email.trial_one_week_reminder(user))+ assert_delivered_email(PlausibleWeb.Email.trial_one_week_reminder(billing_member))+ end+test "sends an upgrade email the day before the trial ends" douser = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)