Add member "kind" - and refactor user "type" to "kind" for consistency (#16979)
* Rename UserType to UserKind * Add MemberKind to tell API members from regular ones * Remove user kind from invite user endpoint --------- Co-authored-by: Mads Rasmussen <madsr@hey.com>
This commit is contained in:
@@ -42,7 +42,7 @@ public interface IUser : IMembershipUser, IRememberBeingDirty
|
||||
/// <summary>
|
||||
/// The type of user.
|
||||
/// </summary>
|
||||
UserType Type { get; set; }
|
||||
UserKind Kind { get; set; }
|
||||
|
||||
void RemoveGroup(string group);
|
||||
|
||||
|
||||
7
src/Umbraco.Core/Models/Membership/MemberKind.cs
Normal file
7
src/Umbraco.Core/Models/Membership/MemberKind.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
namespace Umbraco.Cms.Core.Models.Membership;
|
||||
|
||||
public enum MemberKind
|
||||
{
|
||||
Default = 0,
|
||||
Api
|
||||
}
|
||||
@@ -41,7 +41,7 @@ public class User : EntityBase, IUser, IProfile
|
||||
private HashSet<IReadOnlyUserGroup> _userGroups;
|
||||
|
||||
private string _username;
|
||||
private UserType _type;
|
||||
private UserKind _kind;
|
||||
|
||||
/// <summary>
|
||||
/// Constructor for creating a new/empty user
|
||||
@@ -359,10 +359,10 @@ public class User : EntityBase, IUser, IProfile
|
||||
}
|
||||
|
||||
[DataMember]
|
||||
public UserType Type
|
||||
public UserKind Kind
|
||||
{
|
||||
get => _type;
|
||||
set => SetPropertyValueAndDetectChanges(value, ref _type, nameof(Type));
|
||||
get => _kind;
|
||||
set => SetPropertyValueAndDetectChanges(value, ref _kind, nameof(Kind));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
namespace Umbraco.Cms.Core.Models.Membership;
|
||||
|
||||
public enum UserType
|
||||
public enum UserKind
|
||||
{
|
||||
Default = 0,
|
||||
Api
|
||||
@@ -12,7 +12,7 @@ public class UserCreateModel
|
||||
|
||||
public string Name { get; set; } = string.Empty;
|
||||
|
||||
public UserType Type { get; set; }
|
||||
public UserKind Kind { get; set; }
|
||||
|
||||
public ISet<Guid> UserGroupKeys { get; set; } = new HashSet<Guid>();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user