Skip to content

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

Turn TeamController tests into service tests and remove the controller (#5047)

Adrian Gruntkowskiae0d6af50826
diff --git a/lib/plausible/teams/memberships/update_role.ex b/lib/plausible/teams/memberships/update_role.ex
index 2dccfd1898..956f89ed9b 100644
--- a/lib/plausible/teams/memberships/update_role.ex
+++ b/lib/plausible/teams/memberships/update_role.ex
@@ -15,7 +15,7 @@ defmodule Plausible.Teams.Memberships.UpdateRole do
with :ok <- check_valid_role(new_role),
{:ok, team_membership} <- Memberships.get_team_membership(team, user_id),
{:ok, current_user_role} <- Memberships.team_role(team, current_user),
- granting_to_self? = team_membership.user_id == user_id,
+ granting_to_self? = team_membership.user_id == current_user.id,
:ok <-
check_can_grant_role(
current_user_role,
diff --git a/lib/plausible_web/controllers/team_controller.ex b/lib/plausible_web/controllers/team_controller.ex
deleted file mode 100644
index ccf9585eb0..0000000000
--- a/lib/plausible_web/controllers/team_controller.ex
+++ /dev/null
@@ -1,71 +0,0 @@
-defmodule PlausibleWeb.TeamController do
- use PlausibleWeb, :controller
-
- alias Plausible.Teams
-
- plug PlausibleWeb.RequireAccountPlug
-
- def update_member_role(conn, %{"id" => user_id, "new_role" => new_role_str}) do
- %{my_team: team, current_user: current_user} = conn.assigns
-
- case Teams.Memberships.UpdateRole.update(team, user_id, new_role_str, current_user) do
- {:ok, team_membership} ->
- redirect_target =
- if team_membership.user_id == current_user.id and team_membership.role == :viewer do
- Routes.site_path(conn, :index)
- else
- Routes.settings_path(conn, :team_general)
- end
-
- conn
- |> put_flash(
- :success,
- "#{team_membership.user.name} is now #{PlausibleWeb.SiteView.with_indefinite_article(to_string(team_membership.role))}"
- )
- |> redirect(to: redirect_target)
-
- {:error, :only_one_owner} ->
- conn
- |> put_flash(:error, "User is the only owner and can't be changed")
- |> redirect(to: Routes.settings_path(conn, :team_general))
-
- {:error, _} ->
- conn
- |> put_flash(:error, "You are not allowed to grant role to that member")
- |> redirect(to: Routes.settings_path(conn, :team_general))
- end
- end
-
- def remove_member(conn, %{"id" => user_id}) do
- %{my_team: team, current_user: current_user} = conn.assigns
-
- case Teams.Memberships.Remove.remove(team, user_id, current_user) do
- {:ok, team_membership} ->
- redirect_target =
- if team_membership.user_id == current_user.id do
- Routes.site_path(conn, :index)
- else
- Routes.settings_path(conn, :team_general)
- end
-
- conn
- |> put_flash(:success, "User has been removed from the team")
- |> redirect(external: redirect_target)
-
- {:error, :only_one_owner} ->
- conn
- |> put_flash(:error, "User is the only owner and can't be changed")
- |> redirect(to: Routes.settings_path(conn, :team_general))
-
- {:error, :membership_not_found} ->
- conn
- |> put_flash(:success, "User has been removed from \"#{team.name}\" team")
- |> redirect(external: Routes.settings_path(conn, :team_general))
-
- {:error, :permission_denied} ->
- conn
- |> put_flash(:error, "You are not allowed to remove that member")
- |> redirect(to: Routes.settings_path(conn, :team_general))
- end
- end
-end
diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex
index bb03581d6c..00479dbf28 100644
--- a/lib/plausible_web/router.ex
+++ b/lib/plausible_web/router.ex
@@ -389,8 +389,6 @@ defmodule PlausibleWeb.Router do
get "/team/general", SettingsController, :team_general
post "/team/general/name", SettingsController, :update_team_name
- put "/team/memberships/u/:id/role/:new_role", TeamController, :update_member_role
- delete "/team/memberships/u/:id", TeamController, :remove_member
post "/team/invitations/:invitation_id/accept", InvitationController, :accept_invitation
post "/team/invitations/:invitation_id/reject", InvitationController, :reject_invitation
delete "/team/invitations/:invitation_id", InvitationController, :remove_team_invitation
diff --git a/test/plausible/teams/memberships/remove_test.exs b/test/plausible/teams/memberships/remove_test.exs
new file mode 100644
index 0000000000..34f07cbb2a
--- /dev/null
+++ b/test/plausible/teams/memberships/remove_test.exs
@@ -0,0 +1,88 @@
+defmodule Plausible.Teams.Memberships.RemoveTest do
+ use Plausible.DataCase, async: true
+ use Plausible
+ use Plausible.Repo
+ use Plausible.Teams.Test
+ use Bamboo.Test
+
+ alias Plausible.Teams.Memberships.Remove
+
+ @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "
+
+ test "removes a member from a team" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+ collaborator = add_member(team, role: :editor)
+ assert_team_membership(collaborator, team, :editor)
+
+ assert {:ok, _} = Remove.remove(team, collaborator.id, user)
+
+ refute_team_member(collaborator, team)
+
+ assert_email_delivered_with(
+ to: [nil: collaborator.email],
+ subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"
+ )
+ end
+
+ test "can't remove the only owner" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+
+ assert {:error, :only_one_owner} = Remove.remove(team, user.id, user)
+
+ assert_team_membership(user, team, :owner)
+ end
+
+ test "can remove self (the owner) when there's more than one owner" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+ _another_owner = add_member(team, role: :owner)
+
+ assert {:ok, _} = Remove.remove(team, user.id, user)
+
+ refute_team_member(user, team)
+ end
+
+ test "can remove another owner when there's more than one owner" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+ another_owner = add_member(team, role: :owner)
+
+ assert {:ok, _} = Remove.remove(team, another_owner.id, user)
+
+ refute_team_member(another_owner, team)
+ end
+
+ test "admin can't remove owner" do
+ user = new_user()
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+ _another_owner = add_member(team, role: :owner)
+ _admin = add_member(team, user: user, role: :admin)
+
+ assert {:error, :permission_denied} = Remove.remove(team, owner.id, user)
+
+ assert_team_membership(owner, team, :owner)
+ end
+
+ for role <- Plausible.Teams.Membership.roles() -- [:owner, :admin] do
+ test "#{role} can't update role of a member" do
+ user = new_user()
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+ _member = add_member(team, user: user, role: unquote(role))
+ another_member = add_member(team, role: :viewer)
+
+ assert {:error, :permission_denied} = Remove.remove(team, another_member.id, user)
+
+ assert_team_membership(another_member, team, :viewer)
+ end
+ end
+end
diff --git a/test/plausible/teams/memberships/update_role_test.exs b/test/plausible/teams/memberships/update_role_test.exs
new file mode 100644
index 0000000000..e3efbd12f5
--- /dev/null
+++ b/test/plausible/teams/memberships/update_role_test.exs
@@ -0,0 +1,94 @@
+defmodule Plausible.Teams.Memberships.UpdateRoleTest do
+ use Plausible.DataCase, async: true
+ use Plausible.Repo
+ use Plausible.Teams.Test
+ use Bamboo.Test
+
+ alias Plausible.Teams.Memberships.UpdateRole
+
+ test "updates a team member's role by user id" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+ collaborator = add_member(team, role: :editor)
+ assert_team_membership(collaborator, team, :editor)
+
+ assert {:ok, _} = UpdateRole.update(team, collaborator.id, "viewer", user)
+
+ assert_team_membership(collaborator, team, :viewer)
+ end
+
+ test "owner can promote another member to owner" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+ collaborator = add_member(team, role: :editor)
+ assert_team_membership(collaborator, team, :editor)
+
+ assert {:ok, _} = UpdateRole.update(team, collaborator.id, "owner", user)
+
+ assert_team_membership(collaborator, team, :owner)
+ end
+
+ test "can demote self when an owner" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+ _collaborator = add_member(team, role: :owner)
+
+ assert {:ok, _} = UpdateRole.update(team, user.id, "viewer", user)
+
+ assert_team_membership(user, team, :viewer)
+ end
+
+ test "can't demote self when the only owner" do
+ user = new_user()
+ _site = new_site(owner: user)
+ team = team_of(user)
+
+ assert {:error, :only_one_owner} = UpdateRole.update(team, user.id, "viewer", user)
+
+ assert_team_membership(user, team, :owner)
+ end
+
+ test "can demote self when an admin" do
+ user = new_user()
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+ _admin = add_member(team, user: user, role: :admin)
+
+ assert {:ok, _} = UpdateRole.update(team, user.id, "viewer", user)
+
+ assert_team_membership(user, team, :viewer)
+ end
+
+ test "admin can't update role of an owner" do
+ user = new_user()
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+ _admin = add_member(team, user: user, role: :admin)
+ _another_owner = add_member(team, role: :owner)
+
+ assert {:error, :permission_denied} = UpdateRole.update(team, owner.id, "viewer", user)
+
+ assert_team_membership(owner, team, :owner)
+ end
+
+ for role <- Plausible.Teams.Membership.roles() -- [:owner, :admin] do
+ test "#{role} can't update role of a member" do
+ user = new_user()
+ owner = new_user()
+ _site = new_site(owner: owner)
+ team = team_of(owner)
+ _member = add_member(team, user: user, role: unquote(role))
+ another_member = add_member(team, role: :viewer)
+
+ assert {:error, :permission_denied} =
+ UpdateRole.update(team, another_member.id, "editor", user)
+
+ assert_team_membership(another_member, team, :viewer)
+ end
+ end
+end
diff --git a/test/plausible_web/controllers/team_controller_test.exs b/test/plausible_web/controllers/team_controller_test.exs
deleted file mode 100644
index f74963526b..0000000000
--- a/test/plausible_web/controllers/team_controller_test.exs
+++ /dev/null
@@ -1,203 +0,0 @@
-defmodule PlausibleWeb.TeamControllerTest do
- use PlausibleWeb.ConnCase, async: true
- use Plausible.Repo
- use Plausible.Teams.Test
- use Bamboo.Test
-
- alias Plausible.Teams
-
- @subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "
-
- setup [:create_user, :log_in]
-
- describe "PUT /team/memberships/u/:id/role/:new_role" do
- test "updates a team member's role by user id", %{conn: conn, user: user} do
- _site = new_site(owner: user)
- team = team_of(user)
- collaborator = add_member(team, role: :editor)
- assert_team_membership(collaborator, team, :editor)
-
- put(conn, "/settings/team/memberships/u/#{collaborator.id}/role/viewer")
-
- assert_team_membership(collaborator, team, :viewer)
- end
-
- test "can demote self when an owner", %{conn: conn, user: user} do
- _site = new_site(owner: user)
- team = team_of(user)
- _collaborator = add_member(team, role: :owner)
-
- conn = put(conn, "/settings/team/memberships/u/#{user.id}/role/viewer")
-
- assert redirected_to(conn, 302) == Routes.site_path(conn, :index)
-
- assert_team_membership(user, team, :viewer)
- end
-
- test "can't demote self when the only owner", %{conn: conn, user: user} do
- _site = new_site(owner: user)
- team = team_of(user)
-
- conn = put(conn, "/settings/team/memberships/u/#{user.id}/role/viewer")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
- "User is the only owner and can't be changed"
-
- assert_team_membership(user, team, :owner)
- end
-
- test "can demote self when an admin", %{conn: conn, user: user} do
- owner = new_user()
- _site = new_site(owner: owner)
- team = team_of(owner)
- _admin = add_member(team, user: user, role: :admin)
-
- conn = put(conn, "/settings/team/memberships/u/#{user.id}/role/viewer")
-
- assert redirected_to(conn, 302) == Routes.site_path(conn, :index)
-
- assert_team_membership(user, team, :viewer)
- end
-
- test "admin can't update role of an owner", %{conn: conn, user: user} do
- owner = new_user()
- _site = new_site(owner: owner)
- team = team_of(owner)
- _admin = add_member(team, user: user, role: :admin)
- _another_owner = add_member(team, role: :owner)
-
- conn = put(conn, "/settings/team/memberships/u/#{owner.id}/role/viewer")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
- "You are not allowed to grant role to that member"
-
- assert_team_membership(owner, team, :owner)
- end
-
- for role <- Teams.Membership.roles() -- [:owner, :admin] do
- test "#{role} can't update role of a member", %{conn: conn, user: user} do
- owner = new_user()
- _site = new_site(owner: owner)
- team = team_of(owner)
- _member = add_member(team, user: user, role: unquote(role))
- another_member = add_member(team, role: :viewer)
-
- conn = put(conn, "/settings/team/memberships/u/#{another_member.id}/role/editor")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
- "You are not allowed to grant role to that member"
-
- assert_team_membership(another_member, team, :viewer)
- end
- end
- end
-
- describe "DELETE /team/memberships/u/:id" do
- test "removes a member from a team", %{conn: conn, user: user} do
- _site = new_site(owner: user)
- team = team_of(user)
- collaborator = add_member(team, role: :editor)
- assert_team_membership(collaborator, team, :editor)
-
- conn = delete(conn, "/settings/team/memberships/u/#{collaborator.id}")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :success) ==
- "User has been removed from the team"
-
- refute_team_member(collaborator, team)
-
- assert_email_delivered_with(
- to: [nil: collaborator.email],
- subject: @subject_prefix <> "Your access to \"#{team.name}\" team has been revoked"
- )
- end
-
- test "can't remove the only owner", %{conn: conn, user: user} do
- _site = new_site(owner: user)
- team = team_of(user)
-
- conn = delete(conn, "/settings/team/memberships/u/#{user.id}")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
- "User is the only owner and can't be changed"
-
- assert_team_membership(user, team, :owner)
- end
-
- test "can remove self (the owner) when there's more than one owner", %{conn: conn, user: user} do
- _site = new_site(owner: user)
- team = team_of(user)
- _another_owner = add_member(team, role: :owner)
-
- conn = delete(conn, "/settings/team/memberships/u/#{user.id}")
-
- assert redirected_to(conn, 302) == Routes.site_path(conn, :index)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :success) ==
- "User has been removed from the team"
-
- refute_team_member(user, team)
- end
-
- test "can remove another owner when there's more than one owner", %{conn: conn, user: user} do
- _site = new_site(owner: user)
- team = team_of(user)
- another_owner = add_member(team, role: :owner)
-
- conn = delete(conn, "/settings/team/memberships/u/#{another_owner.id}")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :success) ==
- "User has been removed from the team"
-
- refute_team_member(another_owner, team)
- end
-
- test "admin can't remove owner", %{conn: conn, user: user} do
- owner = new_user()
- _site = new_site(owner: owner)
- team = team_of(owner)
- _another_owner = add_member(team, role: :owner)
- _admin = add_member(team, user: user, role: :admin)
-
- conn = delete(conn, "/settings/team/memberships/u/#{owner.id}")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
- "You are not allowed to remove that member"
-
- assert_team_membership(owner, team, :owner)
- end
-
- for role <- Teams.Membership.roles() -- [:owner, :admin] do
- test "#{role} can't update role of a member", %{conn: conn, user: user} do
- owner = new_user()
- _site = new_site(owner: owner)
- team = team_of(owner)
- _member = add_member(team, user: user, role: unquote(role))
- another_member = add_member(team, role: :viewer)
-
- conn = delete(conn, "/settings/team/memberships/u/#{another_member.id}")
-
- assert redirected_to(conn, 302) == Routes.settings_path(conn, :team_general)
-
- assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
- "You are not allowed to remove that member"
-
- assert_team_membership(another_member, team, :viewer)
- end
- end
- end
-end