Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add list request values #303

Merged
merged 1 commit into from
Nov 4, 2022
Merged

feat: Add list request values #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions Casbin.UnitTests/GenericTests/SupportCountTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,56 +41,78 @@ private static void TestEnforce(IEnforcer enforcer, EnforceContext context, int
{
case 1:
Assert.True(enforcer.Enforce(context, "value1"));
Assert.True(enforcer.Enforce(context, new[] { "value1" }));
break;
case 2:
Assert.True(enforcer.Enforce(context, "value1", "value2"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2" }));
break;
case 3:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3" }));
break;
case 4:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3", "value4" }));
break;
case 5:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5" }));
break;
case 6:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5", "value6"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6" }));
break;
case 7:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5", "value6", "value7"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6", "value7" }));
break;
case 8:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8" }));
break;
case 9:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9" }));
break;
case 10:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9",
"value10"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9", "value10" }));
break;
case 11:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9",
"value10", "value11"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9", "value10", "value11" }));
break;
case 12:
Assert.True(enforcer.Enforce(context, "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9",
"value10", "value11", "value12"));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9", "value10", "value11", "value12" }));
break;
case 13:
Assert.True(enforcer.Enforce(context, Request.CreateValues("value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9",
"value10", "value11", "value12", "value13")));
Assert.True(enforcer.Enforce(context, new[] { "value1", "value2", "value3",
"value4", "value5", "value6", "value7", "value8", "value9", "value10", "value11", "value12", "value13" }));
break;
default:
throw new ArgumentOutOfRangeException(nameof(requestCount));
Expand Down
78 changes: 78 additions & 0 deletions Casbin/Extensions/Enforcer/EnforcerExtension.GenericEnforce.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,84 @@ namespace Casbin;

public static partial class EnforcerExtension
{
#region Generic List Enforce

public static bool Enforce<T>(this IEnforcer enforcer, params T[] value)
{
var request = Request.CreateValues(value);
return enforcer.Enforce(enforcer.CreateContext(), request);
}

public static Task<bool> EnforceAsync<T>(this IEnforcer enforcer, params T[] value)
{
var request = Request.CreateValues(value);
return enforcer.EnforceAsync(enforcer.CreateContext(), request);
}

public static bool Enforce<T>(this IEnforcer enforcer, EnforceContext context, params T[] value)
{
var request = Request.CreateValues(value);
return enforcer.Enforce(context, request);
}

public static Task<bool> EnforceAsync<T>(this IEnforcer enforcer, EnforceContext context, params T[] value)
{
var request = Request.CreateValues(value);
return enforcer.EnforceAsync(context, request);
}

public static (bool Result, IEnumerable<IEnumerable<string>> Explains)
EnforceEx<T>(this IEnforcer enforcer, params T[] value)
{
var request = Request.CreateValues(value);
EnforceContext context = enforcer.CreateContext(true);
bool result = enforcer.Enforce(context, request);
return (result, context.Explanations);
}

public static async Task<(bool Result, IEnumerable<IEnumerable<string>> Explains)>
EnforceExAsync<T>(this IEnforcer enforcer, params T[] value)
{
var request = Request.CreateValues(value);
EnforceContext context = enforcer.CreateContext(true);
bool result = await enforcer.EnforceAsync(context, request);
return (result, context.Explanations);
}

public static bool EnforceWithMatcher<T>(this IEnforcer enforcer, string matcher, params T[] value)
{
var request = Request.CreateValues(value);
EnforceContext context = enforcer.CreateContextWithMatcher(matcher);
return enforcer.Enforce(context, request);
}

public static Task<bool> EnforceWithMatcherAsync<T>(this IEnforcer enforcer, string matcher, params T[] value)
{
var request = Request.CreateValues(value);
EnforceContext context = enforcer.CreateContextWithMatcher(matcher);
return enforcer.EnforceAsync(context, request);
}

public static (bool Result, IEnumerable<IEnumerable<string>> Explains)
EnforceExWithMatcher<T>(this IEnforcer enforcer, string matcher, params T[] value)
{
var request = Request.CreateValues(value);
EnforceContext context = enforcer.CreateContextWithMatcher(matcher, true);
bool result = enforcer.Enforce(context, request);
return (result, context.Explanations);
}

public static async Task<(bool Result, IEnumerable<IEnumerable<string>> Explains)>
EnforceExWithMatcherAsync<T>(this IEnforcer enforcer, string matcher, params T[] value)
{
var request = Request.CreateValues(value);
EnforceContext context = enforcer.CreateContextWithMatcher(matcher, true);
bool result = await enforcer.EnforceAsync(context, request);
return (result, context.Explanations);
}

#endregion

#region Generic Enforce Count 1

public static bool Enforce<T>(this IEnforcer enforcer, T value)
Expand Down
8 changes: 4 additions & 4 deletions Casbin/Model/Request.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ public static bool SupportGeneric(int count)
return count is >= 1 and <= 12;
}


public static RequestValues<T> CreateValues<T>(T value)
{
return new RequestValues<T>(value);
Expand Down Expand Up @@ -101,9 +100,10 @@ public static RequestValues<T1, T2, T3, T4, T5, T6, T7, T8, T9> CreateValues<T1,
value4, value5, value6, value7, value8, value9, value10, value11, value12);
}

public static ObjectListRequestValues CreateValues(params object[] values) => new(values);

public static ObjectListRequestValues CreateValues(IReadOnlyList<object> values) => new(values);
public static ListRequestValues<T> CreateValues<T>(params T[] value)
{
return new ListRequestValues<T>(value);
}

public static bool TryGetStringKey<TRequest>(TRequest requestValues, out string key) where TRequest : IRequestValues
{
Expand Down
31 changes: 24 additions & 7 deletions Casbin/Model/RequestValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,6 @@ public bool TrySetValue<T>(int index, T value)
{
return TrySetValue(index, v);
}

return false;
}

Expand Down Expand Up @@ -888,12 +887,25 @@ public bool TrySetValue(int index, string value)
}
}

public readonly struct ObjectListRequestValues : IRequestValues
public readonly struct ListRequestValues<TValue> : IRequestValues
{
private readonly IList<object> _values;

public ObjectListRequestValues(IReadOnlyList<object> values) =>
_values = values as IList<object> ?? values.ToList();
private readonly IList<TValue> _values;

public ListRequestValues(IEnumerable<TValue> values) =>
_values = values as IList<TValue> ?? values.ToArray();

public TValue Value1 => _values[0];
public TValue Value2 => _values[1];
public TValue Value3 => _values[2];
public TValue Value4 => _values[3];
public TValue Value5 => _values[4];
public TValue Value6 => _values[5];
public TValue Value7 => _values[6];
public TValue Value8 => _values[7];
public TValue Value9 => _values[8];
public TValue Value10 => _values[9];
public TValue Value11 => _values[10];
public TValue Value12 => _values[11];

public string this[int index] => RequestValues.ToStringValue(_values[index]);
public int Count => _values.Count;
Expand All @@ -905,7 +917,12 @@ public bool TrySetValue<T>(int index, T value)
return false;
}

_values[index] = value;
if (value is not TValue v)
{
return false;
}

_values[index] = v;
return true;
}
}