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
Communicate site creation edge cases to the users (#2605)
Adam Rutkowski1a4b65c36c55
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex c9c663addf..a77acb6367 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -1,5 +1,6 @@defmodule Plausible.Sites douse Plausible.Repo+ alias Plausible.ClickhouseRepoalias Plausible.Sitealias Plausible.Site.SharedLinkimport Ecto.Query@@ -9,27 +10,38 @@ defmodule Plausible.Sites doenddef create(user, params) do- limit = Plausible.Billing.sites_limit(user)-- if owned_sites_count(user) >= limit do- {:error, :limit, limit}- else- site_changeset = Site.changeset(%Site{}, params)-- Ecto.Multi.new()- |> Ecto.Multi.insert(:site, site_changeset)- |> Ecto.Multi.run(:site_membership, fn repo, %{site: site} ->- membership_changeset =- Site.Membership.changeset(%Site.Membership{}, %{- site_id: site.id,- user_id: user.id- })-- repo.insert(membership_changeset)+ site_changeset = Site.changeset(%Site{}, params)++ Ecto.Multi.new()+ |> Ecto.Multi.run(:limit, fn _, _ ->+ limit = Plausible.Billing.sites_limit(user)+ count = owned_sites_count(user)++ if count >= limit do+ {:error, limit}+ else+ {:ok, count}+ end+ end)+ |> Ecto.Multi.insert(:site, site_changeset)+ |> Ecto.Multi.run(:existing_events, fn _, _ ->+ site_changeset+ |> Ecto.Changeset.validate_change(:domain, fn :domain, domain ->+ check_for_existing_events(domain, params)end)- |> maybe_start_trial(user)- |> Repo.transaction()- end+ |> Ecto.Changeset.apply_action(:insert)+ end)+ |> Ecto.Multi.run(:site_membership, fn repo, %{site: site} ->+ membership_changeset =+ Site.Membership.changeset(%Site.Membership{}, %{+ site_id: site.id,+ user_id: user.id+ })++ repo.insert(membership_changeset)+ end)+ |> maybe_start_trial(user)+ |> Repo.transaction()enddefp maybe_start_trial(multi, user) do@@ -72,6 +84,11 @@ defmodule Plausible.Sites do!!stats_start_date(site)end+ def has_events?(domain) do+ q = from e in "events", where: e.domain == ^domain, select: true, limit: 1+ ClickhouseRepo.one(q) == true+ end+def create_shared_link(site, name, password \\ nil) dochanges =SharedLink.changeset(@@ -166,4 +183,19 @@ defmodule Plausible.Sites dowhere: sm.role == :owner)end++ defp check_for_existing_events(domain, params) do+ if has_events?(domain) do+ Sentry.capture_message("Refused to create a site with existing events",+ extra: %{params: params}+ )++ [+ domain:+ "This domain has already been taken. Perhaps one of your team members registered it? If that's not the case, please contact [email protected]"+ ]+ else+ []+ end+ endenddiff --git a/lib/plausible_web/controllers/api/external_sites_controller.ex b/lib/plausible_web/controllers/api/external_sites_controller.exindex 3144074aad..a754d98faf 100644--- a/lib/plausible_web/controllers/api/external_sites_controller.ex+++ b/lib/plausible_web/controllers/api/external_sites_controller.ex@@ -18,7 +18,7 @@ defmodule PlausibleWeb.Api.ExternalSitesController do|> put_status(400)|> json(serialize_errors(changeset))- {:error, :limit, limit} ->+ {:error, :limit, limit, _} ->conn|> put_status(403)|> json(%{diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 04d527528d..b43b7c8c66 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -84,16 +84,22 @@ defmodule PlausibleWeb.SiteController do|> put_session(site.domain <> "_offer_email_report", true)|> redirect(to: Routes.site_path(conn, :add_snippet, site.domain))- {:error, :site, changeset, _} ->+ {:error, :limit, limit, _} ->+ render(conn, "new.html",+ changeset: Plausible.Site.changeset(%Plausible.Site{}),+ is_first_site: is_first_site,+ is_at_limit: true,+ site_limit: limit,+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )++ {:error, _, changeset, _} ->render(conn, "new.html",changeset: changeset,is_first_site: is_first_site,is_at_limit: false,layout: {PlausibleWeb.LayoutView, "focus.html"})-- {:error, :limit, _limit} ->- send_resp(conn, 400, "Site limit reached")endenddiff --git a/lib/plausible_web/templates/site/new.html.eex b/lib/plausible_web/templates/site/new.html.eexindex 7c981c6f1d..14cf241f9e 100644--- a/lib/plausible_web/templates/site/new.html.eex+++ b/lib/plausible_web/templates/site/new.html.eex@@ -16,7 +16,7 @@</h3><div class="mt-2 text-sm text-yellow-700 dark:text-yellow-300"><p>- Your account is limited to <%= @site_limit %> sites. Please contact [email protected] to add more sites.+ Your account is limited to <%= @site_limit %> sites. Please contact [email protected] to add more sites.</p></div></div>diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex 39e59c998b..8a27f5096b 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -105,7 +105,30 @@ defmodule PlausibleWeb.SiteControllerTest do})assert redirected_to(conn) == "/example.com/snippet"- assert Repo.exists?(Plausible.Site, domain: "example.com")+ assert Repo.get_by(Plausible.Site, domain: "example.com")+ end++ test "refuses to create the site when events exist (pending deletion)", %{conn: conn} do+ domain = "events-exist.example.com"++ populate_stats(%{domain: domain}, [+ build(:pageview)+ ])++ :inserted = eventually(fn -> {Plausible.Sites.has_events?(domain), :inserted} end)++ conn =+ post(conn, "/sites", %{+ "site" => %{+ "domain" => domain,+ "timezone" => "Europe/London"+ }+ })++ assert html = html_response(conn, 200)+ assert html =~ "This domain has already been taken."+ assert html =~ "please contact support"+ refute Repo.get_by(Plausible.Site, domain: domain)endtest "starts trial if user does not have trial yet", %{conn: conn, user: user} do@@ -160,12 +183,16 @@ defmodule PlausibleWeb.SiteControllerTest doconn =post(conn, "/sites", %{"site" => %{- "domain" => "example.com",+ "domain" => "over-limit.example.com","timezone" => "Europe/London"}})- assert conn.status == 400+ assert html = html_response(conn, 200)+ assert html =~ "Upgrade required"+ assert html =~ "Your account is limited to 3 sites"+ assert html =~ "Please contact support"+ refute Repo.get_by(Plausible.Site, domain: "over-limit.example.com")endtest "allows accounts registered before 2021-05-05 to go over the limit", %{@@ -190,7 +217,7 @@ defmodule PlausibleWeb.SiteControllerTest do})assert redirected_to(conn) == "/example.com/snippet"- assert Repo.exists?(Plausible.Site, domain: "example.com")+ assert Repo.get_by(Plausible.Site, domain: "example.com")endtest "allows enterprise accounts to create unlimited sites", %{@@ -213,7 +240,7 @@ defmodule PlausibleWeb.SiteControllerTest do})assert redirected_to(conn) == "/example.com/snippet"- assert Repo.exists?(Plausible.Site, domain: "example.com")+ assert Repo.get_by(Plausible.Site, domain: "example.com")endtest "cleans up the url", %{conn: conn} do@@ -226,7 +253,7 @@ defmodule PlausibleWeb.SiteControllerTest do})assert redirected_to(conn) == "/example.com/snippet"- assert Repo.exists?(Plausible.Site, domain: "example.com")+ assert Repo.get_by(Plausible.Site, domain: "example.com")endtest "renders form again when domain is missing", %{conn: conn} do