Skip to content

#1234 Fix issue to enumerate private/shared channel sites #1238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jansenbe merged 1 commit into from
Aug 17, 2023
Merged

#1234 Fix issue to enumerate private/shared channel sites #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/version.debug.increment
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
27
12 changes: 6 additions & 6 deletions src/sdk/PnP.Core.Admin/Model/SharePoint/Core/Internal/SiteCollectionEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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()
Expand Down Expand Up @@ -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": [
Expand Down