From 2be9020460fd83b675486797855851c2ef8a3962 Mon Sep 17 00:00:00 2001 From: hq1 Date: Tue, 11 Jul 2023 10:52:09 +0200 Subject: [PATCH] Fix APP-46E: accept invitation 2nd click (#3120) * Fix APP-46E: accept invitation 2nd click * :LspStop * Update lib/plausible_web/controllers/invitation_controller.ex Co-authored-by: Vini Brasil --------- Co-authored-by: Vini Brasil --- .../controllers/invitation_controller.ex | 78 ++++++++++--------- .../invitation_controller_test.exs | 31 +++++++- 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.ex index 963168118..ef21e6b01 100644 --- a/lib/plausible_web/controllers/invitation_controller.ex +++ b/lib/plausible_web/controllers/invitation_controller.ex @@ -14,45 +14,51 @@ defmodule PlausibleWeb.InvitationController do def accept_invitation(conn, %{"invitation_id" => invitation_id}) do invitation = - Repo.get_by!(Invitation, invitation_id: invitation_id) + Repo.get_by(Invitation, invitation_id: invitation_id) |> Repo.preload([:site, :inviter]) - user = conn.assigns[:current_user] - existing_membership = Repo.get_by(Membership, user_id: user.id, site_id: invitation.site.id) - - multi = - if invitation.role == :owner do - Multi.new() - |> downgrade_previous_owner(invitation.site) - |> maybe_end_trial_of_new_owner(user) - else - Multi.new() + if invitation do + user = conn.assigns[:current_user] + existing_membership = Repo.get_by(Membership, user_id: user.id, site_id: invitation.site.id) + + multi = + if invitation.role == :owner do + Multi.new() + |> downgrade_previous_owner(invitation.site) + |> maybe_end_trial_of_new_owner(user) + else + Multi.new() + end + + membership_changeset = + (existing_membership || + %Membership{user_id: user.id, site_id: invitation.site.id}) + |> Membership.changeset(%{role: invitation.role}) + + multi = + multi + |> Multi.insert_or_update(:membership, membership_changeset) + |> Multi.delete(:invitation, invitation) + + case Repo.transaction(multi) do + {:ok, changes} -> + updated_user = Map.get(changes, :user, user) + notify_invitation_accepted(invitation) + Plausible.Billing.SiteLocker.check_sites_for(updated_user) + + conn + |> put_flash(:success, "You now have access to #{invitation.site.domain}") + |> redirect(to: "/#{URI.encode_www_form(invitation.site.domain)}") + + {:error, _operation, _value, _changes} -> + conn + |> put_flash(:error, "Something went wrong, please try again") + |> redirect(to: "/sites") end - - membership_changeset = - (existing_membership || - %Membership{user_id: user.id, site_id: invitation.site.id}) - |> Membership.changeset(%{role: invitation.role}) - - multi = - multi - |> Multi.insert_or_update(:membership, membership_changeset) - |> Multi.delete(:invitation, invitation) - - case Repo.transaction(multi) do - {:ok, changes} -> - updated_user = Map.get(changes, :user, user) - notify_invitation_accepted(invitation) - Plausible.Billing.SiteLocker.check_sites_for(updated_user) - - conn - |> put_flash(:success, "You now have access to #{invitation.site.domain}") - |> redirect(to: "/#{URI.encode_www_form(invitation.site.domain)}") - - {:error, _, _} -> - conn - |> put_flash(:error, "Something went wrong, please try again") - |> redirect(to: "/sites") + else + conn + |> put_flash(:error, "Invitation missing or already accepted") + |> redirect(to: "/sites") end end diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exs index 9b69b573f..cd1876fcf 100644 --- a/test/plausible_web/controllers/invitation_controller_test.exs +++ b/test/plausible_web/controllers/invitation_controller_test.exs @@ -17,7 +17,12 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do role: :admin ) - post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + conn = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + + assert Phoenix.Flash.get(conn.assigns.flash, :success) == + "You now have access to #{site.domain}" + + assert redirected_to(conn) == "/#{site.domain}" refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email)) @@ -25,6 +30,30 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do assert membership.role == :admin end + test "does not crash if clicked for the 2nd time in another tab", %{conn: conn, user: user} do + site = insert(:site) + + invitation = + insert(:invitation, + site_id: site.id, + inviter: build(:user), + email: user.email, + role: :admin + ) + + c1 = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + assert redirected_to(c1) == "/#{site.domain}" + + assert Phoenix.Flash.get(c1.assigns.flash, :success) == + "You now have access to #{site.domain}" + + c2 = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + assert redirected_to(c2) == "/sites" + + assert Phoenix.Flash.get(c2.assigns.flash, :error) == + "Invitation missing or already accepted" + end + test "notifies the original inviter", %{conn: conn, user: user} do inviter = insert(:user) site = insert(:site)