Start trying to remove graph api sdk dependency

src/lib/PnP.Framework.Test/Graph/UnifiedGroupsUtilityTests.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PnP.Framework.Entities;
+using PnP.Framework.Graph;
+
+namespace PnP.Framework.Test.Graph
+{
+    [TestClass]
+    public class UnifiedGroupsUtilityTests
+    {
+        [TestMethod]
+        public void GetUnifiedGroupMembers_WhenCalled_ShouldReturnData()
+        {
+            // Arrange
+            TestCommon.RegisterPnPHttpClientMock();
+            //var fakeHandler = new MockHttpHandler("");
+
+            // Act
+            var results = UnifiedGroupsUtility.GetUnifiedGroupMembers(
+                new UnifiedGroupEntity() { GroupId = "abc", },
+                "testt"
+            );
+
+            // Assert
+            Assert.IsNotNull(results);
+            Assert.IsTrue(results.Count > 1);
+
+            AssertAllPropertiesHaveBeenAssigned(results);
+
+            var output = JsonSerializer.Serialize(results);
+        }
+
+        private static void AssertAllPropertiesHaveBeenAssigned<T>(List<T> results)
+        {
+            foreach (PropertyInfo pi in typeof(T).GetProperties())
+            {
+                Assert.IsTrue(
+                    results.Any(r =>
+                        pi.GetValue(r, null) != (pi.PropertyType.IsValueType ? Activator.CreateInstance(pi.PropertyType) : null)
+                    )
+                );
+            }
+        }
+    }
+}

src/lib/PnP.Framework.Test/Graph/UnifiedGroupsUtilityTests/GetUnifiedGroupMembers_WhenCalled_ShouldReturnData-http.json

@@ -0,0 +1,7 @@
+[
+    {
+        "Url": "https://graph.microsoft.com/v1.0/groups/abc/members/microsoft.graph.user",
+        "Body": "",
+        "Content": "{\r\n    \"@odata.context\": \"https:\/\/graph.microsoft.com\/v1.0\/$metadata#directoryObjects\",\r\n    \"value\": [\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"87d349ed-44d7-43e1-9a83-5f2406dee5bd\",\r\n            \"businessPhones\": [\r\n                \"+1 425 555 0109\"\r\n            ],\r\n            \"displayName\": \"Adele Vance\",\r\n            \"givenName\": \"Adele\",\r\n            \"jobTitle\": \"Product Marketing Manager\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": \"1234\",\r\n            \"officeLocation\": \"18\/2111\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Vance\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"626cbf8c-5dde-46b0-8385-9e40d64736fe\",\r\n            \"businessPhones\": [\r\n                \"+1 502 555 0102\"\r\n            ],\r\n            \"displayName\": \"Johanna Lorenz\",\r\n            \"givenName\": \"Johanna\",\r\n            \"jobTitle\": \"CVP Engineering\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"23\/2102\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Lorenz\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"40079818-3808-4585-903b-02605f061225\",\r\n            \"businessPhones\": [\r\n                \"+1 502 555 0144\"\r\n            ],\r\n            \"displayName\": \"Patti Fernandez\",\r\n            \"givenName\": \"Patti\",\r\n            \"jobTitle\": \"President\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"15\/1102\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Fernandez\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"074e56ea-0b50-4461-89e5-c67ae14a2c0b\",\r\n            \"businessPhones\": [\r\n                \"+1 913 555 0101\"\r\n            ],\r\n            \"displayName\": \"Lee Gu\",\r\n            \"givenName\": \"Lee\",\r\n            \"jobTitle\": \"CVP Research & Development\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"23\/3101\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Gu\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"16cfe710-1625-4806-9990-91b8f0afee35\",\r\n            \"businessPhones\": [\r\n                \"+1 205 555 0103\"\r\n            ],\r\n            \"displayName\": \"Enrico Cattaneo\",\r\n            \"givenName\": \"Enrico\",\r\n            \"jobTitle\": \"Attorney\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"14\/1102\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Cattaneo\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"089a6bb8-e8cb-492c-aa41-c078aa0b5120\",\r\n            \"businessPhones\": [\r\n                \"+1 206 555 0105\"\r\n            ],\r\n            \"displayName\": \"Nestor Wilke\",\r\n            \"givenName\": \"Nestor\",\r\n            \"jobTitle\": \"CVP Operations\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"36\/2121\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Wilke\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"2804bc07-1e1f-4938-9085-ce6d756a32d2\",\r\n            \"businessPhones\": [\r\n                \"+81 345550115\"\r\n            ],\r\n            \"displayName\": \"Emily Braun\",\r\n            \"givenName\": \"Emily\",\r\n            \"jobTitle\": \"Budget Analyst\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"97\/2302\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Braun\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"b66ecf79-a093-4d51-86e0-efcc4531f37a\",\r\n            \"businessPhones\": [\r\n                \"+1 858 555 0111\"\r\n            ],\r\n            \"displayName\": \"Christie Cline\",\r\n            \"givenName\": \"Christie\",\r\n            \"jobTitle\": \"Sr. VP Sales & Marketing\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"131\/2105\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Cline\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"8b209ac8-08ff-4ef1-896d-3b9fde0bbf04\",\r\n            \"businessPhones\": [\r\n                \"+1 980 555 0101\"\r\n            ],\r\n            \"displayName\": \"Joni Sherman\",\r\n            \"givenName\": \"Joni\",\r\n            \"jobTitle\": \"Paralegal\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"20\/1109\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Sherman\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"4782e723-f4f4-4af3-a76e-25e3bab0d896\",\r\n            \"businessPhones\": [\r\n                \"+1 858 555 0110\"\r\n            ],\r\n            \"displayName\": \"Alex Wilber\",\r\n            \"givenName\": \"Alex\",\r\n            \"jobTitle\": \"Marketing Assistant\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"131\/1104\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Wilber\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"08fa38e4-cbfa-4488-94ed-c834da6539df\",\r\n            \"businessPhones\": [\r\n                \"+1 858 555 0109\"\r\n            ],\r\n            \"displayName\": \"Miriam Graham\",\r\n            \"givenName\": \"Miriam\",\r\n            \"jobTitle\": \"VP Marketing\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"131\/2103\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Graham\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"24fcbca3-c3e2-48bf-9ffc-c7f81b81483d\",\r\n            \"businessPhones\": [\r\n                \"+1 205 555 0108\"\r\n            ],\r\n            \"displayName\": \"Diego Siciliani\",\r\n            \"givenName\": \"Diego\",\r\n            \"jobTitle\": \"CVP Finance\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"14\/1108\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Siciliani\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"2ed03dfd-01d8-4005-a9ef-fa8ee546dc6c\",\r\n            \"businessPhones\": [\r\n                \"+1 918 555 0107\"\r\n            ],\r\n            \"displayName\": \"Lidia Holloway\",\r\n            \"givenName\": \"Lidia\",\r\n            \"jobTitle\": \"Product Manager\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"20\/2107\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Holloway\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"df043ff1-49d5-414e-86a4-0c7f239c36cf\",\r\n            \"businessPhones\": [\r\n                \"+1 309 555 0104\"\r\n            ],\r\n            \"displayName\": \"Grady Archie\",\r\n            \"givenName\": \"Grady\",\r\n            \"jobTitle\": \"CVP Legal\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"19\/2109\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Archie\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"ec63c778-24e1-4240-bea3-d12a167d5232\",\r\n            \"businessPhones\": [\r\n                \"+20 255501070\"\r\n            ],\r\n            \"displayName\": \"Pradeep Gupta\",\r\n            \"givenName\": \"Pradeep\",\r\n            \"jobTitle\": \"Accountant II\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"98\/2202\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Gupta\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"48d31887-5fad-4d73-a9f5-3c356e68a038\",\r\n            \"businessPhones\": [\r\n                \"+1 412 555 0109\"\r\n            ],\r\n            \"displayName\": \"Megan Bowen\",\r\n            \"givenName\": \"Megan\",\r\n            \"jobTitle\": \"Auditor\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"12\/1110\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Bowen\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"e8a02cc7-df4d-4778-956d-784cc9506e5a\",\r\n            \"businessPhones\": [\r\n                \"+1 918 555 0104\"\r\n            ],\r\n            \"displayName\": \"Lynne Robbins\",\r\n            \"givenName\": \"Lynne\",\r\n            \"jobTitle\": \"Product Manager\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"20\/1104\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Robbins\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"c8913c86-ceea-4d39-b1ea-f63a5b675166\",\r\n            \"businessPhones\": [\r\n                \"+1 954 555 0118\"\r\n            ],\r\n            \"displayName\": \"Henrietta Mueller\",\r\n            \"givenName\": \"Henrietta\",\r\n            \"jobTitle\": \"Marketing Assistant\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"18\/1106\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Mueller\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        },\r\n        {\r\n            \"@odata.type\": \"#microsoft.graph.user\",\r\n            \"id\": \"e3d0513b-449e-4198-ba6f-bd97ae7cae85\",\r\n            \"businessPhones\": [\r\n                \"+1 918 555 0101\"\r\n            ],\r\n            \"displayName\": \"Isaiah Langer\",\r\n            \"givenName\": \"Isaiah\",\r\n            \"jobTitle\": \"Web Marketing Manager\",\r\n            \"mail\": \"[email protected]\",\r\n            \"mobilePhone\": null,\r\n            \"officeLocation\": \"20\/1101\",\r\n            \"preferredLanguage\": \"en-US\",\r\n            \"surname\": \"Langer\",\r\n            \"userPrincipalName\": \"[email protected]\"\r\n        }\r\n    ]\r\n}"
+    }
+]

src/lib/PnP.Framework/Entities/GroupEntity.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json.Serialization;
 
 namespace PnP.Framework.Entities
 {
@@ -10,6 +11,7 @@ public class GroupEntity
         /// <summary>
         /// Group id
         /// </summary>
+        [JsonPropertyName("id")]
         public string GroupId { get; set; }
         /// <summary>
         /// Group display name

src/lib/PnP.Framework/Entities/GroupUser.cs

@@ -1,4 +1,9 @@
 using PnP.Framework.Enums;
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 
 namespace PnP.Framework.Entities
 {

src/lib/PnP.Framework/Entities/GroupUserParser.cs

@@ -0,0 +1,41 @@
+using PnP.Framework.Enums;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace PnP.Framework.Entities
+{
+    public class GroupUserParser
+    {
+        private class GroupUserRaw
+        {
+
+            public string Id { get; set; }
+            public string UserPrincipalName { get; set; }
+
+            public string DisplayName { get; set; }
+
+            [JsonPropertyName("@odata.type")]
+            public string Type { get; set; }
+        }
+        public static GroupUser[] ReadListFromJsonNode(JsonNode inputJson)
+        {
+            var rawList = inputJson.Deserialize<GroupUserRaw[]>();
+            return rawList.Select(raw => raw.Type.Contains("microsoft.graph.user")
+                ? new GroupUser
+                {
+                    DisplayName = raw.DisplayName,
+                    UserPrincipalName = raw.UserPrincipalName,
+                    Type = GroupUserType.User,
+                }
+                : new GroupUser
+                {
+                    DisplayName = raw.DisplayName,
+                    UserPrincipalName = raw.Id,
+                    Type = GroupUserType.Group,
+                })
+                .ToArray();
+        }
+    }
+}

src/lib/PnP.Framework/Entities/UnifiedGroupUser.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json.Serialization;
 
 namespace PnP.Framework.Entities
 {
@@ -30,6 +31,7 @@ public class UnifiedGroupUser
         /// <summary>
         /// Group user's e-mail address
         /// </summary>
+        [JsonPropertyName("mail")]
         public string Email { get; set; }
         /// <summary>
         /// Group user's mobile phone number

src/lib/PnP.Framework/Extensions/SiteExtensions.cs

@@ -1,5 +1,6 @@
 using PnP.Framework;
 using PnP.Framework.Graph;
+using PnP.Framework.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -42,7 +43,7 @@ public static void SetSiteClassification(this Site site, string classificationVa
                         {
                             classification = classificationValue
                         },
-                        contentType: "application/json",
+                        contentType: HttpHelper.JsonContentType,
                         accessToken: accessToken);
 
                     // Still update the local value to give prompt feedback to the user