Merge of #1238. Thanks @valpvt

pnp · Aug 17, 2023 · 478d4a4 · 478d4a4
2 parents 8c7d8b0 + f58757c
commit 478d4a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/sdk/CHANGELOG.md b/src/sdk/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fixed Graph paging for US Government, Germany and China clouds + removed some hardcoded references to graph.microsoft.com [jansenbe - Bert Jansen]
 - Admin library: Group connected team sites use the Microsoft Graph api for both application and delegated permissions #1220 [danielpastoor - Daniel Pastoor]
 - Added Poland to the `GeoLocation` enum #1232 [jansenbe - Bert Jansen]
+- Fix issue to enumerate private/shared channel sites #1238 [valpvt]
 
 ## [1.10.0]
 

diff --git a/src/sdk/PnP.Core.Admin/Model/SharePoint/Core/Internal/SiteCollectionEnumerator.cs b/src/sdk/PnP.Core.Admin/Model/SharePoint/Core/Internal/SiteCollectionEnumerator.cs
@@ -35,7 +35,7 @@ internal async static Task<List<ISiteCollection>> GetAsync(PnPContext context, V
         }
 
         /// <summary>
-        /// Enumerating site collections by querying a hidden list in SharePoint tenant admin. Only works when using 
+        /// Enumerating site collections by querying a hidden list in SharePoint tenant admin. Only works when using
         /// application permissions with Sites.Read.All or higher or when the user has read access to SharePoint tenant admin,
         /// which is the case for global SharePoint administrators
         /// </summary>
@@ -143,7 +143,7 @@ private async static Task LoadSitesViaTenantAdminHiddenListAsync(PnPContext cont
         }
 
         /// <summary>
-        /// Enumerating site collections by querying a hidden list in SharePoint tenant admin. Only works when using 
+        /// Enumerating site collections by querying a hidden list in SharePoint tenant admin. Only works when using
         /// application permissions with Sites.Read.All or higher or when the user has read access to SharePoint tenant admin,
         /// which is the case for global SharePoint administrators
         /// </summary>
@@ -195,7 +195,7 @@ await LoadSitesViaTenantAdminHiddenListAsync(context, sitesListAllQuery, (IEnume
                                                     <FieldRef Name='SiteOwnerName' />
                                                     <FieldRef Name='SiteOwnerEmail' />
                                                     <FieldRef Name='StorageQuota' />
-                                                    <FieldRef Name='StorageUsed' />                                                    
+                                                    <FieldRef Name='StorageUsed' />
                                                     <FieldRef Name='TemplateName' />
                                                     <FieldRef Name='ChannelType' />
                                                 </ViewFields>
@@ -216,14 +216,14 @@ await LoadSitesViaTenantAdminHiddenListAsync(context, sitesListFilterQuery, (IEn
                 {
                     foreach (var listItem in listItems)
                     {
-                        if (listItem["DeletedBy"] != null)
+                        if (listItem["TimeDeleted"] != null)
                         {
                             continue;
                         }
 
                         Uri url = new Uri(listItem["SiteUrl"].ToString());
                         Guid siteId = Guid.Parse(listItem["SiteId"].ToString());
-                        
+
                         if (channelSites.FirstOrDefault(p => p.Id == siteId) == null)
                         {
                             channelSites.Add(new SiteCollectionWithDetails()
@@ -542,7 +542,7 @@ internal async static Task<List<ISiteCollection>> GetViaGraphSitesApiAsync(PnPCo
                 var result = await (context.Web as Web).RawRequestAsync(sitesEnumerationApiCall, HttpMethod.Get).ConfigureAwait(false);
 
                 #region Json response
-                /*              
+                /*
                 "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#sites",
                 "@odata.nextLink": "https://graph.microsoft.com/v1.0/sites?$skiptoken=UGFnZWQ9VFJVRSZwX0ZpbGVMZWFmUmVmPTE3MjgyXy4wMDAmcF9JRD0xNzI4Mg",
                 "value": [