Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/acx/enforcer.ex
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ defmodule Acx.Enforcer do
when is_atom(mapping_name) and is_binary(role1) and is_binary(role2) and is_binary(dom) do
with group when not is_nil(group) <- Map.get(groups, mapping_name),
false <- Enum.member?(mappings, mapping),
group <- RoleGroup.add_inheritance(group, {role1, role2 <> dom}) do
group <- RoleGroup.add_inheritance(group, {{role1, dom}, {role2, dom}}) do
new_enforcer = %{
enforcer
| role_groups: %{groups | mapping_name => group},
Expand Down Expand Up @@ -720,7 +720,7 @@ defmodule Acx.Enforcer do
)
when is_atom(mapping_name) and is_binary(role1) and is_binary(role2) and is_binary(dom) do
with group when not is_nil(group) <- Map.get(groups, mapping_name),
group <- RoleGroup.remove_inheritance(group, {role1, role2 <> dom}),
group <- RoleGroup.remove_inheritance(group, {{role1, dom}, {role2, dom}}),
mappings <- Enum.reject(mappings, fn m -> m == mapping end),
{:ok, _adpater} <-
PersistAdapter.remove_policy(adapter, {mapping_name, [role1, role2, dom]}) do
Expand Down
6 changes: 3 additions & 3 deletions lib/acx/internal/role_group.ex
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ defmodule Acx.Internal.RoleGroup do
...> false = f.(1, 2)
...> f.("admin", "member")
true
...> g = g |> RoleGroup.add_inheritance({"admin", "memberdomain"})
...> g = g |> RoleGroup.add_inheritance({{"admin", "domain"}, {"member", "domain"}})
...> f = g |> RoleGroup.stub_3
...> false = f.("member", "admin", "dom")
...> false = f.("member", "admin", "domain")
...> f.("admin", "member", "domain")
true
"""
Expand All @@ -161,7 +161,7 @@ defmodule Acx.Internal.RoleGroup do
def stub_3(%__MODULE__{} = group) do
fn
arg1, arg2, arg3 ->
group |> inherit_from?(arg1, arg2 <> arg3)
group |> inherit_from?({arg1, arg3}, {arg2, arg3})
end
end
end