Run SiteLocker right after site ownership transfer (#3684)

* Run SiteLocker right after site ownership transfer

* Put site unlocking behind full build flag

* Tag regression tests as full build only
pull/3690/head
Adrian Gruntkowski 3 years ago committed by GitHub
parent fae6c07fad
commit 954b70c79b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -105,6 +105,15 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do
Multi.new()
|> downgrade_previous_owner(site, user)
|> Multi.insert_or_update(:membership, membership)
|> Multi.run(:update_locked_sites, fn _, _ ->
on_full_build do
# At this point this function should be guaranteed to unlock
# the site, via `Invitations.ensure_can_take_ownership/2`.
:unlocked = Billing.SiteLocker.update_sites_for(user, send_email?: false)
end
{:ok, :unlocked}
end)
end
# If there's an existing membership, we DO NOT change the role

@ -7,7 +7,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
alias Plausible.Site.Memberships.AcceptInvitation
describe "transfer_ownership/3" do
test "transfers ownership succeeds" do
test "transfers ownership successfully" do
site = insert(:site, memberships: [])
existing_owner = insert(:user)
@ -32,6 +32,26 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
assert_no_emails_delivered()
end
@tag :full_build_only
test "unlocks the site if it was previously locked" do
site = insert(:site, locked: true, memberships: [])
existing_owner = insert(:user)
insert(:site_membership, user: existing_owner, site: site, role: :owner)
new_owner = insert(:user)
insert(:growth_subscription, user: new_owner)
assert {:ok, new_membership} =
AcceptInvitation.transfer_ownership(site, new_owner)
assert new_membership.site_id == site.id
assert new_membership.user_id == new_owner.id
assert new_membership.role == :owner
refute Repo.reload!(site).locked
end
for role <- [:viewer, :admin] do
test "upgrades existing #{role} membership into an owner" do
existing_owner = insert(:user)
@ -295,6 +315,38 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
)
end
@tag :full_build_only
test "unlocks a previously locked site after transfer" do
site = insert(:site, locked: true, memberships: [])
existing_owner = insert(:user)
insert(:site_membership, user: existing_owner, site: site, role: :owner)
new_owner = insert(:user)
insert(:growth_subscription, user: new_owner)
invitation =
insert(:invitation,
site_id: site.id,
inviter: existing_owner,
email: new_owner.email,
role: :owner
)
assert {:ok, new_membership} =
AcceptInvitation.accept_invitation(
invitation.invitation_id,
new_owner
)
assert new_membership.site_id == site.id
assert new_membership.user_id == new_owner.id
assert new_membership.role == :owner
refute Repo.reload(invitation)
refute Repo.reload!(site).locked
end
for role <- [:viewer, :admin] do
test "upgrades existing #{role} membership into an owner" do
existing_owner = insert(:user)

Loading…
Cancel
Save