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
Allow site creation for users owning the `domain_changed_from` (#4215)
hq19f1f8268016c
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex eb792946ff..4fbf857abb 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -169,7 +169,25 @@ defmodule Plausible.Sites dodef create(user, params) dowith :ok <- Quota.ensure_can_add_new_site(user) doEcto.Multi.new()- |> Ecto.Multi.insert(:site, Site.new(params))+ |> Ecto.Multi.put(:site_changeset, Site.new(params))+ |> Ecto.Multi.run(:clear_changed_from, fn+ _repo, %{site_changeset: %{changes: %{domain: domain}}} ->+ case get_for_user(user.id, domain, [:owner]) do+ %Site{domain_changed_from: ^domain} = site ->+ site+ |> Ecto.Changeset.change()+ |> Ecto.Changeset.put_change(:domain_changed_from, nil)+ |> Ecto.Changeset.put_change(:domain_changed_at, nil)+ |> Repo.update()++ _ ->+ {:ok, :ignore}+ end++ _repo, _context ->+ {:ok, :ignore}+ end)+ |> Ecto.Multi.insert(:site, fn %{site_changeset: site} -> site end)|> Ecto.Multi.insert(:site_membership, fn %{site: site} ->Site.Membership.new(site, user)end)diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex 27913c2acc..0ada893b77 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -436,6 +436,31 @@ defmodule PlausibleWeb.SiteControllerTest doassert html_response(conn, 200) =~"This domain cannot be registered. Perhaps one of your colleagues registered it?"end++ test "allows creating the site if domain was changed by the owner", %{+ conn: conn,+ user: user+ } do+ :site+ |> insert(+ domain: "example.com",+ memberships: [+ build(:site_membership, user: user, role: :owner)+ ]+ )+ |> Plausible.Site.Domain.change("new.example.com")++ conn =+ post(conn, "/sites", %{+ "site" => %{+ "domain" => "example.com",+ "timezone" => "Europe/London"+ }+ })++ assert redirected_to(conn) ==+ "/example.com/snippet?site_created=true"+ endenddescribe "GET /:website/snippet" do