Merge pull request #115 from Sagilio/fix#114

Add domain optional support at RBAC APIs
casbin · Jan 23, 2021 · e1b9cc5 · e1b9cc5
2 parents aa4fade + 712e472
commit e1b9cc5
Show file tree

Hide file tree

Showing 12 changed files with 673 additions and 211 deletions.
diff --git a/.github/workflows/github-actions-benchmark.yml b/.github/workflows/github-actions-benchmark.yml
@@ -27,7 +27,7 @@ jobs:
       run: dotnet --info
 
     - name: Install dependencies
-      run: dotnet restore
+      run: nuget restore
 
     - name: Build
       run: dotnet build -c Release --no-restore

diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
@@ -47,7 +47,7 @@ jobs:
       run: dotnet --info
 
     - name: Install dependencies
-      run: dotnet restore
+      run: nuget restore
 
     - name: Build solution
       run: dotnet build -c Release --no-restore

diff --git a/.github/workflows/github-actions-release.yml b/.github/workflows/github-actions-release.yml
@@ -26,7 +26,7 @@ jobs:
       run: dotnet --info
 
     - name: Install dependencies
-      run: dotnet restore
+      run: nuget restore
 
     - name: Build solution
       run: dotnet build -c Release --no-restore

diff --git a/NetCasbin.UnitTest/Fixtures/TestModelFixture.cs b/NetCasbin.UnitTest/Fixtures/TestModelFixture.cs
@@ -36,6 +36,7 @@ public class TestModelFixture
         internal readonly string _rbacWithDenyPolicyText = ReadTestFile("rbac_with_deny_policy.csv");
         internal readonly string _rbacWithDomainsPolicyText = ReadTestFile("rbac_with_domains_policy.csv");
         internal readonly string _rbacWithHierarchyPolicyText = ReadTestFile("rbac_with_hierarchy_policy.csv");
+        internal readonly string _rbacWithHierarchyWithDomainsPolicyText = ReadTestFile("rbac_with_hierarchy_with_domains_policy.csv");
         internal readonly string _rbacWithResourceRolePolicyText = ReadTestFile("rbac_with_resource_roles_policy.csv");
 
         public Model.Model GetNewAbacModel()

diff --git a/NetCasbin.UnitTest/NetCasbin.UnitTest.csproj b/NetCasbin.UnitTest/NetCasbin.UnitTest.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5</TargetFrameworks>
     <DebugType>full</DebugType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -120,6 +120,9 @@
     <None Update="examples\rbac_with_hierarchy_policy.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="examples\rbac_with_hierarchy_with_domains_policy.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="examples\rbac_with_not_deny_model.conf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>