Refactor site creation logic to improve timeout handling and ensure proper site properties update (#5185)

* Refactor site creation logic to improve timeout handling and ensure proper site properties update

* Refactor sharing capability handling to improve timeout management and encapsulate logic in a dedicated method

* Fix `New-PnPTenantSite` cmdlet to improve timeout handling during site creation operations.

Author: gautamdsheth

CHANGELOG.md

@@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fixed issue with `Set-PnPSite -HidePeoplePreviewingFiles $true` and `Set-PnPSite -HidePeopleWhoHaveListsOpen $true` added missing properties [#5003](https://github.com/pnp/powershell/issues/5003)
 - Fixed issue with `New-PnpAzureCertificate -OutPfx pnp.pfx -OutCert pnp.cer` made it language agnostic [#5137](https://github.com/pnp/powershell/issues/5137)
 - Fix `Register-PnPEntraIdApp` Allow to use CER file instead of PFX [#5129](https://github.com/pnp/powershell/issues/5129)
+- Fix `New-PnPTenantSite` cmdlet to properly handle timeout issues for classic sites. [#5185](https://github.com/pnp/powershell/pull/5185)
 
 ### Removed
 - Removed `-RemoveExisting` parameter from `Add-PnPAzureADGroupMember`, `Add-PnPAzureADGroupOwner`, `Add-PnPMicrosoft365GroupMember` and `Add-PnPMicrosoft365GroupOwner` cmdlets. It was never really implemented and without function. [#5153](https://github.com/pnp/powershell/pull/5153)

src/Commands/Admin/NewTenantSite.cs

@@ -1,4 +1,5 @@
-using Microsoft.Online.SharePoint.TenantManagement;
+using Microsoft.Online.SharePoint.TenantAdministration;
+using Microsoft.Online.SharePoint.TenantManagement;
 using Microsoft.SharePoint.Client;
 using PnP.Framework;
 using PnP.PowerShell.Commands.Base;
@@ -59,26 +60,64 @@ protected override void ExecuteCmdlet()
                 Uri uri = BaseUri;
                 Url = $"{uri.ToString().TrimEnd('/')}/{Url.TrimStart('/')}";
             }
-            Func<TenantOperationMessage, bool> timeoutFunction = TimeoutFunction;
 
-            Guid newSiteId = Tenant.CreateSiteCollection(Url, Title, Owner, Template, (int)StorageQuota,
-                (int)StorageQuotaWarningLevel, TimeZone, (int)ResourceQuota, (int)ResourceQuotaWarningLevel, Lcid,
-                RemoveDeletedSite, Wait, Wait == true ? timeoutFunction : null);
-
-            if (newSiteId != Guid.Empty && Wait && SharingCapability.HasValue)
+            if (ParameterSpecified(nameof(RemoveDeletedSite)))
             {
-                var props = Tenant.GetSitePropertiesByUrl(Url, true);
-                Tenant.Context.Load(props);
-                Tenant.Context.ExecuteQueryRetry();
+                Func<TenantOperationMessage, bool> timeoutFunction = TimeoutFunction;
 
-                props.SharingCapability = SharingCapability.Value;
+                Guid newSiteId = Tenant.CreateSiteCollection(Url, Title, Owner, Template, (int)StorageQuota,
+                    (int)StorageQuotaWarningLevel, TimeZone, (int)ResourceQuota, (int)ResourceQuotaWarningLevel, Lcid,
+                    RemoveDeletedSite, Wait, Wait == true ? timeoutFunction : null);
 
-                var op = props.Update();
-                AdminContext.Load(op, i => i.IsComplete, i => i.PollingInterval);
+                if (newSiteId != Guid.Empty && Wait && SharingCapability.HasValue)
+                {
+                    SetSharingCapability(Url, SharingCapability.Value);
+                }
+            }
+            else
+            {
+                SiteCreationProperties siteCreationProperties = new SiteCreationProperties
+                {
+                    Url = Url,
+                    Owner = Owner,
+                    Title = Title,
+                    Template = Template,
+                    StorageMaximumLevel = StorageQuota,
+                    StorageWarningLevel = StorageQuotaWarningLevel,
+                    TimeZoneId = TimeZone,
+                    UserCodeMaximumLevel = ResourceQuota,
+                    UserCodeWarningLevel = ResourceQuotaWarningLevel,
+                    Lcid = Lcid
+                };
+
+                SpoOperation spoOperation = Tenant.CreateSite(siteCreationProperties);
+                AdminContext.Load(spoOperation, s => s.IsComplete, s => s.PollingInterval, s => s.HasTimedout);
                 AdminContext.ExecuteQueryRetry();
+
+                if (Wait)
+                {
+                    PollOperation(spoOperation);
+                }
+
+                if (Wait && SharingCapability.HasValue)
+                {
+                    SetSharingCapability(Url, SharingCapability.Value);
+                }
             }
         }
 
+        private void SetSharingCapability(string url, SharingCapabilities sharingCapability)
+        {
+            var props = Tenant.GetSitePropertiesByUrl(url, true);
+            Tenant.Context.Load(props);
+            Tenant.Context.ExecuteQueryRetry();
+
+            props.SharingCapability = sharingCapability;
+            var op = props.Update();
+            AdminContext.Load(op, i => i.IsComplete, i => i.PollingInterval);
+            AdminContext.ExecuteQueryRetry();
+        }
+
         private bool TimeoutFunction(TenantOperationMessage message)
         {
             if (message == TenantOperationMessage.CreatingSiteCollection)

src/Commands/Base/PnPSharePointCmdlet.cs

@@ -186,8 +186,8 @@ protected void PollOperation(SpoOperation spoOperation)
                 }
 
                 LogDebug("Checking for operation status");
-                ClientContext.Load(spoOperation);
-                ClientContext.ExecuteQueryRetry();
+                spoOperation.Context.Load(spoOperation, s => s.IsComplete, s => s.HasTimedout, s => s.PollingInterval);
+                spoOperation.Context.ExecuteQueryRetry();
             }
             LogWarning("SharePoint Operation Wait Interrupted");
         }