Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Ensure team locked state is updated on site creation and removal (#5451)

Adrian Gruntkowski9ec7864f4446
diff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.ex
index 823371b602..19e03b895d 100644
--- a/lib/plausible/billing/site_locker.ex
+++ b/lib/plausible/billing/site_locker.ex
@@ -19,12 +19,12 @@ defmodule Plausible.Billing.SiteLocker do
team = Teams.with_subscription(team)
- case Plausible.Teams.Billing.check_needs_to_upgrade(team, usage_mod) do
+ case Teams.Billing.check_needs_to_upgrade(team, usage_mod) do
{:needs_to_upgrade, :grace_period_ended} ->
set_lock_status_for(team, true)
if team.grace_period.is_over != true do
- Plausible.Teams.end_grace_period(team)
+ Teams.end_grace_period(team)
send_grace_period_end_email(team, send_email?)
@@ -34,8 +34,13 @@ defmodule Plausible.Billing.SiteLocker do
end
{:needs_to_upgrade, reason} ->
- set_lock_status_for(team, true)
- {:locked, reason}
+ if Teams.owned_sites_count(team) > 0 do
+ set_lock_status_for(team, true)
+ {:locked, reason}
+ else
+ set_lock_status_for(team, false)
+ :unlocked
+ end
:no_upgrade_needed ->
set_lock_status_for(team, false)
diff --git a/lib/plausible/site/removal.ex b/lib/plausible/site/removal.ex
index 2e4e0cf189..ff82470376 100644
--- a/lib/plausible/site/removal.ex
+++ b/lib/plausible/site/removal.ex
@@ -2,7 +2,10 @@ defmodule Plausible.Site.Removal do
@moduledoc """
A site deletion service stub.
"""
+ use Plausible
+
alias Plausible.Repo
+ alias Plausible.Teams
import Ecto.Query
@@ -13,8 +16,12 @@ defmodule Plausible.Site.Removal do
result = Repo.delete_all(from(s in Plausible.Site, where: s.domain == ^site.domain))
- Plausible.Teams.Memberships.prune_guests(site.team)
- Plausible.Teams.Invitations.prune_guest_invitations(site.team)
+ Teams.Memberships.prune_guests(site.team)
+ Teams.Invitations.prune_guest_invitations(site.team)
+
+ on_ee do
+ Plausible.Billing.SiteLocker.update_for(site.team, send_email?: false)
+ end
%{delete_all: result}
end)
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex
index 05a75210b2..2c11fc6a68 100644
--- a/lib/plausible/sites.ex
+++ b/lib/plausible/sites.ex
@@ -2,14 +2,16 @@ defmodule Plausible.Sites do
@moduledoc """
Sites context functions.
"""
+ use Plausible
import Ecto.Query
alias Plausible.Auth
+ alias Plausible.Billing
alias Plausible.Repo
alias Plausible.Site
- alias Plausible.Teams
alias Plausible.Site.SharedLink
+ alias Plausible.Teams
require Plausible.Site.UserPreference
@@ -273,6 +275,16 @@ defmodule Plausible.Sites do
{:ok, :trial_already_started}
end
end)
+ |> Ecto.Multi.run(:updated_lock, fn _repo, %{create_team: team} ->
+ lock_state =
+ if ee?() do
+ Billing.SiteLocker.update_for(team, send_email?: false)
+ else
+ :unlocked
+ end
+
+ {:ok, lock_state}
+ end)
|> Repo.transaction()
end
diff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exs
index 4a80422d49..9fcb4820a5 100644
--- a/test/plausible/billing/site_locker_test.exs
+++ b/test/plausible/billing/site_locker_test.exs
@@ -219,6 +219,20 @@ defmodule Plausible.Billing.SiteLockerTest do
assert Repo.reload!(site.team).locked
end
+ test "does not lock if team has no sites" do
+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: -1))
+ site = new_site(owner: user)
+ team = team_of(user)
+
+ Plausible.Site.Removal.run(site)
+
+ team = Repo.reload!(team)
+
+ assert SiteLocker.update_for(team) == :unlocked
+
+ refute Repo.reload!(site.team).locked
+ end
+
test "locks sites for user with empty trial - shouldn't happen under normal circumstances" do
user = new_user()
site = new_site(owner: user)
diff --git a/test/plausible/site/site_removal_test.exs b/test/plausible/site/site_removal_test.exs
index 2256873bb6..70b71362e3 100644
--- a/test/plausible/site/site_removal_test.exs
+++ b/test/plausible/site/site_removal_test.exs
@@ -38,4 +38,19 @@ defmodule Plausible.Site.SiteRemovalTest do
refute Repo.reload(team_membership)
refute Repo.reload(team_invitation)
end
+
+ @tag :ee_only
+ test "site deletion updates team dashboard lock state" do
+ owner = new_user(team: [locked: true])
+ site = new_site(owner: owner)
+ team = site.team
+
+ assert team.locked
+
+ assert {:ok, context} = Removal.run(site)
+ assert context.delete_all == {1, nil}
+ refute Sites.get_by_domain(site.domain)
+
+ refute Repo.reload(team).locked
+ end
end
diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exs
index 4485ad411a..6a1a87b154 100644
--- a/test/plausible/site/sites_test.exs
+++ b/test/plausible/site/sites_test.exs
@@ -23,6 +23,22 @@ defmodule Plausible.SitesTest do
Sites.create(user, params)
end
+ @tag :ee_only
+ test "updates team's locked state" do
+ user = new_user(trial_expiry_date: Date.add(Date.utc_today(), -1), team: [locked: false])
+
+ team = new_site(owner: user).team
+
+ refute team.locked
+
+ params = %{"domain" => "example.com", "timezone" => "Europe/London"}
+
+ assert {:ok, %{site: %{domain: "example.com", timezone: "Europe/London"}}} =
+ Sites.create(user, params, team)
+
+ assert Repo.reload(team).locked
+ end
+
test "does not start a trial for pre-teams guest users without trial expiry date" do
user = new_user() |> subscribe_to_growth_plan()
new_site(owner: user)