Skip to content

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

Allow site transfer between different teams of the same user (#5192)

Adrian Gruntkowski649d1d9af5a3
diff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.ex
index 5b18ff6c37..f8b162175e 100644
--- a/lib/plausible/site/admin.ex
+++ b/lib/plausible/site/admin.ex
@@ -145,8 +145,8 @@ defmodule Plausible.SiteAdmin do
{:error, :user_not_found} ->
{:error, "User could not be found"}
- {:error, :transfer_to_self} ->
- {:error, "User is already an owner of one of the sites"}
+ {:error, %Ecto.Changeset{}} ->
+ {:error, "Site transfer request has failed for one of the sites"}
end
end
@@ -169,7 +169,7 @@ defmodule Plausible.SiteAdmin do
{:error, "User could not be found"}
{:error, :transfer_to_self} ->
- {:error, "User is already an owner of one of the sites"}
+ {:error, "The site is already in the picked team"}
{:error, :no_plan} ->
{:error, "The new owner does not have a subscription"}
diff --git a/lib/plausible/site/memberships/accept_invitation.ex b/lib/plausible/site/memberships/accept_invitation.ex
index 6d64aaf906..f41c42dbfd 100644
--- a/lib/plausible/site/memberships/accept_invitation.ex
+++ b/lib/plausible/site/memberships/accept_invitation.ex
@@ -33,6 +33,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do
| Billing.Quota.Limits.over_limits_error()
| Ecto.Changeset.t()
| :no_plan
+ | :transfer_to_self
| :multiple_teams
| :permission_denied
@@ -75,8 +76,8 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do
defp transfer_ownership(site, new_owner, team) do
site = Repo.preload(site, :team)
- with :ok <- Teams.Invitations.ensure_transfer_valid(site.team, new_owner, :owner),
- {:ok, new_team} <- maybe_get_team(new_owner, team),
+ with {:ok, new_team} <- maybe_get_team(new_owner, team),
+ :ok <- Teams.Invitations.ensure_transfer_valid(site.team, new_team, :owner),
:ok <- check_can_transfer_site(new_team, new_owner),
:ok <- Teams.Invitations.ensure_can_take_ownership(site, new_team),
:ok <- Teams.Invitations.transfer_site(site, new_team) do
@@ -89,8 +90,8 @@ defmodule Plausible.Site.Memberships.AcceptInvitation do
defp do_accept_ownership_transfer(site_transfer, new_owner, team) do
site = Repo.preload(site_transfer.site, :team)
- with :ok <- Teams.Invitations.ensure_transfer_valid(site.team, new_owner, :owner),
- {:ok, new_team} <- maybe_get_team(new_owner, team),
+ with {:ok, new_team} <- maybe_get_team(new_owner, team),
+ :ok <- Teams.Invitations.ensure_transfer_valid(site.team, new_team, :owner),
:ok <- check_can_transfer_site(new_team, new_owner),
:ok <- Teams.Invitations.ensure_can_take_ownership(site, new_team),
:ok <- Teams.Invitations.accept_site_transfer(site_transfer, new_team) do
diff --git a/lib/plausible/site/memberships/create_invitation.ex b/lib/plausible/site/memberships/create_invitation.ex
index 4d31af79de..0e011383ae 100644
--- a/lib/plausible/site/memberships/create_invitation.ex
+++ b/lib/plausible/site/memberships/create_invitation.ex
@@ -13,8 +13,6 @@ defmodule Plausible.Site.Memberships.CreateInvitation do
@type invite_error() ::
Ecto.Changeset.t()
| :already_a_member
- | :transfer_to_self
- | :no_plan
| {:over_limit, non_neg_integer()}
| :forbidden
@@ -65,12 +63,6 @@ defmodule Plausible.Site.Memberships.CreateInvitation do
invitee_email
),
invitee = Plausible.Auth.find_user_by(email: invitee_email),
- :ok <-
- Teams.Invitations.ensure_transfer_valid(
- site.team,
- invitee,
- role
- ),
:ok <-
Teams.Invitations.ensure_new_membership(
site,
diff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.ex
index e8b1ece88f..06731b9966 100644
--- a/lib/plausible/teams/invitations.ex
+++ b/lib/plausible/teams/invitations.ex
@@ -233,10 +233,11 @@ defmodule Plausible.Teams.Invitations do
@doc false
def ensure_transfer_valid(_team, nil, :owner), do: :ok
- def ensure_transfer_valid(team, new_owner, :owner) do
- case Teams.Memberships.team_role(team, new_owner) do
- {:ok, :owner} -> {:error, :transfer_to_self}
- _ -> :ok
+ def ensure_transfer_valid(team, new_team, :owner) do
+ if team.id == new_team.id do
+ {:error, :transfer_to_self}
+ else
+ :ok
end
end
@@ -493,11 +494,11 @@ defmodule Plausible.Teams.Invitations do
if check_permissions? do
case Teams.Memberships.site_role(site, inviter) do
- {:ok, :owner} when invitation_role == :owner ->
+ {:ok, inviter_role} when inviter_role in [:owner, :admin] and invitation_role == :owner ->
:ok
{:ok, inviter_role}
- when inviter_role in [:owner, :editor, :admin] and invitation_role != :owner ->
+ when inviter_role in [:owner, :admin, :editor] and invitation_role != :owner ->
:ok
_ ->
diff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.ex
index 01d3de8bc2..bfb56052e5 100644
--- a/lib/plausible/teams/sites.ex
+++ b/lib/plausible/teams/sites.ex
@@ -87,6 +87,151 @@ defmodule Plausible.Teams.Sites do
domain_filter = Keyword.get(opts, :filter_by_domain)
team = Keyword.get(opts, :team)
+ union_query =
+ if Teams.setup?(team) do
+ list_with_invitations_setup_query(team, user)
+ else
+ list_with_invitations_personal_query(team, user)
+ end
+
+ from(u in subquery(union_query),
+ inner_join: s in Plausible.Site,
+ on: u.site_id == s.id,
+ as: :site,
+ left_join: up in Site.UserPreference,
+ on: up.site_id == s.id and up.user_id == ^user.id,
+ left_join: ti in Teams.Invitation,
+ on: ti.id == u.team_invitation_id,
+ left_join: gi in Teams.GuestInvitation,
+ on: gi.id == u.guest_invitation_id,
+ left_join: st in Teams.SiteTransfer,
+ on: st.id == u.transfer_id,
+ select: %{
+ s
+ | entry_type:
+ selected_as(
+ fragment(
+ """
+ CASE
+ WHEN ? IS NOT NULL THEN 'invitation'
+ WHEN ? IS NOT NULL THEN 'invitation'
+ WHEN ? IS NOT NULL THEN 'pinned_site'
+ ELSE ?
+ END
+ """,
+ gi.id,
+ st.id,
+ up.pinned_at,
+ u.entry_type
+ ),
+ :entry_type
+ ),
+ pinned_at: selected_as(up.pinned_at, :pinned_at),
+ memberships: [
+ %{
+ role: type(u.role, ^@role_type),
+ site_id: s.id,
+ site: s
+ }
+ ],
+ invitations: [
+ %{
+ invitation_id: coalesce(gi.invitation_id, st.transfer_id),
+ email: coalesce(ti.email, st.email),
+ role: type(u.role, ^@role_type),
+ site_id: s.id,
+ site: s
+ }
+ ]
+ },
+ order_by: [
+ asc: selected_as(:entry_type),
+ desc: selected_as(:pinned_at),
+ asc: s.domain
+ ]
+ )
+ |> maybe_filter_by_domain(domain_filter)
+ |> Repo.paginate(pagination_params)
+ |> Map.update!(:entries, fn entries ->
+ Enum.map(entries, fn
+ %{invitation: [%{invitation_id: nil}]} = entry ->
+ %{entry | invitations: []}
+
+ entry ->
+ entry
+ end)
+ end)
+ end
+
+ defp list_with_invitations_setup_query(team, user) do
+ team_membership_query =
+ from(tm in Teams.Membership,
+ inner_join: t in assoc(tm, :team),
+ inner_join: u in assoc(tm, :user),
+ as: :user,
+ inner_join: s in assoc(t, :sites),
+ as: :site,
+ where: tm.user_id == ^user.id and tm.role != :guest,
+ where: tm.team_id == ^team.id,
+ select: %{
+ site_id: s.id,
+ entry_type: "site",
+ guest_invitation_id: 0,
+ team_invitation_id: 0,
+ role: tm.role,
+ transfer_id: 0
+ }
+ )
+
+ site_transfer_query =
+ from st in Teams.SiteTransfer,
+ as: :site_transfer,
+ inner_join: s in assoc(st, :site),
+ as: :site,
+ where: s.team_id != ^team.id,
+ where: st.email == ^user.email,
+ where:
+ exists(
+ from tm in Teams.Membership,
+ inner_join: u in assoc(tm, :user),
+ where: tm.team_id == ^team.id,
+ where: u.email == parent_as(:site_transfer).email,
+ where: tm.role in [:owner, :admin],
+ select: 1
+ ),
+ select: %{
+ site_id: s.id,
+ entry_type: "invitation",
+ guest_invitation_id: 0,
+ team_invitation_id: 0,
+ role: "owner",
+ transfer_id: st.id
+ }
+
+ from s in team_membership_query,
+ union_all: ^site_transfer_query
+ end
+
+ defp list_with_invitations_personal_query(team, user) do
+ my_team_query =
+ from(tm in Teams.Membership,
+ inner_join: t in assoc(tm, :team),
+ inner_join: u in assoc(tm, :user),
+ as: :user,
+ inner_join: s in assoc(t, :sites),
+ as: :site,
+ where: tm.user_id == ^user.id and tm.role == :owner,
+ where: t.setup_complete == false,
+ select: %{
+ site_id: s.id,
+ entry_type: "site",
+ guest_invitation_id: 0,
+ team_invitation_id: 0,
+ role: tm.role,
+ transfer_id: 0
+ }
+ )
+
guest_membership_query =
from(tm in Teams.Membership,
inner_join: u in assoc(tm, :user),
@@ -95,12 +240,6 @@ defmodule Plausible.Teams.Sites do
inner_join: s in assoc(gm, :site),
as: :site,
where: tm.user_id == ^user.id and tm.role == :guest,
- where:
- not exists(
- from st in Teams.SiteTransfer,
- where: st.email == parent_as(:user).email,
- where: st.site_id == parent_as(:site).id
- ),
select: %{
site_id: s.id,
entry_type: "site",
@@ -164,15 +303,6 @@ defmodule Plausible.Teams.Sites do
inner_join: s in assoc(st, :site),
as: :site,
where: st.email == ^user.email,
- where:
- not exists(
- from tm in Teams.Membership,
- inner_join: u in assoc(tm, :user),
- where: tm.team_id == parent_as(:site).team_id,
- where: u.email == parent_as(:site_transfer).email,
- where: tm.role == :owner,
- select: 1
- ),
select: %{
site_id: s.id,
entry_type: "invitation",
@@ -182,129 +312,17 @@ defmodule Plausible.Teams.Sites do
transfer_id: st.id
}
- union_query =
- if Teams.setup?(team) do
- team_membership_query =
- from(tm in Teams.Membership,
- inner_join: t in assoc(tm, :team),
- inner_join: u in assoc(tm, :user),
- as: :user,
- inner_join: s in assoc(t, :sites),
- as: :site,
- where: tm.user_id == ^user.id and tm.role != :guest,
- where: tm.team_id == ^team.id,
- where:
- not exists(
- from st in Teams.SiteTransfer,
- where: st.email == parent_as(:user).email,
- where: st.site_id == parent_as(:site).id
- ),
- select: %{
- site_id: s.id,
- entry_type: "site",
- guest_invitation_id: 0,
- team_invitation_id: 0,
- role: tm.role,
- transfer_id: 0
- }
- )
-
- from s in team_membership_query,
- union_all: ^site_transfer_query
+ site_transfer_query =
+ if team do
+ where(site_transfer_query, [site: s], s.team_id != ^team.id)
else
- my_team_query =
- from(tm in Teams.Membership,
- inner_join: t in assoc(tm, :team),
- inner_join: u in assoc(tm, :user),
- as: :user,
- inner_join: s in assoc(t, :sites),
- as: :site,
- where: tm.user_id == ^user.id and tm.role != :guest,
- where: tm.is_autocreated == true,
- where: t.setup_complete == false,
- select: %{
- site_id: s.id,
- entry_type: "site",
- guest_invitation_id: 0,
- team_invitation_id: 0,
- role: tm.role,
- transfer_id: 0
- }
- )
-
- from s in my_team_query,
- union_all: ^guest_membership_query,
- union_all: ^guest_invitation_query,
- union_all: ^site_transfer_query
+ site_transfer_query
end
- from(u in subquery(union_query),
- inner_join: s in Plausible.Site,
- on: u.site_id == s.id,
- as: :site,
- left_join: up in Site.UserPreference,
- on: up.site_id == s.id and up.user_id == ^user.id,
- left_join: ti in Teams.Invitation,
- on: ti.id == u.team_invitation_id,
- left_join: gi in Teams.GuestInvitation,
- on: gi.id == u.guest_invitation_id,
- left_join: st in Teams.SiteTransfer,
- on: st.id == u.transfer_id,
- select: %{
- s
- | entry_type:
- selected_as(
- fragment(
- """
- CASE
- WHEN ? IS NOT NULL THEN 'invitation'
- WHEN ? IS NOT NULL THEN 'invitation'
- WHEN ? IS NOT NULL THEN 'pinned_site'
- ELSE ?
- END
- """,
- gi.id,
- st.id,
- up.pinned_at,
- u.entry_type
- ),
- :entry_type
- ),
- pinned_at: selected_as(up.pinned_at, :pinned_at),
- memberships: [
- %{
- role: type(u.role, ^@role_type),
- site_id: s.id,
- site: s
- }
- ],
- invitations: [
- %{
- invitation_id: coalesce(gi.invitation_id, st.transfer_id),
- email: coalesce(ti.email, st.email),
- role: type(u.role, ^@role_type),
- site_id: s.id,
- site: s
- }
- ]
- },
- order_by: [
- asc: selected_as(:entry_type),
- desc: selected_as(:pinned_at),
- asc: s.domain
- ]
- )
- |> maybe_filter_by_domain(domain_filter)
- |> Repo.paginate(pagination_params)
- |> Map.update!(:entries, fn entries ->
- Enum.map(entries, fn
- %{invitation: [%{invitation_id: nil}]} = entry ->
- %{entry | invitations: []}
-
- entry ->
- entry
- end)
- end)
+ from s in my_team_query,
+ union_all: ^guest_membership_query,
+ union_all: ^guest_invitation_query,
+ union_all: ^site_transfer_query
end
defp maybe_filter_by_domain(query, domain)
diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.ex
index eee1724569..ec8bb6075f 100644
--- a/lib/plausible_web/controllers/invitation_controller.ex
+++ b/lib/plausible_web/controllers/invitation_controller.ex
@@ -41,6 +41,11 @@ defmodule PlausibleWeb.InvitationController do
|> put_flash(:error, "Invitation missing or already accepted")
|> redirect(to: "/sites")
+ {:error, :transfer_to_self} ->
+ conn
+ |> put_flash(:error, "The site is already in the current team")
+ |> redirect(to: "/sites")
+
{:error, :permission_denied} ->
conn
|> put_flash(:error, "You can't add sites in the current team")
diff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.ex
index 18dde77f6d..b0b91597b1 100644
--- a/lib/plausible_web/controllers/site/membership_controller.ex
+++ b/lib/plausible_web/controllers/site/membership_controller.ex
@@ -15,13 +15,15 @@ defmodule PlausibleWeb.Site.MembershipController do
use Plausible
alias Plausible.Site.Memberships
- @only_owner_is_allowed_to [:transfer_ownership_form, :transfer_ownership]
+ @only_owner_and_admin_is_allowed_to [:transfer_ownership_form, :transfer_ownership]
plug PlausibleWeb.RequireAccountPlug
- plug PlausibleWeb.Plugs.AuthorizeSiteAccess, [:owner] when action in @only_owner_is_allowed_to
plug PlausibleWeb.Plugs.AuthorizeSiteAccess,
- [:owner, :editor, :admin] when action not in @only_owner_is_allowed_to
+ [:owner, :admin] when action in @only_owner_and_admin_is_allowed_to
+
+ plug PlausibleWeb.Plugs.AuthorizeSiteAccess,
+ [:owner, :admin, :editor] when action not in @only_owner_and_admin_is_allowed_to
def invite_member_form(conn, _params) do
site =
@@ -118,13 +120,6 @@ defmodule PlausibleWeb.Site.MembershipController do
|> put_flash(:success, "Site transfer request has been sent to #{email}")
|> redirect(external: Routes.site_path(conn, :settings_people, site.domain))
- {:error, :transfer_to_self} ->
- conn
- |> put_flash(:ttl, :timer.seconds(5))
- |> put_flash(:error_title, "Transfer error")
- |> put_flash(:error, "Can't transfer ownership to existing owner")
- |> redirect(external: Routes.site_path(conn, :settings_people, site.domain))
-
{:error, changeset} ->
errors = Plausible.ChangesetHelpers.traverse_errors(changeset)
diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.ex
index 6f1009e4f0..254469943a 100644
--- a/lib/plausible_web/views/layout_view.ex
+++ b/lib/plausible_web/views/layout_view.ex
@@ -73,7 +73,7 @@ defmodule PlausibleWeb.LayoutView do
]
},
%{key: "Email Reports", value: "email-reports", icon: :envelope},
- if conn.assigns[:site_role] == :owner do
+ if conn.assigns[:site_role] in [:owner, :admin] do
%{key: "Danger Zone", value: "danger-zone", icon: :exclamation_triangle}
end
]
diff --git a/test/plausible/site/admin_test.exs b/test/plausible/site/admin_test.exs
index 0281826b80..76d58f0235 100644
--- a/test/plausible/site/admin_test.exs
+++ b/test/plausible/site/admin_test.exs
@@ -38,14 +38,6 @@ defmodule Plausible.Site.AdminTest do
{:error, "User could not be found"}
end
- test "new owner can't be the same as old owner", %{conn: conn, transfer_action: action} do
- current_owner = new_user()
- site = new_site(owner: current_owner)
-
- assert {:error, "User is already an owner of one of the sites"} =
- action.(conn, [site], %{"email" => current_owner.email})
- end
-
test "initiates ownership transfer for multiple sites in one action", %{
conn: conn,
transfer_action: action
@@ -81,11 +73,14 @@ defmodule Plausible.Site.AdminTest do
{:error, "User could not be found"}
end
- test "new owner can't be the same as old owner", %{conn: conn, transfer_direct_action: action} do
+ test "new team (via owner) can't be the same as old team", %{
+ conn: conn,
+ transfer_direct_action: action
+ } do
current_owner = new_user()
site = new_site(owner: current_owner)
- assert {:error, "User is already an owner of one of the sites"} =
+ assert {:error, "The site is already in the picked team"} =
action.(conn, [site], %{"email" => current_owner.email})
end
@@ -147,6 +142,29 @@ defmodule Plausible.Site.AdminTest do
})
end
+ test "the new owner can be the same as old owner given selected team is different", %{
+ conn: conn,
+ transfer_direct_action: action
+ } do
+ today = Date.utc_today()
+ current_owner = new_user()
+ site = new_site(owner: current_owner)
+
+ another_owner =
+ new_user()
+ |> subscribe_to_growth_plan(last_bill_date: Date.shift(today, day: -5))
+
+ another_site = new_site(owner: another_owner)
+ new_team = another_site.team
+ add_member(new_team, user: current_owner, role: :owner)
+
+ assert :ok =
+ action.(conn, [site], %{
+ "email" => current_owner.email,
+ "team_id" => new_team.identifier
+ })
+ end
+
@tag :ee_only
test "new owner's plan must accommodate the transferred site", %{
conn: conn,
diff --git a/test/plausible/site/memberships/accept_invitation_test.exs b/test/plausible/site/memberships/accept_invitation_test.exs
index 908a793ba0..957b9a1341 100644
--- a/test/plausible/site/memberships/accept_invitation_test.exs
+++ b/test/plausible/site/memberships/accept_invitation_test.exs
@@ -65,6 +65,24 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
)
end
+ test "allows transferring between teams of the same owner" do
+ current_owner = new_user() |> subscribe_to_growth_plan()
+ another_owner = new_user() |> subscribe_to_growth_plan()
+
+ site1 = new_site(owner: current_owner)
+ site2 = new_site(owner: current_owner)
+
+ new_team = team_of(another_owner)
+ add_member(new_team, user: current_owner, role: :owner)
+
+ assert {:ok, _} =
+ AcceptInvitation.bulk_transfer_ownership_direct(
+ [site1, site2],
+ current_owner,
+ new_team
+ )
+ end
+
test "does not allow transferring ownership to a team where user has no permission" do
other_owner = new_user() |> subscribe_to_growth_plan()
other_team = team_of(other_owner)
@@ -664,6 +682,20 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
AcceptInvitation.accept_invitation(transfer.transfer_id, current_owner)
end
+ test "allows transferring between different teams of the same owner" do
+ current_owner = new_user() |> subscribe_to_growth_plan()
+ site = new_site(owner: current_owner)
+
+ another_owner = new_user() |> subscribe_to_growth_plan()
+ new_team = team_of(another_owner)
+ add_member(new_team, user: current_owner, role: :owner)
+
+ transfer = invite_transfer(site, current_owner, inviter: current_owner)
+
+ assert {:ok, _} =
+ AcceptInvitation.accept_invitation(transfer.transfer_id, current_owner, new_team)
+ end
+
@tag :ee_only
test "does not allow transferring to and account without suitable plan" do
current_owner = new_user()
diff --git a/test/plausible/site/memberships/create_invitation_test.exs b/test/plausible/site/memberships/create_invitation_test.exs
index 50e1f619b5..56af7b632a 100644
--- a/test/plausible/site/memberships/create_invitation_test.exs
+++ b/test/plausible/site/memberships/create_invitation_test.exs
@@ -130,7 +130,21 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest do
)
end
- test "only allows owners to transfer ownership" do
+ test "admin initiate ownership transfer too" do
+ inviter = new_user()
+ site = new_site()
+ add_member(site.team, user: inviter, role: :admin)
+
+ assert {:ok, %Plausible.Teams.SiteTransfer{}} =
+ CreateInvitation.create_invitation(site, inviter, "[email protected]", :owner)
+
+ assert_email_delivered_with(
+ to: [nil: "[email protected]"],
+ subject: @subject_prefix <> "Request to transfer ownership of #{site.domain}"
+ )
+ end
+
+ test "only allows owners and admins to transfer ownership" do
inviter = new_user()
site = new_site()
@@ -150,14 +164,6 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest do
CreateInvitation.create_invitation(site, inviter, invitee.email, :owner)
end
- test "does not allow transferring ownership to existing owner" do
- inviter = new_user(email: "[email protected]")
- site = new_site(owner: inviter)
-
- assert {:error, :transfer_to_self} =
- CreateInvitation.create_invitation(site, inviter, "[email protected]", :owner)
- end
-
test "allows creating an ownership transfer even when at team member limit" do
inviter = new_user()
site = new_site(owner: inviter)
diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exs
index fd10ee97dd..98b70a7d2e 100644
--- a/test/plausible/site/sites_test.exs
+++ b/test/plausible/site/sites_test.exs
@@ -320,7 +320,7 @@ defmodule Plausible.SitesTest do
# other team site access
site5 = new_site(domain: "team.example.com", owner: user4)
team5 = Plausible.Teams.complete_setup(site5.team)
- add_member(site5.team, user: user1, role: :editor)
+ add_member(site5.team, user: user1, role: :admin)
assert %{
entries: [
@@ -331,7 +331,7 @@ defmodule Plausible.SitesTest do
Sites.list_with_invitations(user1, %{}, team: team5)
end
- test "prioritizes pending transfer over pinned site with guest membership" do
+ test "shows both pending transfer and pinned site for user without team with guest membership" do
owner = new_user()
pending_owner = new_user()
site = new_site(owner: owner, domain: "one.example.com")
@@ -343,13 +343,14 @@ defmodule Plausible.SitesTest do
assert %{
entries: [
- %{domain: "one.example.com", entry_type: "invitation"}
+ %{domain: "one.example.com", entry_type: "invitation"},
+ %{domain: "one.example.com", entry_type: "pinned_site"}
]
} =
Sites.list_with_invitations(pending_owner, %{})
end
- test "prioritizes pending transfer over site with guest membership" do
+ test "shows both pending transfer and site for user without team with guest membership" do
owner = new_user()
pending_owner = new_user()
site = new_site(owner: owner, domain: "one.example.com")
@@ -359,12 +360,87 @@ defmodule Plausible.SitesTest do
assert %{
entries: [
- %{domain: "one.example.com", entry_type: "invitation"}
+ %{domain: "one.example.com", entry_type: "invitation"},
+ %{domain: "one.example.com", entry_type: "site"}
]
} =
Sites.list_with_invitations(pending_owner, %{})
end
+ test "shows both pending transfer and site for user with personal team with guest membership" do
+ owner = new_user()
+ pending_owner = new_user() |> subscribe_to_growth_plan()
+ pending_team = team_of(pending_owner)
+ site = new_site(owner: owner, domain: "one.example.com")
+ add_guest(site, user: pending_owner, role: :editor)
+
+ invite_transfer(site, pending_owner, inviter: owner)
+
+ assert %{
+ entries: [
+ %{domain: "one.example.com", entry_type: "invitation"},
+ %{domain: "one.example.com", entry_type: "site"}
+ ]
+ } =
+ Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ end
+
+ test "shows only pending transfer for user with setup team with guest membership" do
+ owner = new_user()
+ pending_owner = new_user() |> subscribe_to_growth_plan()
+
+ pending_team =
+ pending_owner
+ |> team_of()
+ |> Plausible.Teams.complete_setup()
+
+ site = new_site(owner: owner, domain: "one.example.com")
+ add_guest(site, user: pending_owner, role: :editor)
+
+ invite_transfer(site, pending_owner, inviter: owner)
+
+ assert %{
+ entries: [
+ %{domain: "one.example.com", entry_type: "invitation"}
+ ]
+ } =
+ Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ end
+
+ test "does not show transfer for user with site in their personal team" do
+ owner = new_user()
+ pending_owner = new_user() |> subscribe_to_growth_plan()
+ pending_team = team_of(pending_owner)
+ site = new_site(owner: pending_owner, domain: "one.example.com")
+
+ invite_transfer(site, pending_owner, inviter: owner)
+
+ assert %{
+ entries: [
+ %{domain: "one.example.com", entry_type: "site"}
+ ]
+ } =
+ Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ end
+
+ test "does not show transfer for user with site in their setup team" do
+ owner = new_user()
+ pending_owner = new_user() |> subscribe_to_growth_plan()
+ pending_team = team_of(pending_owner)
+ site = new_site(owner: pending_owner, domain: "one.example.com")
+
+ pending_team = Plausible.Teams.complete_setup(pending_team)
+
+ invite_transfer(site, pending_owner, inviter: owner)
+
+ assert %{
+ entries: [
+ %{domain: "one.example.com", entry_type: "site"}
+ ]
+ } =
+ Sites.list_with_invitations(pending_owner, %{}, team: pending_team)
+ end
+
test "pinned site doesn't matter with membership revoked (no active invitations)" do
user1 = new_user(email: "[email protected]")
_user2 = new_user(email: "[email protected]")
@@ -578,7 +654,7 @@ defmodule Plausible.SitesTest do
invite_guest(site3, user1, role: :viewer, inviter: user3)
invite_transfer(site2, user1, inviter: user2)
team4 = Plausible.Teams.complete_setup(site4.team)
- add_member(team4, user: user1, role: :editor)
+ add_member(team4, user: user1, role: :admin)
assert_matches %{
entries: [
diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exs
index 6107dc7366..cf0ab81edd 100644
--- a/test/plausible_web/controllers/invitation_controller_test.exs
+++ b/test/plausible_web/controllers/invitation_controller_test.exs
@@ -110,6 +110,49 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do
"You can't add sites in the current team"
end
+ test "fails when transferring to the same team", %{conn: conn, user: user} do
+ current_owner = user |> subscribe_to_growth_plan()
+ site = new_site(owner: current_owner)
+
+ transfer = invite_transfer(site, current_owner, inviter: current_owner)
+
+ conn = post(conn, "/sites/invitations/#{transfer.transfer_id}/accept")
+
+ assert redirected_to(conn, 302) == "/sites"
+
+ assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
+ "The site is already in the current team"
+ end
+
+ test "allows transferring between different teams of the same owner", %{
+ conn: conn,
+ user: user
+ } do
+ current_owner = user |> subscribe_to_growth_plan()
+ site = new_site(owner: current_owner)
+
+ another_owner = new_user() |> subscribe_to_growth_plan()
+ new_team = team_of(another_owner)
+ add_member(new_team, user: current_owner, role: :owner)
+
+ transfer = invite_transfer(site, current_owner, inviter: current_owner)
+
+ conn = set_current_team(conn, new_team)
+
+ conn = post(conn, "/sites/invitations/#{transfer.transfer_id}/accept")
+
+ assert redirected_to(conn, 302) == "/#{URI.encode_www_form(site.domain)}"
+
+ assert Phoenix.Flash.get(conn.assigns.flash, :success) =~
+ "You now have access to"
+
+ refute Repo.reload(transfer)
+
+ assert_team_membership(current_owner, new_team, :owner)
+
+ assert_team_attached(site, new_team.id)
+ end
+
@tag :ee_only
test "fails when new owner has no plan", %{conn: conn, user: user} do
old_owner = new_user()