Merge pull request #7577 from abpframework/separate-tenant-db-improvements

Separate tenant db improvements

framework/Volo.Abp.sln

@@ -359,6 +359,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Json.Tests", "test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Tests", "test\Volo.Abp.Http.Tests\Volo.Abp.Http.Tests.csproj", "{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Abstractions", "src\Volo.Abp.EventBus.Abstractions\Volo.Abp.EventBus.Abstractions.csproj", "{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1069,6 +1071,10 @@ Global
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1250,6 +1256,7 @@ Global
 		{DD9519E0-5A68-48DC-A051-7BF2AC922F3E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{00D07595-993C-40FC-BD90-0DD6331414D3} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{A37BFEB5-7C57-4CDC-93B8-B5CE4BB9ACE1} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+		{8FDB3BF7-AD89-43F6-8DEB-C3E29B8801FE} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

framework/src/Volo.Abp.EventBus.Abstractions/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>

framework/src/Volo.Abp.EventBus.Abstractions/FodyWeavers.xsd

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

framework/src/Volo.Abp.EventBus.Abstractions/Volo.Abp.EventBus.Abstractions.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\common.props" />
+    
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    </ItemGroup>
+
+</Project>

framework/src/Volo.Abp.EventBus.Abstractions/Volo/Abp/EventBus/Abstractions/AbpEventBusAbstractionsModule.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.EventBus.Abstractions
+{
+    public class AbpEventBusAbstractionsModule : AbpModule
+    {
+
+    }
+}

framework/src/Volo.Abp.EventBus/Volo.Abp.EventBus.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <ProjectReference Include="..\Volo.Abp.EventBus.Abstractions\Volo.Abp.EventBus.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
   </ItemGroup>
 

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
+using Volo.Abp.EventBus.Abstractions;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Modularity;
@@ -9,7 +10,9 @@ using Volo.Abp.Reflection;
 
 namespace Volo.Abp.EventBus
 {
-    [DependsOn(typeof(AbpMultiTenancyModule))]
+    [DependsOn(
+        typeof(AbpEventBusAbstractionsModule),
+        typeof(AbpMultiTenancyModule))]
     public class AbpEventBusModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)

framework/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj

@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Data\Volo.Abp.Data.csproj" />
+    <ProjectReference Include="..\Volo.Abp.EventBus.Abstractions\Volo.Abp.EventBus.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
   </ItemGroup>
 

framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Data;
+using Volo.Abp.EventBus.Abstractions;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy.ConfigurationStore;
 using Volo.Abp.Security;
@@ -10,7 +11,8 @@ namespace Volo.Abp.MultiTenancy
 
     [DependsOn(
         typeof(AbpDataModule),
-        typeof(AbpSecurityModule)
+        typeof(AbpSecurityModule),
+        typeof(AbpEventBusAbstractionsModule)
         )]
     public class AbpMultiTenancyModule : AbpModule
     {

framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConnectionStringUpdatedEto.cs

@@ -0,0 +1,21 @@
+using System;
+using Volo.Abp.Domain.Entities.Events.Distributed;
+using Volo.Abp.EventBus;
+
+namespace Volo.Abp.MultiTenancy
+{
+    [Serializable]
+    [EventName("abp.multi_tenancy.tenant.connection_string.updated")]
+    public class TenantConnectionStringUpdatedEto : EtoBase
+    {
+        public Guid Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string ConnectionStringName { get; set; }
+
+        public string OldValue { get; set; }
+
+        public string NewValue { get; set; }
+    }
+}

framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantCreatedEto.cs

@@ -0,0 +1,15 @@
+using System;
+using Volo.Abp.Domain.Entities.Events.Distributed;
+using Volo.Abp.EventBus;
+
+namespace Volo.Abp.MultiTenancy
+{
+    [Serializable]
+    [EventName("abp.multi_tenancy.tenant.created")]
+    public class TenantCreatedEto : EtoBase
+    {
+        public Guid Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Identity;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs

@@ -49,58 +49,61 @@ namespace Volo.Abp.Identity
             Check.NotNullOrWhiteSpace(adminEmail, nameof(adminEmail));
             Check.NotNullOrWhiteSpace(adminPassword, nameof(adminPassword));
 
-            await IdentityOptions.SetAsync();
-
-            var result = new IdentityDataSeedResult();
-
             using (CurrentTenant.Change(tenantId))
             {
-                //"admin" user
+                await IdentityOptions.SetAsync();
-                const string adminUserName = "admin";
-                var adminUser = await UserRepository.FindByNormalizedUserNameAsync(
-                    LookupNormalizer.NormalizeName(adminUserName)
-                );
 
-                if (adminUser != null)
+                using (IdentityOptions.Value.Password.ClearRequirements())
                 {
-                    return result;
+                    var result = new IdentityDataSeedResult();
-                }
+                    //"admin" user
+                    const string adminUserName = "admin";
+                    var adminUser = await UserRepository.FindByNormalizedUserNameAsync(
+                        LookupNormalizer.NormalizeName(adminUserName)
+                    );
 
-                adminUser = new IdentityUser(
+                    if (adminUser != null)
-                    GuidGenerator.Create(),
+                    {
-                    adminUserName,
+                        return result;
-                    adminEmail,
+                    }
-                    tenantId
-                )
-                {
-                    Name = adminUserName
-                };
-
-                (await UserManager.CreateAsync(adminUser, adminPassword)).CheckErrors();
-                result.CreatedAdminUser = true;
 
-                //"admin" role
+                    adminUser = new IdentityUser(
-                const string adminRoleName = "admin";
-                var adminRole = await RoleRepository.FindByNormalizedNameAsync(LookupNormalizer.NormalizeName(adminRoleName));
-                if (adminRole == null)
-                {
-                    adminRole = new IdentityRole(
                         GuidGenerator.Create(),
-                        adminRoleName,
+                        adminUserName,
+                        adminEmail,
                         tenantId
                     )
                     {
-                        IsStatic = true,
+                        Name = adminUserName
-                        IsPublic = true
                     };
 
-                    (await RoleManager.CreateAsync(adminRole)).CheckErrors();
+                    (await UserManager.CreateAsync(adminUser, adminPassword)).CheckErrors();
-                    result.CreatedAdminRole = true;
+                    result.CreatedAdminUser = true;
-                }
+
+                    //"admin" role
+                    const string adminRoleName = "admin";
+                    var adminRole =
+                        await RoleRepository.FindByNormalizedNameAsync(LookupNormalizer.NormalizeName(adminRoleName));
+                    if (adminRole == null)
+                    {
+                        adminRole = new IdentityRole(
+                            GuidGenerator.Create(),
+                            adminRoleName,
+                            tenantId
+                        )
+                        {
+                            IsStatic = true,
+                            IsPublic = true
+                        };
 
-                (await UserManager.AddToRoleAsync(adminUser, adminRoleName)).CheckErrors();
+                        (await RoleManager.CreateAsync(adminRole)).CheckErrors();
+                        result.CreatedAdminRole = true;
+                    }
 
-                return result;
+                    (await UserManager.AddToRoleAsync(adminUser, adminRoleName)).CheckErrors();
+
+                    return result;
+                }
             }
         }
     }

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/PasswordOptionsExtensions.cs

@@ -0,0 +1,35 @@
+using System;
+using Microsoft.AspNetCore.Identity;
+
+namespace Volo.Abp.Identity
+{
+    public static class PasswordOptionsExtensions
+    {
+        public static IDisposable ClearRequirements(this PasswordOptions options)
+        {
+            var oldRequireDigit = options.RequireDigit;
+            var oldRequiredLength = options.RequiredLength;
+            var oldRequireLowercase = options.RequireLowercase;
+            var oldRequireUppercase = options.RequireUppercase;
+            var oldRequiredUniqueChars = options.RequiredUniqueChars;
+            var oldRequireNonAlphanumeric = options.RequireNonAlphanumeric;
+
+            options.RequireDigit = false;
+            options.RequiredLength = 1;
+            options.RequireLowercase = false;
+            options.RequireUppercase = false;
+            options.RequiredUniqueChars = 1;
+            options.RequireNonAlphanumeric = false;
+
+            return new DisposeAction(() =>
+            {
+                options.RequireDigit = oldRequireDigit;
+                options.RequiredLength = oldRequiredLength;
+                options.RequireLowercase = oldRequireLowercase;
+                options.RequireUppercase = oldRequireUppercase;
+                options.RequiredUniqueChars = oldRequiredUniqueChars;
+                options.RequireNonAlphanumeric = oldRequireNonAlphanumeric;
+            });
+        }
+    }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs

@@ -1,4 +1,7 @@
-using Volo.Abp.Authorization;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Authorization;
 using Volo.Abp.Caching;
 using Volo.Abp.Domain;
 using Volo.Abp.Json;
@@ -13,6 +16,6 @@ namespace Volo.Abp.PermissionManagement
     [DependsOn(typeof(AbpJsonModule))]
     public class AbpPermissionManagementDomainModule : AbpModule
     {
-        
+
     }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeedContributor.cs

@@ -10,7 +10,6 @@ namespace Volo.Abp.PermissionManagement
     public class PermissionDataSeedContributor : IDataSeedContributor, ITransientDependency
     {
         protected ICurrentTenant CurrentTenant { get; }
-
         protected IPermissionDefinitionManager PermissionDefinitionManager { get; }
         protected IPermissionDataSeeder PermissionDataSeeder { get; }
 

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs

@@ -5,7 +5,6 @@ namespace Volo.Abp.PermissionManagement
 {
     public class PermissionManagementOptions
     {
-        //TODO: rename to Providers
         public ITypeList<IPermissionManagementProvider> ManagementProviders { get; }
 
         public Dictionary<string, string> ProviderPolicies { get; }

nupkg/common.ps1

@@ -91,6 +91,7 @@ $projects = (
     "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql",
     "framework/src/Volo.Abp.EntityFrameworkCore.Sqlite",
     "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer",
+    "framework/src/Volo.Abp.EventBus.Abstractions",
     "framework/src/Volo.Abp.EventBus",
     "framework/src/Volo.Abp.EventBus.RabbitMQ",
     "framework/src/Volo.Abp.EventBus.Kafka",