Browse Source

Support extra properties for users module

pull/16566/head
liangshiwei 3 years ago
parent
commit
dce830d8e9
  1. 3
      modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/IUserData.cs
  2. 10
      modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserData.cs
  3. 2
      modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserEto.cs
  4. 3
      modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUserExtensions.cs
  5. 3
      modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUser.cs

3
modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/IUserData.cs

@ -1,9 +1,10 @@
using System;
using JetBrains.Annotations;
using Volo.Abp.Data;
namespace Volo.Abp.Users;
public interface IUserData
public interface IUserData : IHasExtraProperties
{
Guid Id { get; }

10
modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserData.cs

@ -1,9 +1,12 @@
using System;
using System.Collections.Generic;
using JetBrains.Annotations;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
namespace Volo.Abp.Users;
public class UserData : IUserData
public class UserData : ExtensibleObject, IUserData
{
public Guid Id { get; set; }
@ -42,6 +45,7 @@ public class UserData : IUserData
PhoneNumber = userData.PhoneNumber;
PhoneNumberConfirmed = userData.PhoneNumberConfirmed;
TenantId = userData.TenantId;
ExtraProperties = userData.ExtraProperties;
}
public UserData(
@ -54,7 +58,8 @@ public class UserData : IUserData
[CanBeNull] string phoneNumber = null,
bool phoneNumberConfirmed = false,
Guid? tenantId = null,
bool isActive = true)
bool isActive = true,
ExtraPropertyDictionary extraProperties = null)
{
Id = id;
UserName = userName;
@ -66,5 +71,6 @@ public class UserData : IUserData
PhoneNumber = phoneNumber;
PhoneNumberConfirmed = phoneNumberConfirmed;
TenantId = tenantId;
ExtraProperties = extraProperties;
}
}

2
modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserEto.cs

@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy;
namespace Volo.Abp.Users;
[EventName("Volo.Abp.Users.User")]
public class UserEto : IUserData, IHasExtraProperties, IMultiTenant
public class UserEto : IUserData, IMultiTenant
{
public Guid Id { get; set; }

3
modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUserExtensions.cs

@ -14,7 +14,8 @@ public static class AbpUserExtensions
emailConfirmed: user.EmailConfirmed,
phoneNumber: user.PhoneNumber,
phoneNumberConfirmed: user.PhoneNumberConfirmed,
tenantId: user.TenantId
tenantId: user.TenantId,
extraProperties: user.ExtraProperties
);
}
}

3
modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUser.cs

@ -1,11 +1,12 @@
using System;
using JetBrains.Annotations;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
using Volo.Abp.MultiTenancy;
namespace Volo.Abp.Users;
public interface IUser : IAggregateRoot<Guid>, IMultiTenant
public interface IUser : IAggregateRoot<Guid>, IMultiTenant, IHasExtraProperties
{
string UserName { get; }

Loading…
Cancel
Save