remove organizationUnitRole add, remove

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/Organizations/IOrganizationUnitRepository.cs

@@ -18,8 +18,5 @@ namespace Volo.Abp.Identity.Organizations
 
         Task<OrganizationUnit> GetOrganizationUnit(string displayName, bool includeDetails = false, CancellationToken cancellationToken = default);
 
-        Task AddRole(OrganizationUnit ou, IdentityRole role, Guid? tenantId, CancellationToken cancellationToken = default);
-
-        Task RemoveRole(OrganizationUnit ou, IdentityRole role, Guid? tenantId, CancellationToken cancellationToken = default);
     }
 }

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/Organizations/OrganizationUnitManager.cs

@@ -156,16 +156,16 @@ namespace Volo.Abp.Identity.Organizations
                 );
         }
 
-        public virtual async Task AddRoleToOrganizationUnitAsync(IdentityRole role, OrganizationUnit ou)
+        public virtual Task AddRoleToOrganizationUnitAsync(IdentityRole role, OrganizationUnit ou)
         {
             var currentRoles = ou.Roles;
 
             if (currentRoles.Any(r => r.Id == role.Id))
             {
-                return ;
+                return Task.FromResult(0);
             }
             ou.AddRole(role.Id);
-            await _organizationUnitRepository.AddRole(ou, role, ou.TenantId);
+            return Task.FromResult(0);
         }
 
         public virtual async Task RemoveRoleFromOrganizationUnitAsync(Guid roleId, Guid ouId)
@@ -176,10 +176,10 @@ namespace Volo.Abp.Identity.Organizations
                 );
         }
 
-        public virtual async Task RemoveRoleFromOrganizationUnitAsync(IdentityRole role, OrganizationUnit organizationUnit)
+        public virtual Task RemoveRoleFromOrganizationUnitAsync(IdentityRole role, OrganizationUnit organizationUnit)
         {
-            await _organizationUnitRepository.RemoveRole(organizationUnit, role, organizationUnit.TenantId);
             organizationUnit.RemoveRole(role.Id);
+            return Task.FromResult(0);
         }
     }
 }

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs

@@ -52,24 +52,6 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
                 ).ConfigureAwait(false);
         }
 
-        public Task AddRole(OrganizationUnit ou, IdentityRole role, Guid? tenantId, CancellationToken cancellationToken = default)
-        {
-            var our = new OrganizationUnitRole(tenantId, role.Id, ou.Id);
-            DbContext.Set<OrganizationUnitRole>().Add(our);
-            return Task.FromResult(0);
-        }
-
-        public async Task RemoveRole(OrganizationUnit ou, IdentityRole role, Guid? tenantId, CancellationToken cancellationToken = default)
-        {
-            var context = DbContext.Set<OrganizationUnitRole>();
-            var our = await context.FirstOrDefaultAsync(our =>
-                                        our.OrganizationUnitId == ou.Id &&
-                                        our.RoleId == role.Id &&
-                                        our.TenantId == tenantId
-                                        );
-            DbContext.Set<OrganizationUnitRole>().Remove(our);
-        }
-
         public override IQueryable<OrganizationUnit> WithDetails()
         {
             return GetQueryable().IncludeDetails();

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs

@@ -52,15 +52,5 @@ namespace Volo.Abp.Identity.MongoDB
                         GetCancellationToken(cancellationToken)
                     ).ConfigureAwait(false);
         }
-
-        public Task AddRole(OrganizationUnit ou, IdentityRole role, Guid? tenantId, CancellationToken cancellationToken = default)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task RemoveRole(OrganizationUnit ou, IdentityRole role, Guid? tenantId, CancellationToken cancellationToken = default)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/Identity_Repository_Resolve_Tests.cs

@@ -22,8 +22,6 @@ namespace Volo.Abp.Identity
             ServiceProvider.GetService<IRepository<IdentityRole, Guid>>().ShouldNotBeNull();
             ServiceProvider.GetService<IIdentityRoleRepository>().ShouldNotBeNull();
 
-            ServiceProvider.GetService<IRepository<OrganizationUnit>>().ShouldNotBeNull();
-            ServiceProvider.GetService<IRepository<OrganizationUnit, Guid>>().ShouldNotBeNull();
             ServiceProvider.GetService<IOrganizationUnitRepository>().ShouldNotBeNull();
         }
     }