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
Tolerate users trying to add domain they already own (#6096)
Adam Rutkowski37a75f445f7a
diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex c5909bbbc2..a9a560bd4d 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -80,14 +80,20 @@ defmodule PlausibleWeb.SiteController do){:error, _, changeset, _} ->- render(conn, "new.html",- changeset: changeset,- first_site?: first_site?,- site_limit: Plausible.Teams.Billing.site_limit(team),- site_limit_exceeded?: false,- flow: flow,- form_submit_url: "/sites?flow=#{flow}"- )+ case check_can_already_access(changeset, user) do+ {:ok, domain} ->+ redirect(conn, to: Routes.stats_path(PlausibleWeb.Endpoint, :stats, domain, []))++ {:error, :no_access} ->+ render(conn, "new.html",+ changeset: changeset,+ first_site?: first_site?,+ site_limit: Plausible.Teams.Billing.site_limit(team),+ site_limit_exceeded?: false,+ flow: flow,+ form_submit_url: "/sites?flow=#{flow}"+ )+ endendend@@ -632,4 +638,24 @@ defmodule PlausibleWeb.SiteController dootherendend++ defp check_can_already_access(changeset, user) do+ domain = Ecto.Changeset.get_change(changeset, :domain)++ with true <- domain_taken_error?(changeset),+ site = Sites.get_by_domain(domain),+ true <- not is_nil(site),+ true <- Plausible.Teams.Memberships.has_editor_access?(site, user) do+ {:ok, domain}+ else+ false -> {:error, :no_access}+ end+ end++ defp domain_taken_error?(changeset) do+ Enum.any?(changeset.errors, fn+ {:domain, {_, [constraint: :unique, constraint_name: "sites_domain_index"]}} -> true+ _ -> false+ end)+ endenddiff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex 31cabe186f..c3b32fc564 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -467,7 +467,7 @@ defmodule PlausibleWeb.SiteControllerTest doendtest "renders form again when it is a duplicate domain", %{conn: conn} do- insert(:site, domain: "example.com")+ new_site(domain: "example.com")conn =post(conn, "/sites", %{@@ -528,6 +528,49 @@ defmodule PlausibleWeb.SiteControllerTest doassert redirected_to(conn) =="/example.com/installation?site_created=true&flow="end++ for role <- [:owner, :admin, :editor] do+ test "redirects to stats when user already has #{role} access to the duplicate domain",+ %{+ conn: conn,+ user: user+ } do+ site = new_site(domain: "example.com")+ add_member(site.team, user: user, role: unquote(role))++ conn =+ post(conn, "/sites", %{+ "site" => %{+ "domain" => "example.com",+ "timezone" => "Europe/London"+ }+ })++ assert redirected_to(conn) == "/example.com/"+ end+ end++ for role <- Plausible.Teams.Membership.roles() -- [:owner, :admin, :editor] do+ test "#{role} trying access the duplicate domain, an error is shown",+ %{+ conn: conn,+ user: user+ } do+ site = new_site(domain: "example.com")+ add_member(site.team, user: user, role: unquote(role))++ conn =+ post(conn, "/sites", %{+ "site" => %{+ "domain" => "example.com",+ "timezone" => "Europe/London"+ }+ })++ assert html_response(conn, 200) =~+ "This domain cannot be registered. Perhaps one of your colleagues registered it?"+ end+ endenddescribe "GET /:domain/settings/general" do