diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 13da89d31..28b727527 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -149,21 +149,21 @@ defmodule Plausible.Sites do end def get_for_user!(user_id, domain, roles \\ [:owner, :admin, :viewer]) do - if :superadmin in roles and Plausible.Auth.is_super_admin?(domain) do + if :super_admin in roles and Plausible.Auth.is_super_admin?(user_id) do get_by_domain!(domain) else user_id - |> get_for_user_q(domain, List.delete(roles, :superadmin)) + |> get_for_user_q(domain, List.delete(roles, :super_admin)) |> Repo.one!() end end def get_for_user(user_id, domain, roles \\ [:owner, :admin, :viewer]) do - if :superadmin in roles and Plausible.Auth.is_super_admin?(domain) do + if :super_admin in roles and Plausible.Auth.is_super_admin?(user_id) do get_by_domain(domain) else user_id - |> get_for_user_q(domain, List.delete(roles, :superadmin)) + |> get_for_user_q(domain, List.delete(roles, :super_admin)) |> Repo.one() end end diff --git a/lib/plausible_web/live/funnel_settings.ex b/lib/plausible_web/live/funnel_settings.ex index f4fa339ff..0f7f5bf30 100644 --- a/lib/plausible_web/live/funnel_settings.ex +++ b/lib/plausible_web/live/funnel_settings.ex @@ -16,7 +16,7 @@ defmodule PlausibleWeb.Live.FunnelSettings do ) do true = Plausible.Funnels.enabled_for?("user:#{user_id}") - site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :superadmin]) + site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :super_admin]) funnels = Funnels.list(site) goal_count = Goals.count(site) diff --git a/lib/plausible_web/live/funnel_settings/form.ex b/lib/plausible_web/live/funnel_settings/form.ex index 1f10de59a..cedc658fc 100644 --- a/lib/plausible_web/live/funnel_settings/form.ex +++ b/lib/plausible_web/live/funnel_settings/form.ex @@ -12,7 +12,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do alias Plausible.{Sites, Goals} def mount(_params, %{"current_user_id" => user_id, "domain" => domain}, socket) do - site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :superadmin]) + site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :super_admin]) # We'll have the options trimmed to only the data we care about, to keep # it minimal at the socket assigns, yet, we want to retain specific %Goal{} diff --git a/lib/plausible_web/live/goal_settings.ex b/lib/plausible_web/live/goal_settings.ex index 0add240f6..1a7279a3a 100644 --- a/lib/plausible_web/live/goal_settings.ex +++ b/lib/plausible_web/live/goal_settings.ex @@ -14,7 +14,7 @@ defmodule PlausibleWeb.Live.GoalSettings do %{"site_id" => _site_id, "domain" => domain, "current_user_id" => user_id}, socket ) do - site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :superadmin]) + site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :super_admin]) goals = Goals.for_site(site, preload_funnels?: true) diff --git a/lib/plausible_web/live/goal_settings/form.ex b/lib/plausible_web/live/goal_settings/form.ex index 4c33169ca..1985248f4 100644 --- a/lib/plausible_web/live/goal_settings/form.ex +++ b/lib/plausible_web/live/goal_settings/form.ex @@ -20,7 +20,7 @@ defmodule PlausibleWeb.Live.GoalSettings.Form do ) do form = to_form(Plausible.Goal.changeset(%Plausible.Goal{})) - site = Plausible.Sites.get_for_user!(user_id, domain, [:owner, :admin, :superadmin]) + site = Plausible.Sites.get_for_user!(user_id, domain, [:owner, :admin, :super_admin]) {:ok, assign(socket, diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exs index 42c941b64..aba55ea03 100644 --- a/test/plausible/site/sites_test.exs +++ b/test/plausible/site/sites_test.exs @@ -143,4 +143,19 @@ defmodule Plausible.SitesTest do assert {:error, {:over_limit, 5}} = Sites.invite(site, inviter, invitee.email, :viewer) end end + + describe "get_for_user/2" do + test "get site for super_admin" do + user1 = insert(:user) + user2 = insert(:user) + patch_env(:super_admin_user_ids, [user2.id]) + + %{id: site_id, domain: domain} = insert(:site, members: [user1]) + assert %{id: ^site_id} = Sites.get_for_user(user1.id, domain) + assert %{id: ^site_id} = Sites.get_for_user(user1.id, domain, [:owner]) + + assert is_nil(Sites.get_for_user(user2.id, domain)) + assert %{id: ^site_id} = Sites.get_for_user(user2.id, domain, [:super_admin]) + end + end end