From 66f483e88c7e6b6721adda2937bce94f47a89a24 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Mon, 6 Feb 2023 14:32:27 +0100
Subject: [PATCH] New backoffice: Obsolete ReadOnlyUserGroup constructor.
 (#13676)

* 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>
---
 .../Models/Membership/ReadOnlyUserGroup.cs    | 30 ++++++++++++++++++-
 .../Models/Membership/UserGroupExtensions.cs  |  2 +-
 .../UserEditorAuthorizationHelperTests.cs     |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs b/src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
index 09865a61bb..3b9e971ce4 100644
--- a/src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
+++ b/src/Umbraco.Core/Models/Membership/ReadOnlyUserGroup.cs
@@ -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)
     {
     }
 
diff --git a/src/Umbraco.Core/Models/Membership/UserGroupExtensions.cs b/src/Umbraco.Core/Models/Membership/UserGroupExtensions.cs
index dbfbb2f935..e072168576 100644
--- a/src/Umbraco.Core/Models/Membership/UserGroupExtensions.cs
+++ b/src/Umbraco.Core/Models/Membership/UserGroupExtensions.cs
@@ -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) =>
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
index 7751dee263..c52a4b1598 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
@@ -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