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
Fix further team sync discrepancies (#4755)
Adrian Gruntkowskidd79ad3c222d
diff --git a/lib/plausible/site/memberships/reject_invitation.ex b/lib/plausible/site/memberships/reject_invitation.exindex 40b1a1e2b8..98e9d4c820 100644--- a/lib/plausible/site/memberships/reject_invitation.ex+++ b/lib/plausible/site/memberships/reject_invitation.ex@@ -4,13 +4,19 @@ defmodule Plausible.Site.Memberships.RejectInvitation do"""alias Plausible.Auth+ alias Plausible.Repoalias Plausible.Site.Memberships.Invitations+ alias Plausible.Teams@spec reject_invitation(String.t(), Auth.User.t()) ::{:ok, Auth.Invitation.t()} | {:error, :invitation_not_found}def reject_invitation(invitation_id, user) dowith {:ok, invitation} <- Invitations.find_for_user(invitation_id, user) do- Invitations.delete_invitation(invitation)+ Repo.transaction(fn ->+ Invitations.delete_invitation(invitation)+ Teams.Invitations.remove_invitation_sync(invitation)+ end)+notify_invitation_rejected(invitation){:ok, invitation}diff --git a/lib/plausible/site/memberships/remove_invitation.ex b/lib/plausible/site/memberships/remove_invitation.exindex abb650fe7d..e4f1baa5b5 100644--- a/lib/plausible/site/memberships/remove_invitation.ex+++ b/lib/plausible/site/memberships/remove_invitation.ex@@ -4,13 +4,18 @@ defmodule Plausible.Site.Memberships.RemoveInvitation do"""alias Plausible.Auth+ alias Plausible.Repoalias Plausible.Site.Memberships.Invitations+ alias Plausible.Teams@spec remove_invitation(String.t(), Plausible.Site.t()) ::{:ok, Auth.Invitation.t()} | {:error, :invitation_not_found}def remove_invitation(invitation_id, site) dowith {:ok, invitation} <- Invitations.find_for_site(invitation_id, site) do- Invitations.delete_invitation(invitation)+ Repo.transaction(fn ->+ Invitations.delete_invitation(invitation)+ Teams.Invitations.remove_invitation_sync(invitation)+ end){:ok, invitation}enddiff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.exindex f31016e508..85ab4660d8 100644--- a/lib/plausible/teams/invitations.ex+++ b/lib/plausible/teams/invitations.ex@@ -44,19 +44,57 @@ defmodule Plausible.Teams.Invitations dorole = translate_role(site_invitation.role)if site_invitation.role == :owner do- create_site_transfer(- site,- site_invitation.inviter,- site_invitation.email+ {:ok, site_transfer} =+ create_site_transfer(+ site,+ site_invitation.inviter,+ site_invitation.email+ )++ site_transfer+ |> Ecto.Changeset.change(transfer_id: site_invitation.invitation_id)+ |> Repo.update!()+ else+ {:ok, guest_invitation} =+ create_invitation(+ site,+ site_invitation.email,+ role,+ site_invitation.inviter+ )++ guest_invitation.team_invitation+ |> Ecto.Changeset.change(invitation_id: site_invitation.invitation_id)+ |> Repo.update!()+ end+ end++ def remove_invitation_sync(site_invitation) do+ site = Repo.preload(site_invitation, :site).site+ site = Teams.load_for_site(site)++ if site_invitation.role == :owner do+ Repo.delete_all(+ from(+ st in Teams.SiteTransfer,+ where: st.email == ^site_invitation.email,+ where: st.team_id == ^site.team.id+ ))else- create_invitation(- site,- site_invitation.email,- role,- site_invitation.inviter+ Repo.delete_all(+ from(+ gi in Teams.GuestInvitation,+ inner_join: ti in assoc(gi, :team_invitation),+ where: ti.email == ^site_invitation.email,+ where: gi.site_id == ^site.id+ ))++ prune_guest_invitations(site.team)end++ :okenddef transfer_site(site, new_owner, now \\ NaiveDateTime.utc_now(:second)) do@@ -141,10 +179,21 @@ defmodule Plausible.Teams.Invitations doteam_invitation =guest_invitation.team_invitation- |> Repo.preload([:team, :inviter, guest_invitations: :site])+ |> Repo.preload([+ :team,+ :inviter,+ guest_invitations: :site+ ]){:ok, _} =- do_accept(team_invitation, user, NaiveDateTime.utc_now(:second), send_email?: false)+ result =+ do_accept(team_invitation, user, NaiveDateTime.utc_now(:second),+ send_email?: false,+ guest_invitations: [guest_invitation]+ )++ prune_guest_invitations(team_invitation.team)+ resultenddef accept_transfer_sync(site_invitation, user) do@@ -215,7 +264,7 @@ defmodule Plausible.Teams.Invitations dodefp do_accept(team_invitation, user, now, opts \\ []) dosend_email? = Keyword.get(opts, :send_email?, true)- guest_invitations = team_invitation.guest_invitations+ guest_invitations = Keyword.get(opts, :guest_invitations, team_invitation.guest_invitations)Repo.transaction(fn ->with {:ok, team_membership} <-diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex 33ce92f9c7..a801882d67 100644--- a/test/plausible_web/controllers/invitation_controller_test.exs+++ b/test/plausible_web/controllers/invitation_controller_test.exs@@ -30,6 +30,56 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doassert membership.role == :adminend+ @tag :team+ test "multiple invites per same team sync regression", %{conn: conn, user: user} do+ inviter = insert(:user)+ {:ok, team} = Plausible.Teams.get_or_create(inviter)+ site1 = insert(:site, team: team, members: [inviter])+ site2 = insert(:site, team: team, members: [inviter])++ invitation1 =+ insert(:invitation,+ site_id: site1.id,+ inviter: inviter,+ email: user.email,+ role: :viewer+ )++ invitation2 =+ insert(:invitation,+ site_id: site2.id,+ inviter: inviter,+ email: user.email,+ role: :viewer+ )++ Plausible.Teams.Invitations.invite_sync(site1, invitation1)+ Plausible.Teams.Invitations.invite_sync(site2, invitation2)++ resp = post(conn, "/sites/invitations/#{invitation1.invitation_id}/accept")+ assert redirected_to(resp, 302)++ assert Repo.get_by(Plausible.Site.Membership, site_id: site1.id, user_id: user.id)+ refute Repo.get_by(Plausible.Site.Membership, site_id: site2.id, user_id: user.id)++ assert tm =+ Repo.get_by(Plausible.Teams.Membership,+ team_id: team.id,+ user_id: user.id,+ role: :guest+ )++ assert Repo.get_by(Plausible.Teams.GuestMembership,+ team_membership_id: tm.id,+ site_id: site1.id+ )++ refute Repo.get_by(Plausible.Teams.GuestMembership,+ team_membership_id: tm.id,+ site_id: site2.id+ )+ end+test "does not crash if clicked for the 2nd time in another tab", %{conn: conn, user: user} dosite = insert(:site)@@ -154,7 +204,11 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dodescribe "DELETE /sites/:domain/invitations/:invitation_id" dotest "removes the invitation", %{conn: conn, user: user} do- site = insert(:site, memberships: [build(:site_membership, user: user, role: :admin)])+ site =+ insert(:site,+ members: [build(:user)],+ memberships: [build(:site_membership, user: user, role: :admin)]+ )invitation =insert(:invitation,