Skip to content

Commit aa2c9d7

Browse files
committed
Upgraded to ABP v1.0.
1 parent 3311891 commit aa2c9d7

File tree

24 files changed

+216
-97
lines changed

24 files changed

+216
-97
lines changed

src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/ITenantAppService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace AbpCompanyName.AbpProjectName.MultiTenancy
77
{
88
public interface ITenantAppService : IApplicationService
99
{
10-
ListResultOutput<TenantListDto> GetTenants();
10+
ListResultDto<TenantListDto> GetTenants();
1111

1212
Task CreateTenant(CreateTenantInput input);
1313
}

src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public TenantAppService(
3535
_abpZeroDbMigrator = abpZeroDbMigrator;
3636
}
3737

38-
public ListResultOutput<TenantListDto> GetTenants()
38+
public ListResultDto<TenantListDto> GetTenants()
3939
{
40-
return new ListResultOutput<TenantListDto>(
40+
return new ListResultDto<TenantListDto>(
4141
_tenantManager.Tenants
4242
.OrderBy(t => t.TenancyName)
4343
.ToList()

src/AbpCompanyName.AbpProjectName.Application/Users/IUserAppService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public interface IUserAppService : IApplicationService
1111

1212
Task RemoveFromRole(long userId, string roleName);
1313

14-
Task<ListResultOutput<UserListDto>> GetUsers();
14+
Task<ListResultDto<UserListDto>> GetUsers();
1515

1616
Task CreateUser(CreateUserInput input);
1717
}

src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public async Task RemoveFromRole(long userId, string roleName)
3737
CheckErrors(await UserManager.RemoveFromRoleAsync(userId, roleName));
3838
}
3939

40-
public async Task<ListResultOutput<UserListDto>> GetUsers()
40+
public async Task<ListResultDto<UserListDto>> GetUsers()
4141
{
4242
var users = await _userRepository.GetAllListAsync();
4343

44-
return new ListResultOutput<UserListDto>(
44+
return new ListResultDto<UserListDto>(
4545
users.MapTo<List<UserListDto>>()
4646
);
4747
}

src/AbpCompanyName.AbpProjectName.Application/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"Newtonsoft.Json": "9.0.1",
1212
"Nito.AsyncEx": "3.0.1",
1313
"System.Collections.Immutable": "1.2.0",
14-
"Abp.AutoMapper": "0.12.0",
15-
"Abp.EntityFramework": "0.12.0",
16-
"Abp.Zero": "0.12.0"
14+
"Abp.AutoMapper": "1.0.0",
15+
"Abp.EntityFramework": "1.0.0",
16+
"Abp.Zero": "1.0.0"
1717
},
1818

1919
"frameworks": {
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
using Abp.Authorization;
2+
using Abp.Authorization.Users;
3+
using Abp.Configuration;
4+
using Abp.Configuration.Startup;
5+
using Abp.Dependency;
6+
using Abp.Domain.Repositories;
7+
using Abp.Domain.Uow;
8+
using Abp.Zero.Configuration;
9+
using AbpCompanyName.AbpProjectName.Authorization.Roles;
10+
using AbpCompanyName.AbpProjectName.MultiTenancy;
11+
using AbpCompanyName.AbpProjectName.Users;
12+
13+
namespace AbpCompanyName.AbpProjectName.Authorization
14+
{
15+
public class LogInManager : AbpLogInManager<Tenant, Role, User>
16+
{
17+
public LogInManager(
18+
UserManager userManager,
19+
IMultiTenancyConfig multiTenancyConfig,
20+
IRepository<Tenant> tenantRepository,
21+
IUnitOfWorkManager unitOfWorkManager,
22+
ISettingManager settingManager,
23+
IRepository<UserLoginAttempt, long> userLoginAttemptRepository,
24+
IUserManagementConfig userManagementConfig, IIocResolver iocResolver,
25+
RoleManager roleManager)
26+
: base(
27+
userManager,
28+
multiTenancyConfig,
29+
tenantRepository,
30+
unitOfWorkManager,
31+
settingManager,
32+
userLoginAttemptRepository,
33+
userManagementConfig,
34+
iocResolver,
35+
roleManager)
36+
{
37+
}
38+
}
39+
}

src/AbpCompanyName.AbpProjectName.Core/Features/FeatureValueStore.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
using Abp.Domain.Uow;
44
using Abp.MultiTenancy;
55
using Abp.Runtime.Caching;
6-
using AbpCompanyName.AbpProjectName.Authorization.Roles;
76
using AbpCompanyName.AbpProjectName.MultiTenancy;
87
using AbpCompanyName.AbpProjectName.Users;
98

109
namespace AbpCompanyName.AbpProjectName.Features
1110
{
12-
public class FeatureValueStore : AbpFeatureValueStore<Tenant, Role, User>
11+
public class FeatureValueStore : AbpFeatureValueStore<Tenant, User>
1312
{
1413
public FeatureValueStore(
1514
ICacheManager cacheManager,

src/AbpCompanyName.AbpProjectName.Core/MultiTenancy/TenantManager.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
using Abp.Application.Features;
22
using Abp.Domain.Repositories;
33
using Abp.MultiTenancy;
4-
using AbpCompanyName.AbpProjectName.Authorization.Roles;
54
using AbpCompanyName.AbpProjectName.Editions;
65
using AbpCompanyName.AbpProjectName.Users;
76

87
namespace AbpCompanyName.AbpProjectName.MultiTenancy
98
{
10-
public class TenantManager : AbpTenantManager<Tenant, Role, User>
9+
public class TenantManager : AbpTenantManager<Tenant, User>
1110
{
1211
public TenantManager(
1312
IRepository<Tenant> tenantRepository,

src/AbpCompanyName.AbpProjectName.Core/Users/UserManager.cs

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,44 @@
11
using Abp.Authorization;
22
using Abp.Authorization.Users;
33
using Abp.Configuration;
4-
using Abp.Configuration.Startup;
5-
using Abp.Dependency;
64
using Abp.Domain.Repositories;
75
using Abp.Domain.Uow;
6+
using Abp.IdentityFramework;
7+
using Abp.Localization;
88
using Abp.Organizations;
99
using Abp.Runtime.Caching;
10-
using Abp.Zero.Configuration;
1110
using AbpCompanyName.AbpProjectName.Authorization.Roles;
12-
using AbpCompanyName.AbpProjectName.MultiTenancy;
1311

1412
namespace AbpCompanyName.AbpProjectName.Users
1513
{
16-
public class UserManager : AbpUserManager<Tenant, Role, User>
14+
public class UserManager : AbpUserManager<Role, User>
1715
{
1816
public UserManager(
19-
UserStore store,
17+
UserStore userStore,
2018
RoleManager roleManager,
21-
IRepository<Tenant> tenantRepository,
22-
IMultiTenancyConfig multiTenancyConfig,
2319
IPermissionManager permissionManager,
2420
IUnitOfWorkManager unitOfWorkManager,
25-
ISettingManager settingManager,
26-
IUserManagementConfig userManagementConfig,
27-
IIocResolver iocResolver,
2821
ICacheManager cacheManager,
2922
IRepository<OrganizationUnit, long> organizationUnitRepository,
3023
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
3124
IOrganizationUnitSettings organizationUnitSettings,
32-
IRepository<UserLoginAttempt, long> userLoginAttemptRepository
33-
)
25+
ILocalizationManager localizationManager,
26+
ISettingManager settingManager,
27+
IdentityEmailMessageService emailService,
28+
IUserTokenProviderAccessor userTokenProviderAccessor)
3429
: base(
35-
store,
36-
roleManager,
37-
tenantRepository,
38-
multiTenancyConfig,
39-
permissionManager,
40-
unitOfWorkManager,
41-
settingManager,
42-
userManagementConfig,
43-
iocResolver,
44-
cacheManager,
45-
organizationUnitRepository,
46-
userOrganizationUnitRepository,
47-
organizationUnitSettings,
48-
userLoginAttemptRepository)
30+
userStore,
31+
roleManager,
32+
permissionManager,
33+
unitOfWorkManager,
34+
cacheManager,
35+
organizationUnitRepository,
36+
userOrganizationUnitRepository,
37+
organizationUnitSettings,
38+
localizationManager,
39+
emailService,
40+
settingManager,
41+
userTokenProviderAccessor)
4942
{
5043
}
5144
}

src/AbpCompanyName.AbpProjectName.Core/Users/UserStore.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ public UserStore(
1313
IRepository<UserRole, long> userRoleRepository,
1414
IRepository<Role> roleRepository,
1515
IRepository<UserPermissionSetting, long> userPermissionSettingRepository,
16-
IUnitOfWorkManager unitOfWorkManager)
16+
IUnitOfWorkManager unitOfWorkManager,
17+
IRepository<UserClaim, long> userClaimRepository)
1718
: base(
18-
userRepository,
19-
userLoginRepository,
20-
userRoleRepository,
21-
roleRepository,
22-
userPermissionSettingRepository,
23-
unitOfWorkManager)
19+
userRepository,
20+
userLoginRepository,
21+
userRoleRepository,
22+
roleRepository,
23+
userPermissionSettingRepository,
24+
unitOfWorkManager,
25+
userClaimRepository)
2426
{
2527
}
2628
}

0 commit comments

Comments
 (0)