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
This commit is contained in:
Adam Rutkowski 2023-08-29 10:30:33 +02:00
parent 7e99e80128
commit 5c9f58e78f
3 changed files with 24 additions and 16 deletions

View File

@ -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,

View File

@ -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)

View File

@ -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)