Skip to content

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

Email notification on guest->team member promotion (#5191)

hq1d5f6563548b1
diff --git a/lib/plausible/teams/memberships/update_role.ex b/lib/plausible/teams/memberships/update_role.ex
index a903c57291..867e229e88 100644
--- a/lib/plausible/teams/memberships/update_role.ex
+++ b/lib/plausible/teams/memberships/update_role.ex
@@ -24,11 +24,21 @@ defmodule Plausible.Teams.Memberships.UpdateRole do
granting_to_self?
),
:ok <- check_owner_can_get_demoted(team, team_membership.role, new_role) do
+ team_membership = Repo.preload(team_membership, :user)
+
+ if team_membership.role == :guest and new_role != :guest do
+ team_membership.user.email
+ |> PlausibleWeb.Email.guest_to_team_member_promotion(
+ team,
+ current_user
+ )
+ |> Plausible.Mailer.send()
+ end
+
team_membership =
team_membership
|> Ecto.Changeset.change(role: new_role)
|> Repo.update!()
- |> Repo.preload(:user)
:ok = maybe_prune_guest_memberships(team_membership)
diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.ex
index 326b36749a..ad14eadef2 100644
--- a/lib/plausible_web/email.ex
+++ b/lib/plausible_web/email.ex
@@ -278,6 +278,14 @@ defmodule PlausibleWeb.Email do
)
end
+ def guest_to_team_member_promotion(email, team, inviter) do
+ priority_email()
+ |> to(email)
+ |> tag("guest-to-team-member-promotion")
+ |> subject("[#{Plausible.product_name()}] Welcome to \"#{team.name}\" team")
+ |> render("guest_to_team_member_promotion.html", inviter: inviter, team: team)
+ end
+
def ownership_transfer_request(email, invitation_id, site, inviter, new_owner_account) do
priority_email()
|> to(email)
diff --git a/lib/plausible_web/templates/email/guest_to_team_member_promotion.html.heex b/lib/plausible_web/templates/email/guest_to_team_member_promotion.html.heex
new file mode 100644
index 0000000000..37d5229473
--- /dev/null
+++ b/lib/plausible_web/templates/email/guest_to_team_member_promotion.html.heex
@@ -0,0 +1 @@
+{@inviter.email} has promoted you to a team member in the "{@team.name}" team on {Plausible.product_name()}.
diff --git a/test/plausible/teams/memberships/update_role_test.exs b/test/plausible/teams/memberships/update_role_test.exs
index e3efbd12f5..e4887650bf 100644
--- a/test/plausible/teams/memberships/update_role_test.exs
+++ b/test/plausible/teams/memberships/update_role_test.exs
@@ -3,9 +3,12 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do
use Plausible.Repo
use Plausible.Teams.Test
use Bamboo.Test
+ use Plausible
alias Plausible.Teams.Memberships.UpdateRole
+ @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "
+
test "updates a team member's role by user id" do
user = new_user()
_site = new_site(owner: user)
@@ -28,6 +31,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do
assert {:ok, _} = UpdateRole.update(team, collaborator.id, "owner", user)
assert_team_membership(collaborator, team, :owner)
+ assert_no_emails_delivered()
end
test "can demote self when an owner" do
@@ -39,6 +43,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do
assert {:ok, _} = UpdateRole.update(team, user.id, "viewer", user)
assert_team_membership(user, team, :viewer)
+ assert_no_emails_delivered()
end
test "can't demote self when the only owner" do
@@ -49,6 +54,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do
assert {:error, :only_one_owner} = UpdateRole.update(team, user.id, "viewer", user)
assert_team_membership(user, team, :owner)
+ assert_no_emails_delivered()
end
test "can demote self when an admin" do
@@ -61,6 +67,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do
assert {:ok, _} = UpdateRole.update(team, user.id, "viewer", user)
assert_team_membership(user, team, :viewer)
+ assert_no_emails_delivered()
end
test "admin can't update role of an owner" do
@@ -74,6 +81,7 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do
assert {:error, :permission_denied} = UpdateRole.update(team, owner.id, "viewer", user)
assert_team_membership(owner, team, :owner)
+ assert_no_emails_delivered()
end
for role <- Plausible.Teams.Membership.roles() -- [:owner, :admin] do
@@ -89,6 +97,23 @@ defmodule Plausible.Teams.Memberships.UpdateRoleTest do
UpdateRole.update(team, another_member.id, "editor", user)
assert_team_membership(another_member, team, :viewer)
+ assert_no_emails_delivered()
end
end
+
+ test "guest->member promotion sends out an e-mail" do
+ user = new_user()
+ owner = new_user()
+ site = new_site(owner: owner)
+ team = team_of(owner)
+
+ add_guest(site, role: :viewer, user: user)
+
+ assert {:ok, _} = UpdateRole.update(team, user.id, "editor", owner)
+
+ assert_email_delivered_with(
+ to: [nil: user.email],
+ subject: @subject_prefix <> "Welcome to \"#{team.name}\" team"
+ )
+ end
end
diff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exs
index 95eec975e9..16ccca9606 100644
--- a/test/plausible_web/live/team_management_test.exs
+++ b/test/plausible_web/live/team_management_test.exs
@@ -237,6 +237,11 @@ defmodule PlausibleWeb.Live.TeamMangementTest do
assert_team_membership(user, team, :owner)
assert_team_membership(member2, team, :owner)
+
+ assert_email_delivered_with(
+ to: [nil: member2.email],
+ subject: @subject_prefix <> "Welcome to \"#{team.name}\" team"
+ )
end
test "multiple-owners",