yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New backoffice: Obsolete ReadOnlyUserGroup constructor. (#13676)

Browse Source 
* Obsolete old ReadOnlyUserGroup constructor

* Update src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

---------

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
This commit is contained in:
Mole
2023-02-06 14:32:27 +01:00
committed by GitHub
parent 6d7b619d94
commit 66f483e88c
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
View File

@@ -4,6 +4,7 @@ public class ReadOnlyUserGroup : IReadOnlyUserGroup, IEquatable<ReadOnlyUserGrou
{
public ReadOnlyUserGroup(
int id,
Guid key, // This is not used for anything now, but will be in v13
string? name,
string? icon,
int? startContentId,
@@ -28,6 +29,33 @@ public class ReadOnlyUserGroup : IReadOnlyUserGroup, IEquatable<ReadOnlyUserGrou
HasAccessToAllLanguages = hasAccessToAllLanguages;
}
[Obsolete("Please use constructor that takes a Guid key. Scheduled for removal in v13")]
public ReadOnlyUserGroup(
int id,
string? name,
string? icon,
int? startContentId,
int? startMediaId,
string? alias,
IEnumerable<int> allowedLanguages,
IEnumerable<string> allowedSections,
IEnumerable<string>? permissions,
bool hasAccessToAllLanguages)
: this(
id,
Guid.NewGuid(),
name,
icon,
startContentId,
startMediaId,
alias,
allowedLanguages,
allowedSections,
permissions,
hasAccessToAllLanguages)
{
}
[Obsolete("please use ctor that takes allowedActions & hasAccessToAllLanguages instead, scheduled for removal in v12")]
public ReadOnlyUserGroup(
int id,
@@ -38,7 +66,7 @@ public class ReadOnlyUserGroup : IReadOnlyUserGroup, IEquatable<ReadOnlyUserGrou
string? alias,
IEnumerable<string> allowedSections,
IEnumerable<string>? permissions)
: this(id, name, icon, startContentId, startMediaId, alias, Enumerable.Empty<int>(), allowedSections, permissions, true)
: this(id, Guid.NewGuid(), name, icon, startContentId, startMediaId, alias, Enumerable.Empty<int>(), allowedSections, permissions, true)
{
}

2
src/Umbraco.Core/Models/Membership/UserGroupExtensions.cs
View File

@@ -14,7 +14,7 @@ public static class UserGroupExtensions
}
// otherwise create one
return new ReadOnlyUserGroup(group.Id, group.Name, group.Icon, group.StartContentId, group.StartMediaId, group.Alias, group.AllowedLanguages, group.AllowedSections, group.Permissions, group.HasAccessToAllLanguages);
return new ReadOnlyUserGroup(group.Id, group.Key, group.Name, group.Icon, group.StartContentId, group.StartMediaId, group.Alias, group.AllowedLanguages, group.AllowedSections, group.Permissions, group.HasAccessToAllLanguages);
}
public static bool IsSystemUserGroup(this IUserGroup group) =>

2
tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
View File

@@ -116,7 +116,7 @@ public class UserEditorAuthorizationHelperTests
{
var currentUser = Mock.Of<IUser>(user => user.Groups == new[]
{
new ReadOnlyUserGroup(1, "CurrentUser", "icon-user", null, null, groupAlias, new int[0], new string[0], new string[0], true),
new ReadOnlyUserGroup(1, Guid.NewGuid(), "CurrentUser", "icon-user", null, null, groupAlias, new int[0], new string[0], new string[0], true),
});
IUser savingUser = null; // This means it is a new created user