From 433e21ccfbaed8a12a246a2d01fd0e5da622a21d Mon Sep 17 00:00:00 2001 From: maliming <6908465+maliming@users.noreply.github.com> Date: Wed, 9 Sep 2020 14:15:00 +0800 Subject: [PATCH] Refactor. --- .../MultiTenancy/CurrentImpersonatorTenant.cs | 19 ----------- .../Volo/Abp/MultiTenancy/CurrentTenant.cs | 10 ++++-- .../ICurrentImpersonatorTenant.cs | 11 ------- .../Volo/Abp/MultiTenancy/ICurrentTenant.cs | 3 ++ .../Principal/AbpClaimsIdentityExtensions.cs | 32 +++++++++---------- .../Volo/Abp/Security/Claims/AbpClaimTypes.cs | 8 ++--- .../CurrentPrincipalAccessorExtensions.cs | 24 ++++++++++++++ .../Volo/Abp/Users/CurrentImpersonatorUser.cs | 19 ----------- .../Volo/Abp/Users/CurrentUser.cs | 4 ++- .../Abp/Users/ICurrentImpersonatorUser.cs | 11 ------- .../Volo/Abp/Users/ICurrentUser.cs | 5 ++- .../Identity/AbpUserClaimsPrincipalFactory.cs | 31 ++++++++---------- .../CurrentPrincipalAccessorExtensions.cs | 25 +++++++++++++++ .../Volo/Abp/Identity/IdentityLinkUser.cs | 26 +++++++++------ .../EntityFrameworkCore/IIdentityDbContext.cs | 5 ++- .../EntityFrameworkCore/IdentityDbContext.cs | 4 +-- .../MongoDB/AbpIdentityMongoDbContext.cs | 4 +-- .../MongoDB/IAbpIdentityMongoDbContext.cs | 4 +-- 18 files changed, 125 insertions(+), 120 deletions(-) delete mode 100644 framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentImpersonatorTenant.cs delete mode 100644 framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentImpersonatorTenant.cs create mode 100644 framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/CurrentPrincipalAccessorExtensions.cs delete mode 100644 framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentImpersonatorUser.cs delete mode 100644 framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentImpersonatorUser.cs create mode 100644 modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/CurrentPrincipalAccessorExtensions.cs diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentImpersonatorTenant.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentImpersonatorTenant.cs deleted file mode 100644 index c340899807..0000000000 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentImpersonatorTenant.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Security.Principal; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Security.Claims; - -namespace Volo.Abp.MultiTenancy -{ - public class CurrentImpersonatorTenant : ICurrentImpersonatorTenant, ITransientDependency - { - public virtual Guid? Id => _principalAccessor.Principal?.FindImpersonatorTenantId(); - - private readonly ICurrentPrincipalAccessor _principalAccessor; - - public CurrentImpersonatorTenant(ICurrentPrincipalAccessor principalAccessor) - { - _principalAccessor = principalAccessor; - } - } -} diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenant.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenant.cs index 4cd6ae9527..442177ef6c 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenant.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/CurrentTenant.cs @@ -1,5 +1,7 @@ -using System; +using System; +using System.Security.Principal; using Volo.Abp.DependencyInjection; +using Volo.Abp.Security.Claims; namespace Volo.Abp.MultiTenancy { @@ -9,13 +11,17 @@ namespace Volo.Abp.MultiTenancy public virtual Guid? Id => _currentTenantAccessor.Current?.TenantId; + public virtual Guid? ImpersonatorId => _principalAccessor.Principal?.FindTenantImpersonatorId(); + public string Name => _currentTenantAccessor.Current?.Name; private readonly ICurrentTenantAccessor _currentTenantAccessor; + private readonly ICurrentPrincipalAccessor _principalAccessor; - public CurrentTenant(ICurrentTenantAccessor currentTenantAccessor) + public CurrentTenant(ICurrentTenantAccessor currentTenantAccessor, ICurrentPrincipalAccessor principalAccessor) { _currentTenantAccessor = currentTenantAccessor; + _principalAccessor = principalAccessor; } public IDisposable Change(Guid? id, string name = null) diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentImpersonatorTenant.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentImpersonatorTenant.cs deleted file mode 100644 index e3da12455d..0000000000 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentImpersonatorTenant.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using JetBrains.Annotations; - -namespace Volo.Abp.MultiTenancy -{ - public interface ICurrentImpersonatorTenant - { - [CanBeNull] - Guid? Id { get; } - } -} diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenant.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenant.cs index a9c608e74c..340c31ee6a 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenant.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenant.cs @@ -10,6 +10,9 @@ namespace Volo.Abp.MultiTenancy [CanBeNull] Guid? Id { get; } + [CanBeNull] + Guid? ImpersonatorId { get; } + [CanBeNull] string Name { get; } diff --git a/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs b/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs index dd57eeacaf..7f29a52eae 100644 --- a/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs +++ b/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs @@ -39,35 +39,35 @@ namespace System.Security.Principal return Guid.Parse(userIdOrNull.Value); } - public static Guid? FindImpersonatorUserId([NotNull] this ClaimsPrincipal principal) + public static Guid? FindUserImpersonatorId([NotNull] this ClaimsPrincipal principal) { Check.NotNull(principal, nameof(principal)); - var impersonatorUserIdOrNull = principal.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.ImpersonatorUserId); - if (impersonatorUserIdOrNull == null || impersonatorUserIdOrNull.Value.IsNullOrWhiteSpace()) + var userImpersonatorIdOrNull = principal.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.UserImpersonatorId); + if (userImpersonatorIdOrNull == null || userImpersonatorIdOrNull.Value.IsNullOrWhiteSpace()) { return null; } - if (Guid.TryParse(impersonatorUserIdOrNull.Value, out Guid result)) + if (Guid.TryParse(userImpersonatorIdOrNull.Value, out Guid result)) { return result; } return null; } - public static Guid? FindImpersonatorUserId([NotNull] this IIdentity identity) + public static Guid? FindUserImpersonatorId([NotNull] this IIdentity identity) { Check.NotNull(identity, nameof(identity)); var claimsIdentity = identity as ClaimsIdentity; - var impersonatorUserIdOrNull = claimsIdentity?.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.ImpersonatorUserId); - if (impersonatorUserIdOrNull == null || impersonatorUserIdOrNull.Value.IsNullOrWhiteSpace()) + var userImpersonatorIdOrNull = claimsIdentity?.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.UserImpersonatorId); + if (userImpersonatorIdOrNull == null || userImpersonatorIdOrNull.Value.IsNullOrWhiteSpace()) { return null; } - return Guid.Parse(impersonatorUserIdOrNull.Value); + return Guid.Parse(userImpersonatorIdOrNull.Value); } public static Guid? FindTenantId([NotNull] this ClaimsPrincipal principal) @@ -98,32 +98,32 @@ namespace System.Security.Principal return Guid.Parse(tenantIdOrNull.Value); } - public static Guid? FindImpersonatorTenantId([NotNull] this ClaimsPrincipal principal) + public static Guid? FindTenantImpersonatorId([NotNull] this ClaimsPrincipal principal) { Check.NotNull(principal, nameof(principal)); - var impersonatorTenantIdOrNull = principal.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.ImpersonatorTenantId); - if (impersonatorTenantIdOrNull == null || impersonatorTenantIdOrNull.Value.IsNullOrWhiteSpace()) + var tenantImpersonatorIdOrNull = principal.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.TenantImpersonatorId); + if (tenantImpersonatorIdOrNull == null || tenantImpersonatorIdOrNull.Value.IsNullOrWhiteSpace()) { return null; } - return Guid.Parse(impersonatorTenantIdOrNull.Value); + return Guid.Parse(tenantImpersonatorIdOrNull.Value); } - public static Guid? FindImpersonatorTenantId([NotNull] this IIdentity identity) + public static Guid? FindTenantImpersonatorId([NotNull] this IIdentity identity) { Check.NotNull(identity, nameof(identity)); var claimsIdentity = identity as ClaimsIdentity; - var impersonatorTenantIdOrNull = claimsIdentity?.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.ImpersonatorTenantId); - if (impersonatorTenantIdOrNull == null || impersonatorTenantIdOrNull.Value.IsNullOrWhiteSpace()) + var tenantImpersonatorIdOrNull = claimsIdentity?.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.TenantImpersonatorId); + if (tenantImpersonatorIdOrNull == null || tenantImpersonatorIdOrNull.Value.IsNullOrWhiteSpace()) { return null; } - return Guid.Parse(impersonatorTenantIdOrNull.Value); + return Guid.Parse(tenantImpersonatorIdOrNull.Value); } public static string FindClientId([NotNull] this ClaimsPrincipal principal) diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs index b65a1f88a9..cfc5ba2c78 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/AbpClaimTypes.cs @@ -19,9 +19,9 @@ namespace Volo.Abp.Security.Claims public static string UserId { get; set; } = ClaimTypes.NameIdentifier; /// - /// Default: "impersonator_userid". + /// Default: "user_impersonator_id". /// - public static string ImpersonatorUserId { get; set; } = "impersonator_userid"; + public static string UserImpersonatorId { get; set; } = "user_impersonator_id"; /// /// Default: @@ -54,9 +54,9 @@ namespace Volo.Abp.Security.Claims public static string TenantId { get; set; } = "tenantid"; /// - /// Default: "impersonator_tenantid". + /// Default: "tenant_impersonator_id". /// - public static string ImpersonatorTenantId { get; set; } = "impersonator_tenantid"; + public static string TenantImpersonatorId { get; set; } = "tenant_impersonator_id"; /// /// Default: "editionid". diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/CurrentPrincipalAccessorExtensions.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/CurrentPrincipalAccessorExtensions.cs new file mode 100644 index 0000000000..63f83f8a5a --- /dev/null +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Claims/CurrentPrincipalAccessorExtensions.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Security.Claims; + +namespace Volo.Abp.Security.Claims +{ + public static class CurrentPrincipalAccessorExtensions + { + public static IDisposable Change(this ICurrentPrincipalAccessor currentPrincipalAccessor, Claim claim) + { + return currentPrincipalAccessor.Change(new[] {claim}); + } + + public static IDisposable Change(this ICurrentPrincipalAccessor currentPrincipalAccessor, IEnumerable claims) + { + return currentPrincipalAccessor.Change(new ClaimsIdentity(claims)); + } + + public static IDisposable Change(this ICurrentPrincipalAccessor currentPrincipalAccessor, ClaimsIdentity claimsIdentity) + { + return currentPrincipalAccessor.Change(new ClaimsPrincipal(claimsIdentity)); + } + } +} diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentImpersonatorUser.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentImpersonatorUser.cs deleted file mode 100644 index 275a35106a..0000000000 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentImpersonatorUser.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Security.Principal; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Security.Claims; - -namespace Volo.Abp.Users -{ - public class CurrentImpersonatorUser : ICurrentImpersonatorUser, ITransientDependency - { - public virtual Guid? Id => _principalAccessor.Principal?.FindImpersonatorUserId(); - - private readonly ICurrentPrincipalAccessor _principalAccessor; - - public CurrentImpersonatorUser(ICurrentPrincipalAccessor principalAccessor) - { - _principalAccessor = principalAccessor; - } - } -} diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentUser.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentUser.cs index 487274860f..f1d6287e8c 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentUser.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Users/CurrentUser.cs @@ -15,6 +15,8 @@ namespace Volo.Abp.Users public virtual Guid? Id => _principalAccessor.Principal?.FindUserId(); + public virtual Guid? ImpersonatorId => _principalAccessor.Principal?.FindUserImpersonatorId(); + public virtual string UserName => this.FindClaimValue(AbpClaimTypes.UserName); public virtual string PhoneNumber => this.FindClaimValue(AbpClaimTypes.PhoneNumber); @@ -56,4 +58,4 @@ namespace Volo.Abp.Users return FindClaims(AbpClaimTypes.Role).Any(c => c.Value == roleName); } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentImpersonatorUser.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentImpersonatorUser.cs deleted file mode 100644 index 8dcdb69aef..0000000000 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentImpersonatorUser.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using JetBrains.Annotations; - -namespace Volo.Abp.Users -{ - public interface ICurrentImpersonatorUser - { - [CanBeNull] - Guid? Id { get; } - } -} diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentUser.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentUser.cs index 18613406d8..1484330bad 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentUser.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Users/ICurrentUser.cs @@ -11,12 +11,15 @@ namespace Volo.Abp.Users [CanBeNull] Guid? Id { get; } + [CanBeNull] + Guid? ImpersonatorId { get; } + [CanBeNull] string UserName { get; } [CanBeNull] string PhoneNumber { get; } - + bool PhoneNumberVerified { get; } [CanBeNull] diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs index aa6263175a..fa63da5ad7 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs @@ -13,50 +13,45 @@ namespace Volo.Abp.Identity { public class AbpUserClaimsPrincipalFactory : UserClaimsPrincipalFactory, ITransientDependency { - protected ICurrentImpersonatorUser CurrentImpersonatorUser { get; } - protected ICurrentImpersonatorTenant CurrentImpersonatorTenant { get; } + protected ICurrentUser CurrentUser { get; } + protected ICurrentTenant CurrentTenant { get; } public AbpUserClaimsPrincipalFactory( UserManager userManager, RoleManager roleManager, IOptions options, - ICurrentImpersonatorUser currentImpersonatorUser, - ICurrentImpersonatorTenant currentImpersonatorTenant) + ICurrentUser currentUser, + ICurrentTenant currentTenant) : base( userManager, roleManager, options) { - CurrentImpersonatorUser = currentImpersonatorUser; - CurrentImpersonatorTenant = currentImpersonatorTenant; + CurrentUser = currentUser; + CurrentTenant = currentTenant; } [UnitOfWork] public override async Task CreateAsync(IdentityUser user) { var principal = await base.CreateAsync(user); + var identity = principal.Identities.First(); if (user.TenantId.HasValue) { - principal.Identities - .First() - .AddClaim(new Claim(AbpClaimTypes.TenantId, user.TenantId.ToString())); + identity.AddClaim(new Claim(AbpClaimTypes.TenantId, user.TenantId.ToString())); } - if (CurrentImpersonatorUser.Id != user.Id || CurrentImpersonatorTenant.Id != user.TenantId) + if (CurrentUser.ImpersonatorId != user.Id || CurrentTenant.ImpersonatorId != user.TenantId) { - if (CurrentImpersonatorUser.Id.HasValue) + if (CurrentUser.ImpersonatorId.HasValue) { - principal.Identities - .First() - .AddClaim(new Claim(AbpClaimTypes.ImpersonatorUserId, CurrentImpersonatorUser.Id.ToString())); + identity.AddClaim(new Claim(AbpClaimTypes.UserImpersonatorId, CurrentUser.ImpersonatorId.ToString())); } - if (CurrentImpersonatorTenant.Id.HasValue) + if (CurrentTenant.ImpersonatorId.HasValue) { - principal.Identities - .First() - .AddClaim(new Claim(AbpClaimTypes.ImpersonatorTenantId, CurrentImpersonatorTenant.Id.ToString())); + identity.AddClaim(new Claim(AbpClaimTypes.TenantImpersonatorId, CurrentTenant.ImpersonatorId.ToString())); } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/CurrentPrincipalAccessorExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/CurrentPrincipalAccessorExtensions.cs new file mode 100644 index 0000000000..ecff91342b --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/CurrentPrincipalAccessorExtensions.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Security.Claims; +using Volo.Abp.Security.Claims; + +namespace Volo.Abp.Identity +{ + public static class CurrentPrincipalAccessorExtensions + { + public static IDisposable ChangeImpersonatorId(this ICurrentPrincipalAccessor currentPrincipalAccessor, Guid? tenantImpersonatorId, Guid? userImpersonatorId) + { + var impersonatorClaims = new List(); + if (tenantImpersonatorId.HasValue) + { + impersonatorClaims.Add(new Claim(AbpClaimTypes.TenantImpersonatorId, tenantImpersonatorId.ToString())); + } + if (userImpersonatorId.HasValue) + { + impersonatorClaims.Add(new Claim(AbpClaimTypes.UserImpersonatorId, userImpersonatorId.ToString())); + } + + return currentPrincipalAccessor.Change(impersonatorClaims); + } + } +} diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityLinkUser.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityLinkUser.cs index ca8fe157d5..bec5563525 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityLinkUser.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityLinkUser.cs @@ -3,8 +3,24 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.Identity { - public class IdentityLinkUser : AggregateRoot + public class IdentityLinkUser : BasicAggregateRoot { + public virtual Guid SourceUserId { get; protected set; } + + public virtual Guid? SourceTenantId { get; protected set; } + + public virtual Guid TargetUserId { get; protected set; } + + public virtual Guid? TargetTenantId { get; protected set; } + + /// + /// Initializes a new instance of . + /// + protected IdentityLinkUser() + { + + } + public IdentityLinkUser(Guid id, IdentityLinkUserInfo sourceUser, IdentityLinkUserInfo targetUser) : base(id) { @@ -24,13 +40,5 @@ namespace Volo.Abp.Identity TargetUserId = targetUserId; TargetTenantId = targetTenantId; } - - public virtual Guid SourceUserId { get; protected set; } - - public virtual Guid? SourceTenantId { get; protected set; } - - public virtual Guid TargetUserId { get; protected set; } - - public virtual Guid? TargetTenantId { get; protected set; } } } diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs index d0e279b7ff..f76ff7b9c3 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IIdentityDbContext.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.SecurityLog; namespace Volo.Abp.Identity.EntityFrameworkCore { @@ -16,8 +15,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore DbSet OrganizationUnits { get; set; } - DbSet IdentitySecurityLogs { get; set; } + DbSet SecurityLogs { get; set; } - DbSet IdentityLinkUsers { get; set; } + DbSet LinkUsers { get; set; } } } diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs index d6f7d9a9b3..dd9c2ffea5 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs @@ -18,9 +18,9 @@ namespace Volo.Abp.Identity.EntityFrameworkCore public DbSet OrganizationUnits { get; set; } - public DbSet IdentitySecurityLogs { get; set; } + public DbSet SecurityLogs { get; set; } - public DbSet IdentityLinkUsers { get; set; } + public DbSet LinkUsers { get; set; } public IdentityDbContext(DbContextOptions options) : base(options) diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs index 3e62359e6b..7a59b255e3 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbContext.cs @@ -15,9 +15,9 @@ namespace Volo.Abp.Identity.MongoDB public IMongoCollection OrganizationUnits => Collection(); - public IMongoCollection IdentitySecurityLogs => Collection(); + public IMongoCollection SecurityLogs => Collection(); - public IMongoCollection IdentityLinkUsers => Collection(); + public IMongoCollection LinkUsers => Collection(); protected override void CreateModel(IMongoModelBuilder modelBuilder) { diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs index 575451365d..54e3ae7bdc 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IAbpIdentityMongoDbContext.cs @@ -15,8 +15,8 @@ namespace Volo.Abp.Identity.MongoDB IMongoCollection OrganizationUnits { get; } - IMongoCollection IdentitySecurityLogs { get; } + IMongoCollection SecurityLogs { get; } - IMongoCollection IdentityLinkUsers { get; } + IMongoCollection LinkUsers { get; } } }