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 enterprise plan users to create sites
Uku Taht26e34596c89f
diff --git a/config/.env.test b/config/.env.testindex 9fd9abe4cb..9e1b3ab532 100644--- a/config/.env.test+++ b/config/.env.test@@ -10,3 +10,4 @@ [email protected]ADMIN_USER_PWD=fakepasswordENABLE_EMAIL_VERIFICATION=trueSELFHOST=false+SITE_LIMIT=3diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.exindex 85fea0e3a7..2b599fc837 100644--- a/lib/plausible/billing/billing.ex+++ b/lib/plausible/billing/billing.ex@@ -197,10 +197,13 @@ defmodule Plausible.Billing do"""@limit_accounts_since ~D[2021-05-05]def sites_limit(user) do+ user = Plausible.Repo.preload(user, :enterprise_plan)+cond doTimex.before?(user.inserted_at, @limit_accounts_since) -> nilApplication.get_env(:plausible, :is_selfhost) -> niluser.email in Application.get_env(:plausible, :site_limit_exempt) -> nil+ user.enterprise_plan -> niltrue -> Application.get_env(:plausible, :site_limit)endenddiff --git a/lib/workers/check_usage.ex b/lib/workers/check_usage.exindex cf31aaeda4..6de1d8027e 100644--- a/lib/workers/check_usage.ex+++ b/lib/workers/check_usage.ex@@ -110,7 +110,7 @@ defmodule Plausible.Workers.CheckUsage dobilling_mod.last_two_billing_months_usage(subscriber)if last_last_cycle_usage > allowance && last_cycle_usage > allowance do- {:over_limit, {last_cycle, last_cycle_usage, allowance}}+ {:over_limit, {last_cycle, last_cycle_usage}}else{:within_limit, {last_cycle, last_cycle_usage}}enddiff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex 9794854d52..474d5893db 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -148,7 +148,7 @@ defmodule PlausibleWeb.SiteControllerTest doconn: conn,user: user} do- Application.put_env(:plausible, :site_limit, 3)+ # default site limit defined in config/.test.envinsert(:site, members: [user])insert(:site, members: [user])insert(:site, members: [user])@@ -172,7 +172,6 @@ defmodule PlausibleWeb.SiteControllerTest doset: [inserted_at: ~N[2020-01-01 00:00:00]])- Application.put_env(:plausible, :site_limit, 3)insert(:site, members: [user])insert(:site, members: [user])insert(:site, members: [user])@@ -190,6 +189,28 @@ defmodule PlausibleWeb.SiteControllerTest doassert Repo.exists?(Plausible.Site, domain: "example.com")end+ test "allows enterprise accounts to create unlimited sites", %{+ conn: conn,+ user: user+ } do+ insert(:enterprise_plan, user: user)++ insert(:site, members: [user])+ insert(:site, members: [user])+ insert(:site, members: [user])++ conn =+ post(conn, "/sites", %{+ "site" => %{+ "domain" => "example.com",+ "timezone" => "Europe/London"+ }+ })++ assert redirected_to(conn) == "/example.com/snippet"+ assert Repo.exists?(Plausible.Site, domain: "example.com")+ end+test "cleans up the url", %{conn: conn} doconn =post(conn, "/sites", %{