fix: add actor and domain parameters to user count functions in Show

Add actor and domain parameters to recalculate_user_count and
load_user_count to ensure consistent authorization. Clarify that
load_user_count is for initial display while recalculate_user_count
is for fresh count before deletion.
This commit is contained in:
Moritz 2026-01-08 14:09:28 +01:00
parent 548bad6703
commit d9dd936ae3
Signed by: moritz
GPG key ID: 1020A035E5DD0824

View file

@ -27,10 +27,10 @@ defmodule MvWeb.RoleLive.Show do
domain: Mv.Authorization, domain: Mv.Authorization,
actor: socket.assigns[:current_user] actor: socket.assigns[:current_user]
) do ) do
{:ok, role} -> {:ok, role} ->
user_count = load_user_count(role) user_count = load_user_count(role, socket.assigns[:current_user])
{:ok, {:ok,
socket socket
|> assign(:page_title, gettext("Show Role")) |> assign(:page_title, gettext("Show Role"))
|> assign(:role, role) |> assign(:role, role)
@ -99,7 +99,7 @@ defmodule MvWeb.RoleLive.Show 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,
@ -137,15 +137,20 @@ defmodule MvWeb.RoleLive.Show do
end end
end end
defp recalculate_user_count(role) do # Recalculates user count for a specific role (used before deletion)
case Ash.count(Accounts.User |> Ash.Query.filter(role_id == ^role.id)) do defp recalculate_user_count(role, actor) 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
end end
defp load_user_count(role) do # Loads user count for initial display (uses same logic as recalculate)
recalculate_user_count(role) defp load_user_count(role, actor) do
recalculate_user_count(role, actor)
end end
@impl true @impl true