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 user and team deletion from CRM (#5241)
Adrian Gruntkowskie17074614ea3
diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.exindex aeeab66f48..82437178de 100644--- a/lib/plausible/auth/user_admin.ex+++ b/lib/plausible/auth/user_admin.ex@@ -22,10 +22,13 @@ defmodule Plausible.Auth.UserAdmin dodef delete(_conn, %{data: user}) docase Plausible.Auth.delete_user(user) do{:ok, :deleted} ->- :ok+ {:ok, user}++ {:error, :active_subscription} ->+ {user, "User's personal team has an active subscription which must be canceled first."}{:error, :is_only_team_owner} ->- "The user is the only public team owner on one or more teams."+ {user, "The user is the only public team owner on one or more teams."}endenddiff --git a/lib/plausible/teams/team_admin.ex b/lib/plausible/teams/team_admin.exindex c9bae5d10a..820468dbb1 100644--- a/lib/plausible/teams/team_admin.ex+++ b/lib/plausible/teams/team_admin.ex@@ -87,9 +87,14 @@ defmodule Plausible.Teams.TeamAdmin do]end- def delete(_conn, %{data: _team}) do- # TODO: Implement custom team removal- "Cannot remove the team for now"+ def delete(_conn, %{data: team}) do+ case Teams.delete(team) do+ {:ok, :deleted} ->+ {:ok, team}++ {:error, :active_subscription} ->+ {team, "The team has an active subscription which must be canceled first."}+ endenddef grace_period_status(team) dodiff --git a/test/plausible_web/controllers/admin_controller_test.exs b/test/plausible_web/controllers/admin_controller_test.exsindex ab3f2887e5..127e2498de 100644--- a/test/plausible_web/controllers/admin_controller_test.exs+++ b/test/plausible_web/controllers/admin_controller_test.exs@@ -65,6 +65,115 @@ defmodule PlausibleWeb.AdminControllerTest doendend+ describe "DELETE /crm/auth/user/:user_id" do+ setup [:create_user, :log_in]++ setup %{user: user} do+ patch_env(:super_admin_user_ids, [user.id])++ :ok+ end++ @tag :ee_only+ test "deletes a user without a team", %{conn: conn} do+ another_user = new_user()++ conn = delete(conn, "/crm/auth/user/#{another_user.id}")+ assert redirected_to(conn, 302) == "/crm/auth/user"++ refute Repo.reload(another_user)+ end++ @tag :ee_only+ test "deletes a user with a personal team without subscription", %{conn: conn} do+ another_user = new_user()+ site = new_site(owner: another_user)+ team = team_of(another_user)++ conn = delete(conn, "/crm/auth/user/#{another_user.id}")+ assert redirected_to(conn, 302) == "/crm/auth/user"++ refute Repo.reload(another_user)+ refute Repo.reload(site)+ refute Repo.reload(team)+ end++ @tag :ee_only+ test "fails to delete a user with a personal team with active subscription", %{conn: conn} do+ another_user = new_user() |> subscribe_to_growth_plan()+ site = new_site(owner: another_user)+ team = team_of(another_user)++ conn = delete(conn, "/crm/auth/user/#{another_user.id}")+ assert redirected_to(conn, 302) == "/crm/auth/user/#{another_user.id}"++ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~+ "User's personal team has an active subscription"++ assert Repo.reload(another_user)+ assert Repo.reload(site)+ assert Repo.reload(team)+ end++ @tag :ee_only+ test "fails to delete a user who is the only owner on a public team", %{conn: conn} do+ another_user = new_user()+ site = new_site(owner: another_user)+ team = another_user |> team_of() |> Plausible.Teams.complete_setup()++ conn = delete(conn, "/crm/auth/user/#{another_user.id}")+ assert redirected_to(conn, 302) == "/crm/auth/user/#{another_user.id}"++ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~+ "The user is the only public team owner"++ assert Repo.reload(another_user)+ assert Repo.reload(site)+ assert Repo.reload(team)+ end+ end++ describe "DELETE /crm/teams/team/:team_id" do+ setup [:create_user, :log_in]++ setup %{user: user} do+ patch_env(:super_admin_user_ids, [user.id])++ :ok+ end++ @tag :ee_only+ test "deletes a team", %{conn: conn} do+ another_user = new_user()+ site = new_site(owner: another_user)+ team = team_of(another_user)++ conn = delete(conn, "/crm/teams/team/#{team.id}")+ assert redirected_to(conn, 302) == "/crm/teams/team"++ refute Repo.reload(team)+ refute Repo.reload(site)+ assert Repo.reload(another_user)+ end++ @tag :ee_only+ test "fails to delete a team with an active subscription", %{conn: conn} do+ another_user = new_user() |> subscribe_to_growth_plan()+ site = new_site(owner: another_user)+ team = team_of(another_user)++ conn = delete(conn, "/crm/teams/team/#{team.id}")+ assert redirected_to(conn, 302) == "/crm/teams/team/#{team.id}"++ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~+ "The team has an active subscription"++ assert Repo.reload(team)+ assert Repo.reload(site)+ assert Repo.reload(another_user)+ end+ end+describe "POST /crm/sites/site/:site_id" dosetup [:create_user, :log_in]