diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index 41ab6f641..826b7c20d 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -165,7 +165,9 @@ defmodule PlausibleWeb.AuthController do end def delete_me(conn, _params) do - user = conn.assigns[:current_user] |> Repo.preload(:sites) + user = conn.assigns[:current_user] + |> Repo.preload(:sites) + |> Repo.preload(:subscription) for site_membership <- user.site_memberships do Repo.delete!(site_membership) @@ -175,6 +177,7 @@ defmodule PlausibleWeb.AuthController do Repo.delete!(site) end + Repo.delete!(user.subscription) Repo.delete!(user) conn diff --git a/lib/plausible_web/templates/auth/user_settings.html.eex b/lib/plausible_web/templates/auth/user_settings.html.eex index 1bc78f44b..dbfd1765c 100644 --- a/lib/plausible_web/templates/auth/user_settings.html.eex +++ b/lib/plausible_web/templates/auth/user_settings.html.eex @@ -79,6 +79,12 @@
-Deleting your account removes all sites and stats you've collected
- <%= link "Delete my account ", to: "/me", method: :delete, class: "button bg-red-dark mt-4", data: [confirm: "Deleting your account cannot be reversed. Are you sure?"] %> +Deleting your account removes all sites and stats you've collected
+ + <%= if @subscription && @subscription.status == "active" do %> + +Your account cannot be deleted because you have an active subscription. If you want to delete your account, please cancel your subscription first.
+ <% else %> + <%= link "Delete my account ", to: "/me", method: :delete, class: "button bg-red-dark mt-6", data: [confirm: "Deleting your account cannot be reversed. Are you sure?"] %> + <% end %> diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exs index 36ba343a9..2c4367cb7 100644 --- a/test/plausible_web/controllers/auth_controller_test.exs +++ b/test/plausible_web/controllers/auth_controller_test.exs @@ -164,6 +164,7 @@ defmodule PlausibleWeb.AuthControllerTest do }]) insert(:google_auth, site: site, user: user) + insert(:subscription, user: user, status: "deleted") conn = delete(conn, "/me") assert redirected_to(conn) == "/"