Skip to content

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

fix ownership transfer when is_selfhost=true (#2455)

ruslandoga77cca04417a4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6ce06a3d9..70c7e2fc23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ All notable changes to this project will be documented in this file.
- ARM64 support for docker images plausible/analytics#2103
- Add support for international domain names (IDNs) plausible/analytics#2034
- Allow self-hosters to register an account on first launch
+- Fix ownership transfer invitation link in self-hosted deployments
### Fixed
- Plausible script does not prevent default if it's been prevented by an external script [plausible/analytics#1941](https://github.com/plausible/analytics/issues/1941)
diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.ex
index 8fc4204418..9631681184 100644
--- a/lib/plausible_web/controllers/invitation_controller.ex
+++ b/lib/plausible_web/controllers/invitation_controller.ex
@@ -68,7 +68,9 @@ defmodule PlausibleWeb.InvitationController do
end
defp maybe_end_trial_of_new_owner(multi, new_owner) do
- if !Application.get_env(:plausible, :is_selfhost) do
+ if Application.get_env(:plausible, :is_selfhost) do
+ multi
+ else
end_trial_of_new_owner(multi, new_owner)
end
end
diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exs
index 872497d74f..9b69b573f3 100644
--- a/test/plausible_web/controllers/invitation_controller_test.exs
+++ b/test/plausible_web/controllers/invitation_controller_test.exs
@@ -161,6 +161,33 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do
assert new_owner_membership.role == :owner
end
+
+ test "works in self-hosted", %{conn: conn, user: user} do
+ patch_env(:is_selfhost, true)
+
+ old_owner = insert(:user)
+ site = insert(:site, members: [old_owner])
+
+ invitation =
+ insert(:invitation,
+ site_id: site.id,
+ inviter: old_owner,
+ email: user.email,
+ role: :owner
+ )
+
+ post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")
+
+ old_owner_membership =
+ Repo.get_by(Plausible.Site.Membership, user_id: old_owner.id, site_id: site.id)
+
+ assert old_owner_membership.role == :admin
+
+ new_owner_membership =
+ Repo.get_by(Plausible.Site.Membership, user_id: user.id, site_id: site.id)
+
+ assert new_owner_membership.role == :owner
+ end
end
describe "POST /sites/invitations/:invitation_id/reject" do