From 5c9f58e78fe8ec258d763a549e64c6580f440b65 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Tue, 29 Aug 2023 10:30:33 +0200 Subject: [PATCH] Delegate :superadmin check to get_for_user/3 I'll do props settings separately, it's work in progress in a branch on top of this one already. cc @ukutaht --- lib/plausible/sites.ex | 26 +++++++++++++++++++---- lib/plausible_web/live/funnel_settings.ex | 7 +----- lib/plausible_web/live/goal_settings.ex | 7 +----- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index e544b6081..122e086fa 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -8,6 +8,10 @@ defmodule Plausible.Sites do Repo.get_by(Site, domain: domain) end + def get_by_domain!(domain) do + Repo.get_by!(Site, domain: domain) + end + def create(user, params) do site_changeset = Site.changeset(%Site{}, params) @@ -93,11 +97,25 @@ defmodule Plausible.Sites do base <> domain <> "?auth=" <> link.slug end - def get_for_user!(user_id, domain, roles \\ [:owner, :admin, :viewer]), - do: Repo.one!(get_for_user_q(user_id, domain, roles)) + def get_for_user!(user_id, domain, roles \\ [:owner, :admin, :viewer]) do + if :superuser in roles and Plausible.Auth.is_super_admin?(domain) do + get_by_domain!(domain) + else + user_id + |> get_for_user_q(domain, List.delete(roles, :superadmin)) + |> Repo.one!() + end + end - def get_for_user(user_id, domain, roles \\ [:owner, :admin, :viewer]), - do: Repo.one(get_for_user_q(user_id, domain, roles)) + def get_for_user(user_id, domain, roles \\ [:owner, :admin, :viewer]) do + if :superuser in roles and Plausible.Auth.is_super_admin?(domain) do + get_by_domain(domain) + else + user_id + |> get_for_user_q(domain, List.delete(roles, :superadmin)) + |> Repo.one() + end + end defp get_for_user_q(user_id, domain, roles) do from(s in Site, diff --git a/lib/plausible_web/live/funnel_settings.ex b/lib/plausible_web/live/funnel_settings.ex index a2167f7a0..f4fa339ff 100644 --- a/lib/plausible_web/live/funnel_settings.ex +++ b/lib/plausible_web/live/funnel_settings.ex @@ -16,12 +16,7 @@ defmodule PlausibleWeb.Live.FunnelSettings do ) do true = Plausible.Funnels.enabled_for?("user:#{user_id}") - site = - if Plausible.Auth.is_super_admin?(user_id) do - Sites.get_by_domain(domain) - else - Sites.get_for_user!(user_id, domain, [:owner, :admin]) - end + site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :superadmin]) funnels = Funnels.list(site) goal_count = Goals.count(site) diff --git a/lib/plausible_web/live/goal_settings.ex b/lib/plausible_web/live/goal_settings.ex index d4cae77e8..791c73adc 100644 --- a/lib/plausible_web/live/goal_settings.ex +++ b/lib/plausible_web/live/goal_settings.ex @@ -14,12 +14,7 @@ defmodule PlausibleWeb.Live.GoalSettings do %{"site_id" => _site_id, "domain" => domain, "current_user_id" => user_id}, socket ) do - site = - if Plausible.Auth.is_super_admin?(user_id) do - Sites.get_by_domain(domain) - else - Sites.get_for_user!(user_id, domain, [:owner, :admin]) - end + site = Sites.get_for_user!(user_id, domain, [:owner, :admin, :superadmin]) goals = Goals.for_site(site, preload_funnels?: true)