Change tenant in all derived class of IDataSeedContributor

modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs

@@ -2,6 +2,7 @@
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.Users;
 using Volo.CmsKit.Comments;
 using Volo.CmsKit.Ratings;
@@ -18,6 +19,7 @@ namespace Volo.CmsKit
         private readonly ICommentRepository _commentRepository;
         private readonly ReactionManager _reactionManager;
         private readonly IRatingRepository _ratingRepository;
+        private readonly ICurrentTenant _currentTenant;
 
         public CmsKitDataSeedContributor(
             IGuidGenerator guidGenerator,
@@ -25,7 +27,8 @@ namespace Volo.CmsKit
             CmsKitTestData cmsKitTestData,
             ICommentRepository commentRepository,
             ReactionManager reactionManager,
-            IRatingRepository ratingRepository)
+            IRatingRepository ratingRepository,
+            ICurrentTenant currentTenant)
         {
             _guidGenerator = guidGenerator;
             _cmsUserRepository = cmsUserRepository;
@@ -33,9 +36,12 @@ namespace Volo.CmsKit
             _commentRepository = commentRepository;
             _reactionManager = reactionManager;
             _ratingRepository = ratingRepository;
+            _currentTenant = currentTenant;
         }
 
         public async Task SeedAsync(DataSeedContext context)
+        {
+            using (_currentTenant.Change(context.TenantId))
             {
                 await SeedUsersAsync();
 
@@ -45,6 +51,7 @@ namespace Volo.CmsKit
 
                 await SeedRatingsAsync();
             }
+        }
 
         private async Task SeedUsersAsync()
         {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs

@@ -10,6 +10,7 @@ using Volo.Abp.Guids;
 using Volo.Abp.IdentityServer.ApiResources;
 using Volo.Abp.IdentityServer.Clients;
 using Volo.Abp.IdentityServer.IdentityResources;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.Uow;
 using ApiResource = Volo.Abp.IdentityServer.ApiResources.ApiResource;
@@ -25,6 +26,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer
         private readonly IGuidGenerator _guidGenerator;
         private readonly IPermissionDataSeeder _permissionDataSeeder;
         private readonly IConfiguration _configuration;
+        private readonly ICurrentTenant _currentTenant;
 
         public IdentityServerDataSeedContributor(
             IClientRepository clientRepository,
@@ -32,7 +34,8 @@ namespace MyCompanyName.MyProjectName.IdentityServer
             IIdentityResourceDataSeeder identityResourceDataSeeder,
             IGuidGenerator guidGenerator,
             IPermissionDataSeeder permissionDataSeeder,
-            IConfiguration configuration)
+            IConfiguration configuration,
+            ICurrentTenant currentTenant)
         {
             _clientRepository = clientRepository;
             _apiResourceRepository = apiResourceRepository;
@@ -40,15 +43,19 @@ namespace MyCompanyName.MyProjectName.IdentityServer
             _guidGenerator = guidGenerator;
             _permissionDataSeeder = permissionDataSeeder;
             _configuration = configuration;
+            _currentTenant = currentTenant;
         }
 
         [UnitOfWork]
         public virtual async Task SeedAsync(DataSeedContext context)
+        {
+            using (_currentTenant.Change(context.TenantId))
             {
                 await _identityResourceDataSeeder.CreateStandardResourcesAsync();
                 await CreateApiResourcesAsync();
                 await CreateClientsAsync();
             }
+        }
 
         private async Task CreateApiResourcesAsync()
         {

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs

@@ -9,6 +9,7 @@ using Volo.Abp.Guids;
 using Volo.Abp.IdentityServer.ApiResources;
 using Volo.Abp.IdentityServer.Clients;
 using Volo.Abp.IdentityServer.IdentityResources;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.Uow;
 
@@ -22,6 +23,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer
         private readonly IGuidGenerator _guidGenerator;
         private readonly IPermissionDataSeeder _permissionDataSeeder;
         private readonly IConfiguration _configuration;
+        private readonly ICurrentTenant _currentTenant;
 
         public IdentityServerDataSeedContributor(
             IClientRepository clientRepository,
@@ -29,7 +31,8 @@ namespace MyCompanyName.MyProjectName.IdentityServer
             IIdentityResourceDataSeeder identityResourceDataSeeder,
             IGuidGenerator guidGenerator,
             IPermissionDataSeeder permissionDataSeeder,
-            IConfiguration configuration)
+            IConfiguration configuration,
+            ICurrentTenant currentTenant)
         {
             _clientRepository = clientRepository;
             _apiResourceRepository = apiResourceRepository;
@@ -37,15 +40,19 @@ namespace MyCompanyName.MyProjectName.IdentityServer
             _guidGenerator = guidGenerator;
             _permissionDataSeeder = permissionDataSeeder;
             _configuration = configuration;
+            _currentTenant = currentTenant;
         }
 
         [UnitOfWork]
         public virtual async Task SeedAsync(DataSeedContext context)
+        {
+            using (_currentTenant.Change(context.TenantId))
             {
                 await _identityResourceDataSeeder.CreateStandardResourcesAsync();
                 await CreateApiResourcesAsync();
                 await CreateClientsAsync();
             }
+        }
 
         private async Task CreateApiResourcesAsync()
         {