fix: add actor and domain parameters to user count functions

Add actor parameter to load_user_counts and recalculate_user_count
in Index LiveView to ensure consistent authorization and policy
enforcement. Also add domain parameter for clarity.
This commit is contained in:
Moritz 2026-01-08 14:09:27 +01:00
parent c27b903018
commit 266df8a8ad

View file

@ -27,7 +27,7 @@ defmodule MvWeb.RoleLive.Index do
def mount(_params, _session, socket) do def mount(_params, _session, socket) do
actor = socket.assigns[:current_user] actor = socket.assigns[:current_user]
roles = load_roles(actor) roles = load_roles(actor)
user_counts = load_user_counts(roles) user_counts = load_user_counts(roles, actor)
{:ok, {:ok,
socket socket
@ -71,7 +71,7 @@ defmodule MvWeb.RoleLive.Index do
gettext("System roles cannot be deleted.") gettext("System roles cannot be deleted.")
)} )}
else else
user_count = recalculate_user_count(role) user_count = recalculate_user_count(role, socket.assigns.current_user)
if user_count > 0 do if user_count > 0 do
{:noreply, {:noreply,
@ -123,16 +123,19 @@ defmodule MvWeb.RoleLive.Index do
end end
# Loads all user counts for roles in a single query to avoid N+1 queries # Loads all user counts for roles in a single query to avoid N+1 queries
defp load_user_counts(roles) do defp load_user_counts(roles, actor) do
role_ids = Enum.map(roles, & &1.id) role_ids = Enum.map(roles, & &1.id)
# Load all users with role_id in a single query # Load all users with role_id in a single query
opts = [domain: Mv.Accounts]
opts = if actor, do: Keyword.put(opts, :actor, actor), else: opts
users = users =
case Ash.read( case Ash.read(
Accounts.User Accounts.User
|> Ash.Query.filter(role_id in ^role_ids) |> Ash.Query.filter(role_id in ^role_ids)
|> Ash.Query.select([:role_id]), |> Ash.Query.select([:role_id]),
domain: Mv.Accounts opts
) do ) do
{:ok, users_list} -> users_list {:ok, users_list} -> users_list
{:error, _} -> [] {:error, _} -> []
@ -151,8 +154,11 @@ defmodule MvWeb.RoleLive.Index do
end end
# Recalculates user count for a specific role (used before deletion) # Recalculates user count for a specific role (used before deletion)
defp recalculate_user_count(role) do defp recalculate_user_count(role, actor) do
case Ash.count(Accounts.User |> Ash.Query.filter(role_id == ^role.id)) do opts = [domain: Mv.Accounts]
opts = if actor, do: Keyword.put(opts, :actor, actor), else: opts
case Ash.count(Accounts.User |> Ash.Query.filter(role_id == ^role.id), opts) do
{:ok, count} -> count {:ok, count} -> count
_ -> 0 _ -> 0
end end