Skip to content

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

[Step 1]: Rework of team layout persist (#6778)

RobertJoonasd7b7ae54be92
diff --git a/lib/plausible/teams.ex b/lib/plausible/teams.ex
index 7cbde3c591..58476f6990 100644
--- a/lib/plausible/teams.ex
+++ b/lib/plausible/teams.ex
@@ -9,6 +9,7 @@ defmodule Plausible.Teams do
alias Plausible.Auth
alias Plausible.Billing
alias Plausible.Repo
+ alias Plausible.Teams.Invitations.InviteToTeam
use Plausible
@accept_traffic_until_free ~D[2135-01-01]
@@ -200,6 +201,36 @@ defmodule Plausible.Teams do
end
end
+ @doc """
+ Sets up a team by renaming it and inviting the given members, all in
+ a single transaction - so that e.g. a member limit error on one of the
+ invitations never leaves the team renamed or marked as set up.
+
+ Invitation e-mails are only sent once the transaction has been committed.
+ """
+ @spec setup(
+ Teams.Team.t(),
+ String.t(),
+ [InviteToTeam.invite_entry()],
+ Auth.User.t()
+ ) :: {:ok, Teams.Team.t()} | {:error, any()}
+ def setup(%Teams.Team{} = team, name, invite_entries, %Auth.User{} = inviter)
+ when is_list(invite_entries) and is_binary(name) do
+ result =
+ Repo.transact(fn ->
+ with {:ok, team} <- Repo.update(Teams.Team.name_changeset(team, %{name: name})),
+ team = complete_setup(team),
+ {:ok, invitations} <- InviteToTeam.invite_all(team, inviter, invite_entries) do
+ {:ok, {team, invitations}}
+ end
+ end)
+
+ with {:ok, {team, invitations}} <- result do
+ InviteToTeam.send_invitation_emails(invitations)
+ {:ok, team}
+ end
+ end
+
@spec delete(Teams.Team.t()) :: {:ok, :deleted} | {:error, :active_subscription}
def delete(team) do
team = Teams.with_subscription(team)
diff --git a/lib/plausible/teams/invitations.ex b/lib/plausible/teams/invitations.ex
index cb849b5326..c715d11663 100644
--- a/lib/plausible/teams/invitations.ex
+++ b/lib/plausible/teams/invitations.ex
@@ -641,16 +641,17 @@ defmodule Plausible.Teams.Invitations do
@doc false
def ensure_new_membership(_site_or_team, nil, _role), do: :ok
- def ensure_new_membership(_site_or_team, _invitee, :owner), do: :ok
-
def ensure_new_membership(%Teams.Team{} = team, invitee, _role) do
case Teams.Memberships.team_role(team, invitee) do
- {:ok, :guest} -> :ok
+ {:ok, :guest} -> {:error, :already_a_guest}
{:error, :not_a_member} -> :ok
{:ok, _} -> {:error, :already_a_member}
end
end
+ # Site ownership transfers are allowed to target existing site members
+ def ensure_new_membership(%Plausible.Site{}, _invitee, :owner), do: :ok
+
def ensure_new_membership(%Plausible.Site{} = site, invitee, _role) do
if Teams.Memberships.site_role(site, invitee) == {:error, :not_a_member} do
:ok
@@ -659,6 +660,22 @@ defmodule Plausible.Teams.Invitations do
end
end
+ def ensure_not_already_invited(%Teams.Team{} = team, invitee_email) do
+ pending_invitation_role =
+ Repo.one(
+ from ti in Teams.Invitation,
+ where: ti.team_id == ^team.id,
+ where: ti.email == ^invitee_email,
+ select: ti.role
+ )
+
+ case pending_invitation_role do
+ nil -> :ok
+ :guest -> {:error, :already_invited_guest}
+ _ -> {:error, :already_invited}
+ end
+ end
+
defp create_invitation(site, invitee_email, role, inviter) do
Repo.transaction(fn ->
with {:ok, team_invitation} <-
diff --git a/lib/plausible/teams/invitations/invite_to_team.ex b/lib/plausible/teams/invitations/invite_to_team.ex
index 5c38043c75..22e43ef182 100644
--- a/lib/plausible/teams/invitations/invite_to_team.ex
+++ b/lib/plausible/teams/invitations/invite_to_team.ex
@@ -9,6 +9,12 @@ defmodule Plausible.Teams.Invitations.InviteToTeam do
@valid_roles Plausible.Teams.Invitation.roles() -- [:guest]
@valid_roles @valid_roles ++ Enum.map(@valid_roles, &to_string/1)
+ @type invite_entry() :: %{email: String.t(), role: atom() | String.t()}
+
+ # DEPRECATED: to be removed together with `Teams.Management.Layout.persist/2`,
+ # its only caller outside tests. Use `invite_all/4` + `send_invitation_emails/1`
+ # instead. `invite_all/4` duplicates this function's body on purpose, so that
+ # this one can be deleted as-is once nothing calls it anymore.
def invite(team, inviter, invitee_email, role, opts \\ [])
def invite(team, inviter, invitee_email, role, opts) when role in @valid_roles do
@@ -30,9 +36,76 @@ defmodule Plausible.Teams.Invitations.InviteToTeam do
raise "Invalid role passed: #{inspect(role)}"
end
+ @doc """
+ Creates team invitations for all given entries in a single transaction.
+ Either all of them get created, or none. Does not send any emails yet.
+
+ Returns `{:error, :invalid_email}` or `{:error, :duplicate_emails}`
+ without touching the database if any of the entries' emails is invalid,
+ or if the same email appears more than once.
+ """
+ @spec invite_all(
+ Teams.Team.t(),
+ Plausible.Auth.User.t(),
+ [invite_entry()],
+ Keyword.t()
+ ) ::
+ {:ok, [Teams.Invitation.t()]} | {:error, any()}
+ def invite_all(team, inviter, entries, opts \\ []) do
+ with :ok <- validate_emails(Enum.map(entries, & &1.email)) do
+ do_invite_all(Repo.preload(team, [:owners]), inviter, entries, opts)
+ end
+ end
+
+ @spec send_invitation_emails([Teams.Invitation.t()]) :: :ok
+ def send_invitation_emails(invitations) do
+ Enum.each(invitations, fn invitation ->
+ invitee = Plausible.Auth.find_user_by(email: invitation.email)
+ send_invitation_email(invitation, invitee)
+ end)
+ end
+
def send_invitation_email(invitation, invitee) do
invitation
|> Repo.preload([:team, :inviter])
|> Teams.Invitations.send_invitation_email(invitee)
end
+
+ defp do_invite_all(team, inviter, entries, opts) do
+ Repo.transact(fn ->
+ Enum.reduce_while(entries, {:ok, []}, fn entry, {:ok, invitations} ->
+ case do_invite(team, inviter, entry.email, entry.role, opts) do
+ {:ok, invitation} -> {:cont, {:ok, invitations ++ [invitation]}}
+ {:error, _} = error -> {:halt, error}
+ end
+ end)
+ end)
+ end
+
+ defp validate_emails(emails) do
+ cond do
+ not Enum.all?(emails, &valid_email?/1) -> {:error, :invalid_email}
+ # emails are case-insensitive in the database (citext)
+ Enum.uniq_by(emails, &String.downcase/1) != emails -> {:error, :duplicate_emails}
+ true -> :ok
+ end
+ end
+
+ defp valid_email?(email) do
+ String.contains?(email, "@") and String.contains?(email, ".")
+ end
+
+ defp do_invite(team, inviter, invitee_email, role, opts) when role in @valid_roles do
+ with :ok <- Teams.Invitations.check_invitation_permissions(team, inviter, role, opts),
+ :ok <- Teams.Invitations.check_team_member_limit(team, role, invitee_email),
+ invitee = Plausible.Auth.find_user_by(email: invitee_email),
+ :ok <- Teams.Invitations.ensure_new_membership(team, invitee, role),
+ :ok <- Teams.Invitations.ensure_not_already_invited(team, invitee_email) do
+ Teams.Invitations.invite(team, invitee_email, role, inviter)
+ end
+ end
+
+ defp do_invite(_team, _inviter, _invitee_email, role, _opts) do
+ raise "Invalid role passed: #{inspect(role)}"
+ end
end
diff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.ex
index 173303e4c1..3a8d4c1cfb 100644
--- a/lib/plausible_web/live/team_setup.ex
+++ b/lib/plausible_web/live/team_setup.ex
@@ -8,7 +8,6 @@ defmodule PlausibleWeb.Live.TeamSetup do
import PlausibleWeb.Live.Components.Team, only: [role_select_input: 1]
alias Plausible.Teams
- alias Plausible.Teams.Management.Layout
def mount(_params, _session, socket) do
socket =
@@ -151,20 +150,10 @@ defmodule PlausibleWeb.Live.TeamSetup do
end
def handle_event("create-team", %{"team" => %{"name" => name}} = params, socket) do
- name_changeset = Teams.Team.name_changeset(socket.assigns.current_team, %{name: name})
-
- # Only validated here, not persisted yet - the rename is committed
- # together with the rest of team creation (including invitations).
- case Ecto.Changeset.apply_action(name_changeset, :update) do
- {:ok, _team} ->
- create_team(socket, name_changeset, Map.get(params, "rows", %{}))
-
- {:error, changeset} ->
- {:noreply, assign(socket, team_name_form: to_form(changeset))}
- end
+ create_team(socket, name, Map.get(params, "rows", %{}))
end
- defp create_team(socket, name_changeset, rows_params) do
+ defp create_team(socket, name, rows_params) do
entries =
rows_params
|> Map.values()
@@ -178,34 +167,16 @@ defmodule PlausibleWeb.Live.TeamSetup do
end)
|> Enum.filter(&(&1.email != ""))
- emails = Enum.map(entries, & &1.email)
-
- cond do
- Enum.any?(emails, &(not valid_email?(&1))) ->
- {:noreply, put_live_flash(socket, :error, "Make sure all e-mails are valid")}
-
- Enum.uniq(emails) != emails ->
- {:noreply, put_live_flash(socket, :error, "Make sure e-mails are unique")}
-
- socket.assigns.current_user.email in emails ->
- {:noreply, put_live_flash(socket, :error, "You cannot invite yourself")}
-
- true ->
- layout =
- Enum.reduce(entries, %{}, fn %{email: email, role: role}, layout ->
- Layout.schedule_send(layout, email, role)
- end)
-
- persist_layout(socket, layout, name_changeset)
- end
+ setup_team(socket, name, entries)
end
- defp persist_layout(socket, layout, name_changeset) do
- case Layout.persist(layout, %{
- current_user: socket.assigns.current_user,
- current_team: socket.assigns.current_team,
- name_changeset: name_changeset
- }) do
+ defp setup_team(socket, name, entries) do
+ case Teams.setup(
+ socket.assigns.current_team,
+ name,
+ entries,
+ socket.assigns.current_user
+ ) do
{:ok, _} ->
{:noreply,
socket
@@ -214,31 +185,36 @@ defmodule PlausibleWeb.Live.TeamSetup do
to: ~p"/settings/team/general?#{[__team: socket.assigns.current_team.identifier]}"
)}
- {:error, {:over_limit, limit}} ->
+ {:error, %Ecto.Changeset{data: %Teams.Team{}} = changeset} ->
+ {:noreply, assign(socket, team_name_form: to_form(changeset))}
+
+ {:error, :invalid_email} ->
+ {:noreply, put_live_flash(socket, :error, "Make sure all e-mails are valid")}
+
+ {:error, :duplicate_emails} ->
+ {:noreply, put_live_flash(socket, :error, "Make sure e-mails are unique")}
+
+ {:error, reason} when reason in [:already_a_guest, :already_invited_guest] ->
{:noreply,
put_live_flash(
socket,
:error,
- "Your account is limited to #{limit} team members. You can upgrade your plan to increase this limit"
+ "Some of these e-mails belong to site guests who cannot be invited at this stage. Please invite them later in team settings"
)}
- {:error, other} ->
- # Team setup only ever sends brand-new invitations (never updates or
- # removes existing memberships), so none of Layout.persist/2's other
- # known error reasons (permission checks, last-owner protection, 2FA
- # enforcement) are reachable from here. Anything else is unexpected.
- Sentry.capture_message("Unexpected error while creating team via team setup",
- extra: %{error: inspect(other), team_id: socket.assigns.current_team.id}
- )
+ {:error, :already_a_member} ->
+ {:noreply, put_live_flash(socket, :error, "You cannot invite yourself")}
- {:noreply, put_live_flash(socket, :error, "Something went wrong. Please try again")}
+ {:error, {:over_limit, limit}} ->
+ {:noreply,
+ put_live_flash(
+ socket,
+ :error,
+ "Your account is limited to #{limit} team members. You can upgrade your plan to increase this limit"
+ )}
end
end
- defp valid_email?(email) do
- String.contains?(email, "@") and String.contains?(email, ".")
- end
-
@max_rows_when_unlimited 20
# Defines the upper bound for how many email+role input rows the UI
diff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exs
index ab9ff55a90..f1f857ddb5 100644
--- a/test/plausible/billing/quota_test.exs
+++ b/test/plausible/billing/quota_test.exs
@@ -357,6 +357,17 @@ defmodule Plausible.Billing.QuotaTest do
assert Plausible.Teams.Billing.team_member_usage(team) == 3
end
+ test "counts additional owners and pending owner invitations as team members" do
+ me = new_user()
+ _site = new_site(owner: me)
+ team = team_of(me)
+
+ add_member(team, role: :owner)
+ invite_member(team, "[email protected]", role: :owner, inviter: me)
+
+ assert Plausible.Teams.Billing.team_member_usage(team) == 2
+ end
+
test "does not count ownership transfer as a team member by default" do
me = new_user()
site_i_own = new_site(owner: me)
diff --git a/test/plausible/teams/invitations/invite_to_team_test.exs b/test/plausible/teams/invitations/invite_to_team_test.exs
index 9975e0276b..d96799513b 100644
--- a/test/plausible/teams/invitations/invite_to_team_test.exs
+++ b/test/plausible/teams/invitations/invite_to_team_test.exs
@@ -152,14 +152,14 @@ defmodule Plausible.Teams.Invitations.InviteToTeamTest do
end
end
- test "succeeds when existing user is only a guest member" do
+ test "returns error when existing user is a guest member" do
inviter = new_user()
invitee = new_user()
site = new_site(owner: inviter)
team = team_of(inviter)
add_guest(site, user: invitee, role: :viewer)
- assert {:ok, _team_invitation} =
+ assert {:error, :already_a_guest} =
InviteToTeam.invite(team, inviter, invitee.email, :viewer)
end
@@ -216,4 +216,195 @@ defmodule Plausible.Teams.Invitations.InviteToTeamTest do
end
end
end
+
+ describe "invite_all/3,4" do
+ test "creates invitations with a role per entry, without sending e-mails" do
+ inviter = new_user()
+ invitee = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ assert {:ok, [editor_invitation, viewer_invitation]} =
+ InviteToTeam.invite_all(team, inviter, [
+ %{email: invitee.email, role: :editor},
+ %{email: "[email protected]", role: :viewer}
+ ])
+
+ assert %Teams.Invitation{email: email, role: :editor} = editor_invitation
+ assert email == invitee.email
+ assert %Teams.Invitation{email: "[email protected]", role: :viewer} = viewer_invitation
+
+ assert Repo.get_by(Teams.Invitation, team_id: team.id, email: invitee.email)
+ assert Repo.get_by(Teams.Invitation, team_id: team.id, email: "[email protected]")
+
+ assert_no_emails_delivered()
+ end
+
+ test "returns an error when inviting self as owner without creating any invitations" do
+ me = new_user()
+ _my_site = new_site(owner: me)
+ team = team_of(me)
+
+ assert {:error, :already_a_member} =
+ InviteToTeam.invite_all(team, me, [%{email: me.email, role: :owner}])
+
+ refute Repo.get_by(Teams.Invitation, team_id: team.id, email: me.email)
+ end
+
+ for email <- ["", "no-at-sign.example.com", "no-dot@example"] do
+ test "returns an error for invalid email #{inspect(email)} without creating any invitations" do
+ inviter = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ assert {:error, :invalid_email} =
+ InviteToTeam.invite_all(team, inviter, [
+ %{email: "[email protected]", role: :editor},
+ %{email: unquote(email), role: :admin}
+ ])
+
+ refute Repo.get_by(Teams.Invitation, team_id: team.id, email: "[email protected]")
+ end
+ end
+
+ test "returns an error when inviting a guest member" do
+ inviter = new_user()
+ invitee = new_user()
+ site = new_site(owner: inviter)
+ team = team_of(inviter)
+ add_guest(site, user: invitee, role: :viewer)
+
+ assert {:error, :already_a_guest} =
+ InviteToTeam.invite_all(team, inviter, [%{email: invitee.email, role: :viewer}])
+
+ refute Repo.get_by(Teams.Invitation, team_id: team.id, email: invitee.email)
+ end
+
+ test "returns an error when inviting an email with a pending guest invitation" do
+ inviter = new_user()
+ site = new_site(owner: inviter)
+ team = team_of(inviter)
+ invite_guest(site, "[email protected]", role: :viewer, inviter: inviter)
+
+ assert {:error, :already_invited_guest} =
+ InviteToTeam.invite_all(team, inviter, [
+ %{email: "[email protected]", role: :editor}
+ ])
+
+ assert %Teams.Invitation{role: :guest} =
+ team_invitation =
+ Repo.get_by(Teams.Invitation, team_id: team.id, email: "[email protected]")
+
+ assert [_] = Repo.preload(team_invitation, :guest_invitations).guest_invitations
+ end
+
+ test "returns an error for duplicate emails without creating any invitations" do
+ inviter = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ assert {:error, :duplicate_emails} =
+ InviteToTeam.invite_all(team, inviter, [
+ %{email: "[email protected]", role: :viewer},
+ %{email: "[email protected]", role: :editor}
+ ])
+
+ refute Repo.get_by(Teams.Invitation, team_id: team.id, email: "[email protected]")
+ end
+
+ test "returns an error when inviting an email with a pending team invitation" do
+ inviter = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ existing_invitation =
+ invite_member(team, "[email protected]", role: :viewer, inviter: inviter)
+
+ assert {:error, :already_invited} =
+ InviteToTeam.invite_all(team, inviter, [
+ %{email: "[email protected]", role: :admin}
+ ])
+
+ invitation = Repo.reload!(existing_invitation)
+ assert invitation.role == :viewer
+ assert invitation.updated_at == existing_invitation.updated_at
+ assert_no_emails_delivered()
+ end
+
+ test "treats emails differing only in case as duplicates" do
+ inviter = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ assert {:error, :duplicate_emails} =
+ InviteToTeam.invite_all(team, inviter, [
+ %{email: "[email protected]", role: :viewer},
+ %{email: "[email protected]", role: :editor}
+ ])
+
+ refute Repo.get_by(Teams.Invitation, team_id: team.id, email: "[email protected]")
+ end
+
+ on_ee do
+ test "counts invitations in the same call towards team member limit" do
+ owner = new_user()
+ subscribe_to_growth_plan(owner)
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+ add_member(team, role: :viewer)
+
+ assert {:error, {:over_limit, 3}} =
+ InviteToTeam.invite_all(team, owner, [
+ %{email: "[email protected]", role: :viewer},
+ %{email: "[email protected]", role: :viewer},
+ %{email: "[email protected]", role: :viewer}
+ ])
+
+ refute Repo.get_by(Teams.Invitation, team_id: team.id, email: "[email protected]")
+ end
+ end
+
+ test "raises on invalid role" do
+ inviter = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ assert_raise RuntimeError, ~r/Invalid role/, fn ->
+ InviteToTeam.invite_all(team, inviter, [%{email: "[email protected]", role: :guest}])
+ end
+ end
+ end
+
+ describe "send_invitation_emails/1" do
+ test "sends an e-mail per invitation, picking the template by invitee existence" do
+ inviter = new_user()
+ invitee = new_user()
+ _site = new_site(owner: inviter)
+ team = team_of(inviter)
+
+ {:ok, invitations} =
+ InviteToTeam.invite_all(team, inviter, [
+ %{email: invitee.email, role: :editor},
+ %{email: "[email protected]", role: :viewer}
+ ])
+
+ assert :ok = InviteToTeam.send_invitation_emails(invitations)
+
+ subject = @subject_prefix <> "You've been invited to \"#{team.name}\" team"
+
+ assert_email_delivered_with(
+ to: [nil: invitee.email],
+ subject: subject,
+ html_body: ~r/#{PlausibleWeb.Endpoint.url()}\/sites"/
+ )
+
+ new_user_invitation = Enum.find(invitations, &(&1.email == "[email protected]"))
+
+ assert_email_delivered_with(
+ to: [nil: "[email protected]"],
+ subject: subject,
+ html_body: ~r/\/register\/invitation\/#{new_user_invitation.invitation_id}/
+ )
+ end
+ end
end
diff --git a/test/plausible/teams/management/layout_test.exs b/test/plausible/teams/management/layout_test.exs
index ac6eb785f9..f7c254ecf2 100644
--- a/test/plausible/teams/management/layout_test.exs
+++ b/test/plausible/teams/management/layout_test.exs
@@ -243,36 +243,6 @@ defmodule Plausible.Teams.Management.LayoutTest do
assert_no_emails_delivered()
end
- test "writes setup markers", %{user: user, team: team} do
- refute team.setup_complete
- refute team.setup_at
-
- team |> Layout.init() |> Layout.persist(%{current_user: user, current_team: team})
-
- team = Repo.reload!(team)
-
- assert team.setup_complete
- assert team.setup_at
- end
-
- test "won't update setup_at", %{user: user, team: team} do
- team =
- team
- |> Teams.Team.setup_changeset(
- NaiveDateTime.utc_now(:second)
- |> NaiveDateTime.shift(month: -1)
- )
- |> Repo.update!()
-
- assert setup_at = team.setup_at
-
- team |> Layout.init() |> Layout.persist(%{current_user: user, current_team: team})
-
- team = Repo.reload!(team)
-
- assert team.setup_at == setup_at
- end
-
test "invitation pending email goes out", %{user: user, team: team} do
assert {:ok, 1} =
team
diff --git a/test/plausible/teams_test.exs b/test/plausible/teams_test.exs
index 8df5bec668..eef38245fa 100644
--- a/test/plausible/teams_test.exs
+++ b/test/plausible/teams_test.exs
@@ -1,5 +1,6 @@
defmodule Plausible.TeamsTest do
use Plausible.DataCase, async: true
+ use Bamboo.Test
alias Plausible.Billing.Subscription
alias Plausible.Teams
@@ -361,6 +362,115 @@ defmodule Plausible.TeamsTest do
end
end
+ describe "complete_setup/1" do
+ test "writes setup markers" do
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+
+ refute team.setup_complete
+ refute team.setup_at
+
+ Teams.complete_setup(team)
+
+ team = Repo.reload!(team)
+
+ assert team.setup_complete
+ assert team.setup_at
+ end
+
+ test "is a no-op for a team that's already set up" do
+ owner = new_user()
+ _site = new_site(owner: owner)
+
+ team =
+ owner
+ |> team_of()
+ |> Teams.Team.setup_changeset(
+ NaiveDateTime.utc_now(:second)
+ |> NaiveDateTime.shift(month: -1)
+ )
+ |> Repo.update!()
+
+ assert setup_at = team.setup_at
+
+ Teams.complete_setup(team)
+
+ team = Repo.reload!(team)
+
+ assert team.setup_at == setup_at
+ end
+ end
+
+ describe "setup/4" do
+ @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "
+
+ test "renames the team, completes setup and invites members" do
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+
+ assert {:ok, team} =
+ Teams.setup(
+ team,
+ "New Team Name",
+ [%{email: "[email protected]", role: :editor}],
+ owner
+ )
+
+ assert team.name == "New Team Name"
+ assert team.setup_complete
+
+ assert [invitation] = Teams.Invitations.pending_team_invitations_for(team)
+ assert invitation.email == "[email protected]"
+ assert invitation.role == :editor
+
+ assert_email_delivered_with(
+ to: [nil: "[email protected]"],
+ subject: @subject_prefix <> "You've been invited to \"New Team Name\" team"
+ )
+ end
+
+ test "rolls back the rename and setup completion when an invitation fails" do
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+
+ assert {:error, :already_a_member} =
+ Teams.setup(
+ team,
+ "New Team Name",
+ [
+ %{email: "[email protected]", role: :editor},
+ %{email: owner.email, role: :viewer}
+ ],
+ owner
+ )
+
+ team = Repo.reload!(team)
+ assert team.name == Teams.default_name()
+ refute team.setup_complete
+ assert [] = Teams.Invitations.pending_team_invitations_for(team)
+ assert_no_emails_delivered()
+ end
+
+ test "returns the name changeset error without inviting anyone" do
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+
+ assert {:error, %Ecto.Changeset{data: %Teams.Team{}} = changeset} =
+ Teams.setup(team, "", [%{email: "[email protected]", role: :editor}], owner)
+
+ assert {"can't be blank", _} = changeset.errors[:name]
+
+ team = Repo.reload!(team)
+ refute team.setup_complete
+ assert [] = Teams.Invitations.pending_team_invitations_for(team)
+ assert_no_emails_delivered()
+ end
+ end
+
describe "delete/1" do
test "deletes a team" do
user = new_user()
diff --git a/test/plausible_web/live/team_setup_test.exs b/test/plausible_web/live/team_setup_test.exs
index 59591fba37..b7eafbc87c 100644
--- a/test/plausible_web/live/team_setup_test.exs
+++ b/test/plausible_web/live/team_setup_test.exs
@@ -244,6 +244,20 @@ defmodule PlausibleWeb.Live.TeamSetupTest do
assert Repo.reload!(team).name == "My personal sites"
end
+ test "rejects inviting a guest member", %{conn: conn, team: team} do
+ site = new_site(team: team)
+ guest = new_user()
+ add_guest(site, role: :viewer, user: guest)
+
+ {:ok, lv, _html} = live(conn, @url)
+
+ assert finish_setup(lv, rows: %{"1" => %{"email" => guest.email, "role" => "admin"}}) =~
+ "Some of these e-mails belong to site guests"
+
+ refute Repo.reload!(team).setup_complete
+ assert [] = Teams.Invitations.pending_team_invitations_for(team)
+ end
+
@tag :ee_only
test "fails to create the team when the plan's member limit is breached", %{
conn: conn,