Browse Source

Add `IsActive`

pull/11417/head
Necati Meral 4 years ago
parent
commit
f710024231
  1. 4
      modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Users/BlogUser.cs
  2. 4
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUser.cs
  3. 2
      modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/IUserData.cs
  4. 7
      modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserData.cs
  5. 2
      modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/UserEto.cs
  6. 1
      modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUserExtensions.cs
  7. 2
      modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUser.cs

4
modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/Users/BlogUser.cs

@ -16,6 +16,8 @@ namespace Volo.Blogging.Users
public virtual string Surname { get; set; }
public virtual bool IsActive { get; set; }
public virtual bool EmailConfirmed { get; protected set; }
public virtual string PhoneNumber { get; protected set; }
@ -62,6 +64,7 @@ namespace Volo.Blogging.Users
UserName == user.UserName &&
Name == user.Name &&
Surname == user.Surname &&
IsActive == user.IsActive &&
Email == user.Email &&
EmailConfirmed == user.EmailConfirmed &&
PhoneNumber == user.PhoneNumber &&
@ -73,6 +76,7 @@ namespace Volo.Blogging.Users
Email = user.Email;
Name = user.Name;
Surname = user.Surname;
IsActive = user.IsActive;
EmailConfirmed = user.EmailConfirmed;
PhoneNumber = user.PhoneNumber;
PhoneNumberConfirmed = user.PhoneNumberConfirmed;

4
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Users/CmsUser.cs

@ -16,6 +16,8 @@ public class CmsUser : AggregateRoot<Guid>, IUser, IUpdateUserData
public virtual string Surname { get; set; }
public virtual bool IsActive { get; set; }
public virtual bool EmailConfirmed { get; protected set; }
public virtual string PhoneNumber { get; protected set; }
@ -62,6 +64,7 @@ public class CmsUser : AggregateRoot<Guid>, IUser, IUpdateUserData
UserName == user.UserName &&
Name == user.Name &&
Surname == user.Surname &&
IsActive == user.IsActive &&
Email == user.Email &&
EmailConfirmed == user.EmailConfirmed &&
PhoneNumber == user.PhoneNumber &&
@ -73,6 +76,7 @@ public class CmsUser : AggregateRoot<Guid>, IUser, IUpdateUserData
Email = user.Email;
Name = user.Name;
Surname = user.Surname;
IsActive = user.IsActive;
EmailConfirmed = user.EmailConfirmed;
PhoneNumber = user.PhoneNumber;
PhoneNumberConfirmed = user.PhoneNumberConfirmed;

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

@ -15,6 +15,8 @@ public interface IUserData
string Surname { get; }
bool IsActive { get; }
[CanBeNull]
string Email { get; }

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

@ -15,6 +15,8 @@ public class UserData : IUserData
public string Surname { get; set; }
public bool IsActive { get; set; }
public string Email { get; set; }
public bool EmailConfirmed { get; set; }
@ -35,6 +37,7 @@ public class UserData : IUserData
Email = userData.Email;
Name = userData.Name;
Surname = userData.Surname;
IsActive = userData.IsActive;
EmailConfirmed = userData.EmailConfirmed;
PhoneNumber = userData.PhoneNumber;
PhoneNumberConfirmed = userData.PhoneNumberConfirmed;
@ -50,13 +53,15 @@ public class UserData : IUserData
bool emailConfirmed = false,
[CanBeNull] string phoneNumber = null,
bool phoneNumberConfirmed = false,
Guid? tenantId = null)
Guid? tenantId = null,
bool isActive = false)
{
Id = id;
UserName = userName;
Email = email;
Name = name;
Surname = surname;
IsActive = isActive;
EmailConfirmed = emailConfirmed;
PhoneNumber = phoneNumber;
PhoneNumberConfirmed = phoneNumberConfirmed;

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

@ -16,6 +16,8 @@ public class UserEto : IUserData
public string Surname { get; set; }
public bool IsActive { get; set; }
public string Email { get; set; }
public bool EmailConfirmed { get; set; }

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

@ -10,6 +10,7 @@ public static class AbpUserExtensions
email: user.Email,
name: user.Name,
surname: user.Surname,
isActive: user.IsActive,
emailConfirmed: user.EmailConfirmed,
phoneNumber: user.PhoneNumber,
phoneNumberConfirmed: user.PhoneNumberConfirmed,

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

@ -18,6 +18,8 @@ public interface IUser : IAggregateRoot<Guid>, IMultiTenant
[CanBeNull]
string Surname { get; }
bool IsActive { get; }
bool EmailConfirmed { get; }
[CanBeNull]

Loading…
Cancel
Save