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
Implement team deletion and refactor user deletion (#5196)
Adrian Gruntkowskif15305254b1b
diff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.exindex d146c9d62d..02de141988 100644--- a/lib/plausible/auth/auth.ex+++ b/lib/plausible/auth/auth.ex@@ -70,52 +70,76 @@ defmodule Plausible.Auth doendend+ @spec delete_user(Auth.User.t()) ::+ {:ok, :deleted} | {:error, :is_only_team_owner | :active_subscription}def delete_user(user) do- Repo.transaction(fn ->- case Teams.get_by_owner(user) do- {:ok, %{setup_complete: false} = team} ->- for site <- Teams.owned_sites(team) do- Plausible.Site.Removal.run(site)- end+ case Teams.get_by_owner(user) do+ {:ok, %{setup_complete: false} = team} ->+ delete_team_and_user(team, user)++ {:ok, team} ->+ with :ok <- check_can_leave_team(team) do+ delete_user!(user)+ {:ok, :deleted}+ end- Repo.delete_all(from s in Plausible.Billing.Subscription, where: s.team_id == ^team.id)+ {:error, :multiple_teams} ->+ teams = Teams.Users.owned_teams(user)- Repo.delete_all(- from ep in Plausible.Billing.EnterprisePlan, where: ep.team_id == ^team.id- )+ with :ok <- check_can_leave_teams(teams) do+ personal_team = Enum.find(teams, &(not Teams.setup?(&1)))+ delete_team_and_user(personal_team, user)+ end- Plausible.Segments.user_removed(user)- Repo.delete!(team)- Repo.delete!(user)+ {:error, :no_team} ->+ delete_user!(user)+ {:ok, :deleted}+ end+ end- {:ok, team} ->- check_can_leave_team!(team)- Repo.delete!(user)+ defp delete_team_and_user(nil, user) do+ delete_user!(user)+ {:ok, :deleted}+ end- {:error, :multiple_teams} ->- check_can_leave_teams!(user)- Repo.delete!(user)+ defp delete_team_and_user(team, user) do+ Repo.transaction(fn ->+ case Teams.delete(team) do+ {:ok, :deleted} ->+ delete_user!(user)+ :deleted- {:error, :no_team} ->- Repo.delete!(user)+ {:error, error} ->+ Repo.rollback(error)end+ end)+ end- :deleted+ defp delete_user!(user) do+ Repo.transaction(fn ->+ Plausible.Segments.user_removed(user)+ Repo.delete!(user)end)++ :okend- defp check_can_leave_teams!(user) do- user- |> Teams.Users.owned_teams()- |> Enum.reject(&(&1.setup_complete == false))- |> Enum.map(fn team ->- check_can_leave_team!(team)+ defp check_can_leave_teams(teams) do+ teams+ |> Enum.filter(& &1.setup_complete)+ |> Enum.reduce_while(:ok, fn team, :ok ->+ case check_can_leave_team(team) do+ :ok -> {:cont, :ok}+ {:error, error} -> {:halt, {:error, error}}+ endend)end- defp check_can_leave_team!(team) do- if Teams.Memberships.owners_count(team) <= 1 do- Repo.rollback(:is_only_team_owner)+ defp check_can_leave_team(team) do+ if Teams.Memberships.owners_count(team) > 1 do+ :ok+ else+ {:error, :is_only_team_owner}endenddiff --git a/lib/plausible/teams.ex b/lib/plausible/teams.exindex df6adaf829..ed94c16c62 100644--- a/lib/plausible/teams.ex+++ b/lib/plausible/teams.ex@@ -7,6 +7,7 @@ defmodule Plausible.Teams doalias __MODULE__alias Plausible.Auth+ alias Plausible.Billingalias Plausible.Repouse Plausible@@ -185,6 +186,29 @@ defmodule Plausible.Teams doendend+ @spec delete(Teams.Team.t()) :: {:ok, :deleted} | {:error, :active_subscription}+ def delete(team) do+ team = Teams.with_subscription(team)++ if Billing.Subscription.Status.active?(team.subscription) do+ {:error, :active_subscription}+ else+ Repo.transaction(fn ->+ for site <- Teams.owned_sites(team) do+ Plausible.Site.Removal.run(site)+ end++ Repo.delete_all(from s in Billing.Subscription, where: s.team_id == ^team.id)++ Repo.delete_all(from ep in Billing.EnterprisePlan, where: ep.team_id == ^team.id)++ Repo.delete!(team)++ :deleted+ end)+ end+ end+@spec get_by_owner(Auth.User.t()) ::{:ok, Teams.Team.t()} | {:error, :no_team | :multiple_teams}def get_by_owner(user) dodiff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.exindex 9731e32c83..bfc72398ad 100644--- a/lib/plausible_web/controllers/auth_controller.ex+++ b/lib/plausible_web/controllers/auth_controller.ex@@ -476,6 +476,14 @@ defmodule PlausibleWeb.AuthController do{:ok, :deleted} ->logout(conn, params)+ {:error, :active_subscription} ->+ conn+ |> put_flash(+ :error,+ "You have an active subscription which must be canceled first."+ )+ |> redirect(to: Routes.settings_path(conn, :danger_zone))+{:error, :is_only_team_owner} ->conn|> put_flash(diff --git a/lib/plausible_web/controllers/settings_controller.ex b/lib/plausible_web/controllers/settings_controller.exindex 6eda6e2927..1a6f80896a 100644--- a/lib/plausible_web/controllers/settings_controller.ex+++ b/lib/plausible_web/controllers/settings_controller.ex@@ -14,6 +14,9 @@ defmodule PlausibleWeb.SettingsController doplug Plausible.Plugs.AuthorizeTeamAccess,[:owner, :admin, :billing] when action in [:invoices]+ plug Plausible.Plugs.AuthorizeTeamAccess,+ [:owner] when action in [:team_danger_zone, :delete_team]+def index(conn, _params) doredirect(conn, to: Routes.settings_path(conn, :preferences))end@@ -129,7 +132,41 @@ defmodule PlausibleWeb.SettingsController doenddef danger_zone(conn, _params) do- render(conn, :danger_zone, layout: {PlausibleWeb.LayoutView, :settings})+ solely_owned_teams =+ conn.assigns.current_user+ |> Teams.Users.owned_teams()+ |> Enum.filter(& &1.setup_complete)+ |> Enum.reject(fn team ->+ Teams.Memberships.owners_count(team) > 1+ end)++ render(conn, :danger_zone,+ solely_owned_teams: solely_owned_teams,+ layout: {PlausibleWeb.LayoutView, :settings}+ )+ end++ def team_danger_zone(conn, _params) do+ render(conn, :team_danger_zone, layout: {PlausibleWeb.LayoutView, :settings})+ end++ def delete_team(conn, _params) do+ team = conn.assigns.current_team++ case Plausible.Teams.delete(team) do+ {:ok, :deleted} ->+ conn+ |> put_flash(:success, ~s|Team "#{Plausible.Teams.name(team)}" deleted|)+ |> redirect(to: Routes.site_path(conn, :index, __team: "none"))++ {:error, :active_subscription} ->+ conn+ |> put_flash(+ :error,+ "Team has an active subscription. You must cancel it first."+ )+ |> redirect(to: Routes.settings_path(conn, :team_danger_zone))+ endend# Preferences actionsdiff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.exindex 9b24057f13..3e6ff456e0 100644--- a/lib/plausible_web/live/team_management.ex+++ b/lib/plausible_web/live/team_management.ex@@ -57,7 +57,7 @@ defmodule PlausibleWeb.Live.TeamManagement doname="input-email"type="email"value={@input_email}- placeholder="Enter e-mail to send invitation to"+ placeholder="Enter e-mail"phx-debounce={200}readonly={at_limit?(@layout, @team_members_limit) or @my_role not in [:admin, :owner]}mt?={false}@@ -158,7 +158,7 @@ defmodule PlausibleWeb.Live.TeamManagement dophx-click="save-team-layout"class="mt-8 w-full">- Setup Team+ Create Team</.button></div>"""@@ -288,7 +288,7 @@ defmodule PlausibleWeb.Live.TeamManagement docase {result, socket.assigns.mode} do{{:ok, _}, :team_setup} ->socket- |> put_flash(:success, "Your team is now setup")+ |> put_flash(:success, "Your team is now created")|> redirect(to: Routes.settings_path(socket, :team_general, __team: current_team.identifier))diff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.exindex d46f8e3e18..53779b1843 100644--- a/lib/plausible_web/live/team_setup.ex+++ b/lib/plausible_web/live/team_setup.ex@@ -18,7 +18,7 @@ defmodule PlausibleWeb.Live.TeamSetup docase {enabled?, current_team} do{true, %Teams.Team{setup_complete: true}} ->socket- |> put_flash(:success, "Your team is now setup")+ |> put_flash(:success, "Your team is now created")|> redirect(to: Routes.settings_path(socket, :team_general)){true, %Teams.Team{}} ->@@ -41,7 +41,7 @@ defmodule PlausibleWeb.Live.TeamSetup do{_, _} ->socket- |> put_flash(:error, "You cannot set up any team just yet")+ |> put_flash(:error, "You cannot create any team just yet")|> redirect(to: Routes.site_path(socket, :index))end@@ -59,9 +59,9 @@ defmodule PlausibleWeb.Live.TeamSetup dodef render(assigns) do~H"""<.focus_box>- <:title>Setup a new team</:title>+ <:title>Create a new team</:title><:subtitle>- Add members and assign roles to manage different sites access efficiently+ Add your team members and assign their roles</:subtitle><.formdiff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex 39db08b7a7..a8e753134a 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -393,6 +393,8 @@ defmodule PlausibleWeb.Router dopost "/team/invitations/:invitation_id/accept", InvitationController, :accept_invitationpost "/team/invitations/:invitation_id/reject", InvitationController, :reject_invitationdelete "/team/invitations/:invitation_id", InvitationController, :remove_team_invitation+ get "/team/delete", SettingsController, :team_danger_zone+ delete "/team/delete", SettingsController, :delete_teamendscope "/", PlausibleWeb dodiff --git a/lib/plausible_web/templates/layout/_header.html.heex b/lib/plausible_web/templates/layout/_header.html.heexindex 5df0b71802..f2ff9c00ec 100644--- a/lib/plausible_web/templates/layout/_header.html.heex+++ b/lib/plausible_web/templates/layout/_header.html.heex@@ -91,7 +91,7 @@}><.dropdown_item class="flex" href={Routes.team_setup_path(@conn, :setup)}><span class="flex-1">- Setup a Team+ Create a Team</span><span class="ml-1 bg-indigo-700 text-gray-100 text-xs p-1 rounded">NEWdiff --git a/lib/plausible_web/templates/settings/danger_zone.html.heex b/lib/plausible_web/templates/settings/danger_zone.html.heexindex ea776d8920..1c6820b21d 100644--- a/lib/plausible_web/templates/settings/danger_zone.html.heex+++ b/lib/plausible_web/templates/settings/danger_zone.html.heex@@ -7,19 +7,33 @@<:title>Delete Account</:title><:subtitle>Deleting your account removes all sites and stats you've collected</:subtitle>- <%= if Plausible.Billing.Subscription.Status.active?(@current_team && @current_team.subscription) do %>- <.notice theme={:gray} title="Cannot delete account at this time">- Your account cannot be deleted because you have an active subscription. If you want to delete your account, please cancel your subscription first.- </.notice>- <% else %>- <.button_link- data-confirm="Deleting your account will also delete all the sites and data that you own. This action cannot be reversed. Are you sure?"- href="/me"- method="delete"- theme="danger"- >- Delete my account- </.button_link>+ <%= cond do %>+ <% length(@solely_owned_teams) > 0 -> %>+ <.notice theme={:gray} title="Cannot delete account at this time">+ You are the sole owner of one or more teams. If you want to delete your account, please either add another owner or delete each of the following teams:+ <ul class="w-full py-4">+ <li :for={team <- @solely_owned_teams} class="pt-1">+ <.styled_link href={+ Routes.settings_path(@conn, :team_general, __team: team.identifier)+ }>+ {Plausible.Teams.name(team)}+ </.styled_link>+ </li>+ </ul>+ </.notice>+ <% Plausible.Billing.Subscription.Status.active?(@my_team && @my_team.subscription) -> %>+ <.notice theme={:gray} title="Cannot delete account at this time">+ Your account cannot be deleted because you have an active subscription. If you want to delete your account, please cancel your subscription first.+ </.notice>+ <% true -> %>+ <.button_link+ data-confirm="Deleting your account will also delete all the sites and data that you own. This action cannot be reversed. Are you sure?"+ href="/me"+ method="delete"+ theme="danger"+ >+ Delete my account+ </.button_link><% end %></.tile></.settings_tiles>diff --git a/lib/plausible_web/templates/settings/team_danger_zone.html.heex b/lib/plausible_web/templates/settings/team_danger_zone.html.heexnew file mode 100644index 0000000000..acc6f3b2fd--- /dev/null+++ b/lib/plausible_web/templates/settings/team_danger_zone.html.heex@@ -0,0 +1,25 @@+<.notice title="Danger Zone" theme={:red}>+ Destructive actions below can result in irrecoverable data loss. Be careful.+</.notice>++<.settings_tiles>+ <.tile docs="delete-team">+ <:title>Delete Team</:title>+ <:subtitle>Deleting the team removes all associated sites and collected stats</:subtitle>++ <%= if Plausible.Billing.Subscription.Status.active?(@current_team && @current_team.subscription) do %>+ <.notice theme={:gray} title="Cannot delete the team at this time">+ The team cannot be deleted because it has an active subscription. Please cancel the subscription first.+ </.notice>+ <% else %>+ <.button_link+ data-confirm="Deleting the team will also delete all the associated sites and data. This action cannot be reversed. Are you sure?"+ href={Routes.settings_path(@conn, :delete_team)}+ method="delete"+ theme="danger"+ >+ Delete "{Plausible.Teams.name(@current_team)}"+ </.button_link>+ <% end %>+ </.tile>+</.settings_tiles>diff --git a/lib/plausible_web/templates/settings/team_general.html.heex b/lib/plausible_web/templates/settings/team_general.html.heexindex b7066d9582..962cc3a03e 100644--- a/lib/plausible_web/templates/settings/team_general.html.heex+++ b/lib/plausible_web/templates/settings/team_general.html.heex@@ -38,7 +38,7 @@<a id="team-members">Team Members</a></:title><:subtitle>- Add, remove or change your team memberships+ Add or remove team members and adjust their roles</:subtitle>{live_render(@conn, PlausibleWeb.Live.TeamManagement,id: "team-setup",diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.exindex 254469943a..9be4ca8f25 100644--- a/lib/plausible_web/views/layout_view.ex+++ b/lib/plausible_web/views/layout_view.ex@@ -125,6 +125,9 @@ defmodule PlausibleWeb.LayoutView do%{key: "Subscription", value: "billing/subscription", icon: :circle_stack},if(current_team_role in [:owner, :admin, :billing],do: %{key: "Invoices", value: "billing/invoices", icon: :banknotes}+ ),+ if(current_team_role == :owner,+ do: %{key: "Danger Zone", value: "team/delete", icon: :exclamation_triangle})]|> Enum.reject(&is_nil/1)diff --git a/test/plausible/teams_test.exs b/test/plausible/teams_test.exsindex 4025dfe66c..31801f4653 100644--- a/test/plausible/teams_test.exs+++ b/test/plausible/teams_test.exs@@ -3,9 +3,12 @@ defmodule Plausible.TeamsTest douse Plausibleuse Plausible.Teams.Test+ alias Plausible.Billing.Subscriptionalias Plausible.Teamsalias Plausible.Repo+ require Plausible.Billing.Subscription.Status+describe "name/1" dotest "returns default name when there's no team" doassert Teams.name(nil) == "My Personal Sites"@@ -323,4 +326,71 @@ defmodule Plausible.TeamsTest doassert Teams.accept_traffic_until(team_of(user)) == ~D[2135-01-01]endend++ describe "delete/1" do+ test "deletes a team" do+ user = new_user()+ subscribe_to_growth_plan(user, status: Subscription.Status.deleted())+ subscribe_to_enterprise_plan(user, site_limit: 1, subscription?: false)+ team = team_of(user)+ team = Teams.complete_setup(team)++ another_user = new_user()+ another_site = new_site(owner: another_user)+ another_team = team_of(another_user)+ add_member(another_team, user: user, role: :owner)++ site1 = new_site(team: team)+ site2 = new_site(team: team)++ viewer_member = new_user()+ add_member(team, user: viewer_member, role: :viewer)+ owner_member = new_user()+ add_member(team, user: owner_member, role: :owner)++ guest_member = new_user()+ add_guest(site1, user: guest_member, role: :editor)++ team_invitee = new_user()+ invite_member(team, team_invitee, inviter: user, role: :admin)+ guest_invitee = new_user()+ invite_guest(site2, guest_invitee, inviter: user, role: :viewer)++ assert {:ok, :deleted} = Teams.delete(team)++ refute Repo.reload(team)++ assert Repo.reload(another_user)+ assert Repo.reload(another_team)+ assert Repo.reload(another_site)++ refute Repo.reload(site1)+ refute Repo.reload(site2)++ assert Repo.reload(viewer_member)+ refute_team_member(viewer_member, team)++ assert Repo.reload(owner_member)+ refute_team_member(owner_member, team)++ assert Repo.reload(guest_member)+ refute_team_member(guest_member, team)++ assert Repo.reload(team_invitee)+ refute_team_invitation(team, team_invitee.email)++ assert Repo.reload(guest_invitee)+ refute_team_invitation(team, guest_invitee.email)+ end++ test "does not delete a team with active subscription" do+ user = new_user()+ subscribe_to_growth_plan(user, status: Subscription.Status.active())+ team = team_of(user)++ assert {:error, :active_subscription} = Teams.delete(team)++ assert Repo.reload(team)+ end+ endenddiff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex 81835163c1..8e67e1969b 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -587,7 +587,6 @@ defmodule PlausibleWeb.AuthControllerTest doinsert(:google_auth, site: site, user: user)subscribe_to_growth_plan(user, status: Subscription.Status.deleted())- subscribe_to_growth_plan(user, status: Subscription.Status.active())subscribe_to_enterprise_plan(user, site_limit: 1, subscription?: false){:ok, team} = Plausible.Teams.get_or_create(user)@@ -601,6 +600,22 @@ defmodule PlausibleWeb.AuthControllerTest dorefute Repo.get(Plausible.Teams.Team, team.id)end+ test "refuses to delete when a personal team has an active subscription", %{+ conn: conn,+ user: user+ } do+ subscribe_to_growth_plan(user, status: Subscription.Status.active())++ conn = delete(conn, "/me")++ assert redirected_to(conn, 302) == Routes.settings_path(conn, :danger_zone)++ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~+ "You have an active subscription which must be canceled first"++ assert Repo.reload(user)+ end+test "deletes sites that the user owns", %{conn: conn, user: user, site: owner_site} doviewer_site = new_site()add_guest(viewer_site, user: user, role: :viewer)@@ -734,11 +749,31 @@ defmodule PlausibleWeb.AuthControllerTest do} doanother_owner = new_user()another_site = new_site(owner: another_owner)+ team = team_of(another_owner)add_member(another_site.team, user: user, role: :owner)delete(conn, "/me")refute Repo.reload(user)+ assert Repo.reload(team)+ end++ test "deletes personal team in multiple teams case as well", %{+ conn: conn,+ user: user+ } do+ new_site(owner: user)+ personal_team = team_of(user)+ another_owner = new_user()+ _another_site = new_site(owner: another_owner)+ another_team = team_of(another_owner)+ add_member(another_team, user: user, role: :owner)++ delete(conn, "/me")++ refute Repo.reload(user)+ assert Repo.reload(another_team)+ refute Repo.reload(personal_team)endenddiff --git a/test/plausible_web/controllers/settings_controller_test.exs b/test/plausible_web/controllers/settings_controller_test.exsindex 309fa043b7..dd51e4e839 100644--- a/test/plausible_web/controllers/settings_controller_test.exs+++ b/test/plausible_web/controllers/settings_controller_test.exs@@ -1107,6 +1107,45 @@ defmodule PlausibleWeb.SettingsControllerTest doendend+ describe "GET /settings/danger-zone" do+ setup [:create_user, :log_in, :create_team]++ test "without active subscription", %{conn: conn} do+ conn = get(conn, Routes.settings_path(conn, :danger_zone))++ assert html = html_response(conn, 200)++ refute html =~ "Your account cannot be deleted because you have an active subscription"+ assert html =~ "Delete my account"+ end++ test "with active subscription", %{conn: conn, user: user} do+ subscribe_to_growth_plan(user)+ conn = get(conn, Routes.settings_path(conn, :danger_zone))++ assert html = html_response(conn, 200)++ assert html =~ "Your account cannot be deleted because you have an active subscription"+ refute html =~ "Delete my account"+ end++ test "with a setup team", %{conn: conn, user: user} do+ new_site(owner: user)++ _team =+ user+ |> team_of()+ |> Plausible.Teams.complete_setup()++ conn = get(conn, Routes.settings_path(conn, :danger_zone))++ assert html = html_response(conn, 200)++ assert html =~ "You are the sole owner of one or more teams"+ refute html =~ "Delete my account"+ end+ end+describe "Team Settings" dosetup [:create_user, :log_in]@@ -1172,6 +1211,101 @@ defmodule PlausibleWeb.SettingsControllerTest doassert text(html_response(conn, 200)) =~ "can't be blank"end++ test "GET /settings/team/delete - without active subscription", %{conn: conn, user: user} do+ {:ok, team} = Plausible.Teams.get_or_create(user)++ team =+ team+ |> Plausible.Teams.complete_setup()+ |> Ecto.Changeset.change(name: "Foo Crew")+ |> Repo.update!()++ conn = set_current_team(conn, team)+ conn = get(conn, Routes.settings_path(conn, :team_danger_zone))++ assert html = html_response(conn, 200)++ refute html =~ "The team cannot be deleted because it has an active subscription"+ assert html =~ "Delete \"Foo Crew\""+ end++ test "GET /settings/team/delete - with active subscription", %{conn: conn, user: user} do+ user = subscribe_to_growth_plan(user)+ team = team_of(user)++ team =+ team+ |> Plausible.Teams.complete_setup()+ |> Ecto.Changeset.change(name: "Foo Crew")+ |> Repo.update!()++ conn = set_current_team(conn, team)+ conn = get(conn, Routes.settings_path(conn, :team_danger_zone))++ assert html = html_response(conn, 200)++ assert html =~ "The team cannot be deleted because it has an active subscription"+ refute html =~ "Delete \"Foo Crew\""+ end++ test "GET /settings/team/delete - permission denied", %{conn: conn, user: user} do+ another_user = new_user() |> subscribe_to_growth_plan()+ team = team_of(another_user)+ add_member(team, user: user, role: :admin)+ conn = set_current_team(conn, team)+ conn = get(conn, Routes.settings_path(conn, :team_danger_zone))++ assert redirected_to(conn, 302) == Routes.site_path(conn, :index)+ end++ test "DELETE /settings/team/delete - deletes a team", %{conn: conn, user: user} do+ {:ok, team} = Plausible.Teams.get_or_create(user)++ team =+ team+ |> Plausible.Teams.complete_setup()+ |> Ecto.Changeset.change(name: "Foo Crew")+ |> Repo.update!()++ conn = set_current_team(conn, team)+ conn = delete(conn, Routes.settings_path(conn, :delete_team))++ assert redirected_to(conn, 302) == Routes.site_path(conn, :index, __team: "none")++ assert Phoenix.Flash.get(conn.assigns.flash, :success) == "Team \"Foo Crew\" deleted"+ end++ test "DELETE /settings/team/delete - fails when there's an active subscription", %{+ conn: conn,+ user: user+ } do+ subscribe_to_growth_plan(user)+ team = team_of(user)++ team =+ team+ |> Plausible.Teams.complete_setup()+ |> Ecto.Changeset.change(name: "Foo Crew")+ |> Repo.update!()++ conn = set_current_team(conn, team)+ conn = delete(conn, Routes.settings_path(conn, :delete_team))++ assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_danger_zone)++ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "Team has an active subscription"+ end++ test "DELETE /settings/team/delete - permission denied", %{conn: conn, user: user} do+ another_user = new_user() |> subscribe_to_growth_plan()+ team = team_of(another_user)+ add_member(team, user: user, role: :admin)+ conn = set_current_team(conn, team)+ conn = delete(conn, Routes.settings_path(conn, :delete_team))++ assert redirected_to(conn, 302) == Routes.site_path(conn, :index)+ endenddefp configure_enterprise_plan(user, attrs \\ []) dodiff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex 16ccca9606..8788efd878 100644--- a/test/plausible_web/live/team_management_test.exs+++ b/test/plausible_web/live/team_management_test.exs@@ -19,7 +19,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest do|> html_response(200)|> text()- assert resp =~ "Add, remove or change your team memberships"+ assert resp =~ "Add or remove team members and adjust their roles"refute element_exists?(resp, ~s|button[phx-click="save-team-layout"]|)enddiff --git a/test/support/teams/test.ex b/test/support/teams/test.exindex 69fe85c87d..445a721bbd 100644--- a/test/support/teams/test.ex+++ b/test/support/teams/test.ex@@ -340,6 +340,13 @@ defmodule Plausible.Teams.Test do)end+ def refute_team_invitation(team, email) do+ refute Repo.get_by(Plausible.Teams.Invitation,+ email: email,+ team_id: team.id+ )+ end+def assert_site_transfer(site, %Plausible.Auth.User{} = user) doassert_site_transfer(site, user.email)end