Merge pull request #2047 from vincywindy/master

Add virual appservice method

modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs

@@ -15,7 +15,7 @@ namespace Volo.Abp.Account
             UserManager = userManager;
         }
 
-        public async Task<IdentityUserDto> RegisterAsync(RegisterDto input)
+        public virtual async Task<IdentityUserDto> RegisterAsync(RegisterDto input)
         {
             var user = new IdentityUser(GuidGenerator.Create(), input.UserName, input.EmailAddress, CurrentTenant.Id);
 

modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs

@@ -32,7 +32,7 @@ namespace Volo.Abp.FeatureManagement
             Options = options.Value;
         }
 
-        public async Task<FeatureListDto> GetAsync([NotNull] string providerName, [NotNull] string providerKey)
+        public virtual async Task<FeatureListDto> GetAsync([NotNull] string providerName, [NotNull] string providerKey)
         {
             await CheckProviderPolicy(providerName);
 
@@ -57,7 +57,7 @@ namespace Volo.Abp.FeatureManagement
             return new FeatureListDto { Features = features };
         }
 
-        public async Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdateFeaturesDto input)
+        public virtual async Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdateFeaturesDto input)
         {
             await CheckProviderPolicy(providerName);
 

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs

@@ -21,14 +21,14 @@ namespace Volo.Abp.Identity
             _roleRepository = roleRepository;
         }
 
-        public async Task<IdentityRoleDto> GetAsync(Guid id)
+        public virtual async Task<IdentityRoleDto> GetAsync(Guid id)
         {
             return ObjectMapper.Map<IdentityRole, IdentityRoleDto>(
                 await _roleManager.GetByIdAsync(id)
             );
         }
 
-        public async Task<ListResultDto<IdentityRoleDto>> GetListAsync()
+        public virtual async Task<ListResultDto<IdentityRoleDto>> GetListAsync()
         {
             var list = await _roleRepository.GetListAsync();
 
@@ -36,7 +36,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.Create)]
-        public async Task<IdentityRoleDto> CreateAsync(IdentityRoleCreateDto input)
+        public virtual async Task<IdentityRoleDto> CreateAsync(IdentityRoleCreateDto input)
         {
             var role = new IdentityRole(GuidGenerator.Create(), input.Name, CurrentTenant.Id);
 
@@ -50,7 +50,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.Update)]
-        public async Task<IdentityRoleDto> UpdateAsync(Guid id, IdentityRoleUpdateDto input)
+        public virtual async Task<IdentityRoleDto> UpdateAsync(Guid id, IdentityRoleUpdateDto input)
         {
             var role = await _roleManager.GetByIdAsync(id);
             role.ConcurrencyStamp = input.ConcurrencyStamp;
@@ -67,7 +67,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.Delete)]
-        public async Task DeleteAsync(Guid id)
+        public virtual async Task DeleteAsync(Guid id)
         {
             var role = await _roleManager.FindByIdAsync(id.ToString());
             if (role == null)

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs

@@ -22,7 +22,7 @@ namespace Volo.Abp.Identity
 
         //TODO: [Authorize(IdentityPermissions.Users.Default)] should go the IdentityUserAppService class.
         [Authorize(IdentityPermissions.Users.Default)]
-        public async Task<IdentityUserDto> GetAsync(Guid id)
+        public virtual async Task<IdentityUserDto> GetAsync(Guid id)
         {
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(
                 await _userManager.GetByIdAsync(id)
@@ -30,7 +30,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Default)]
-        public async Task<PagedResultDto<IdentityUserDto>> GetListAsync(GetIdentityUsersInput input)
+        public virtual async Task<PagedResultDto<IdentityUserDto>> GetListAsync(GetIdentityUsersInput input)
         {
             var count = await _userRepository.GetCountAsync(input.Filter);
             var list = await _userRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
@@ -42,7 +42,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Default)]
-        public async Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id)
+        public virtual async Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id)
         {
             var roles = await _userRepository.GetRolesAsync(id);
             return new ListResultDto<IdentityRoleDto>(
@@ -51,7 +51,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Create)]
-        public async Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
+        public virtual async Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
         {
             var user = new IdentityUser(GuidGenerator.Create(), input.UserName, input.Email, CurrentTenant.Id);
 
@@ -64,7 +64,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Update)]
-        public async Task<IdentityUserDto> UpdateAsync(Guid id, IdentityUserUpdateDto input)
+        public virtual async Task<IdentityUserDto> UpdateAsync(Guid id, IdentityUserUpdateDto input)
         {
             var user = await _userManager.GetByIdAsync(id);
             user.ConcurrencyStamp = input.ConcurrencyStamp;
@@ -85,7 +85,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Delete)]
-        public async Task DeleteAsync(Guid id)
+        public virtual async Task DeleteAsync(Guid id)
         {
             if (CurrentUser.Id == id)
             {
@@ -102,7 +102,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Update)]
-        public async Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input)
+        public virtual async Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input)
         {
             var user = await _userManager.GetByIdAsync(id);
             (await _userManager.SetRolesAsync(user, input.RoleNames)).CheckErrors();
@@ -110,7 +110,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Default)]
-        public async Task<IdentityUserDto> FindByUsernameAsync(string username)
+        public virtual async Task<IdentityUserDto> FindByUsernameAsync(string username)
         {
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(
                 await _userManager.FindByNameAsync(username)
@@ -118,7 +118,7 @@ namespace Volo.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.Default)]
-        public async Task<IdentityUserDto> FindByEmailAsync(string email)
+        public virtual async Task<IdentityUserDto> FindByEmailAsync(string email)
         {
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(
                 await _userManager.FindByEmailAsync(email)

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserLookupAppService.cs

@@ -16,7 +16,7 @@ namespace Volo.Abp.Identity
             UserLookupServiceProvider = userLookupServiceProvider;
         }
 
-        public virtual async Task<UserData> FindByIdAsync(Guid id)
+        public virtual virtual async Task<UserData> FindByIdAsync(Guid id)
         {
             var userData = await UserLookupServiceProvider.FindByIdAsync(id);
             if (userData == null)
@@ -27,7 +27,7 @@ namespace Volo.Abp.Identity
             return new UserData(userData);
         }
 
-        public virtual async Task<UserData> FindByUserNameAsync(string userName)
+        public virtual virtual async Task<UserData> FindByUserNameAsync(string userName)
         {
             var userData = await UserLookupServiceProvider.FindByUserNameAsync(userName);
             if (userData == null)

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs

@@ -17,14 +17,14 @@ namespace Volo.Abp.Identity
             _userManager = userManager;
         }
 
-        public async Task<ProfileDto> GetAsync()
+        public virtual async Task<ProfileDto> GetAsync()
         {
             return ObjectMapper.Map<IdentityUser, ProfileDto>(
                 await _userManager.GetByIdAsync(CurrentUser.GetId())
             );
         }
 
-        public async Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
+        public virtual async Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
         {
             var user = await _userManager.GetByIdAsync(CurrentUser.GetId());
 
@@ -50,7 +50,7 @@ namespace Volo.Abp.Identity
             return ObjectMapper.Map<IdentityUser, ProfileDto>(user);
         }
 
-        public async Task ChangePasswordAsync(ChangePasswordInput input)
+        public virtual async Task ChangePasswordAsync(ChangePasswordInput input)
         {
             var currentUser = await _userManager.GetByIdAsync(CurrentUser.GetId());
             (await _userManager.ChangePasswordAsync(currentUser, input.CurrentPassword, input.NewPassword)).CheckErrors();

modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs

@@ -32,7 +32,7 @@ namespace Volo.Abp.PermissionManagement
             _stringLocalizerFactory = stringLocalizerFactory;
         }
 
-        public async Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
+        public virtual async Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
         {
             await CheckProviderPolicy(providerName);
 
@@ -99,7 +99,7 @@ namespace Volo.Abp.PermissionManagement
             return result;
         }
 
-        public async Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input)
+        public virtual async Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input)
         {
             await CheckProviderPolicy(providerName);
 

modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs

@@ -24,14 +24,14 @@ namespace Volo.Abp.TenantManagement
             TenantManager = tenantManager;
         }
 
-        public async Task<TenantDto> GetAsync(Guid id)
+        public virtual async Task<TenantDto> GetAsync(Guid id)
         {
             return ObjectMapper.Map<Tenant, TenantDto>(
                 await TenantRepository.GetAsync(id)
             );
         }
 
-        public async Task<PagedResultDto<TenantDto>> GetListAsync(GetTenantsInput input)
+        public virtual async Task<PagedResultDto<TenantDto>> GetListAsync(GetTenantsInput input)
         {
             var count = await TenantRepository.GetCountAsync(input.Filter);
             var list = await TenantRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
@@ -43,7 +43,7 @@ namespace Volo.Abp.TenantManagement
         }
 
         [Authorize(TenantManagementPermissions.Tenants.Create)]
-        public async Task<TenantDto> CreateAsync(TenantCreateDto input)
+        public virtual async Task<TenantDto> CreateAsync(TenantCreateDto input)
         {
             var tenant = await TenantManager.CreateAsync(input.Name);
             await TenantRepository.InsertAsync(tenant);
@@ -60,7 +60,7 @@ namespace Volo.Abp.TenantManagement
         }
 
         [Authorize(TenantManagementPermissions.Tenants.Update)]
-        public async Task<TenantDto> UpdateAsync(Guid id, TenantUpdateDto input)
+        public virtual async Task<TenantDto> UpdateAsync(Guid id, TenantUpdateDto input)
         {
             var tenant = await TenantRepository.GetAsync(id);
             await TenantManager.ChangeNameAsync(tenant, input.Name);
@@ -69,7 +69,7 @@ namespace Volo.Abp.TenantManagement
         }
 
         [Authorize(TenantManagementPermissions.Tenants.Delete)]
-        public async Task DeleteAsync(Guid id)
+        public virtual async Task DeleteAsync(Guid id)
         {
             var tenant = await TenantRepository.FindAsync(id);
             if (tenant == null)
@@ -81,14 +81,14 @@ namespace Volo.Abp.TenantManagement
         }
 
         [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
-        public async Task<string> GetDefaultConnectionStringAsync(Guid id)
+        public virtual async Task<string> GetDefaultConnectionStringAsync(Guid id)
         {
             var tenant = await TenantRepository.GetAsync(id);
             return tenant?.FindDefaultConnectionString();
         }
 
         [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
-        public async Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString)
+        public virtual async Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString)
         {
             var tenant = await TenantRepository.GetAsync(id);
             tenant.SetDefaultConnectionString(defaultConnectionString);
@@ -96,7 +96,7 @@ namespace Volo.Abp.TenantManagement
         }
 
         [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
-        public async Task DeleteDefaultConnectionStringAsync(Guid id)
+        public virtual async Task DeleteDefaultConnectionStringAsync(Guid id)
         {
             var tenant = await TenantRepository.GetAsync(id);
             tenant.RemoveDefaultConnectionString();