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

Author: gautamdsheth

src/Commands/Admin/NewTenantSite.cs

@@ -72,15 +72,7 @@ protected override void ExecuteCmdlet()
 
                 if (newSiteId != Guid.Empty && Wait && SharingCapability.HasValue)
                 {
-                    var props = Tenant.GetSitePropertiesByUrl(Url, true);
-                    Tenant.Context.Load(props);
-                    Tenant.Context.ExecuteQueryRetry();
-
-                    props.SharingCapability = SharingCapability.Value;
-
-                    var op = props.Update();
-                    AdminContext.Load(op, i => i.IsComplete, i => i.PollingInterval);
-                    AdminContext.ExecuteQueryRetry();
+                    SetSharingCapability(Url, SharingCapability.Value);
                 }
             }
             else
@@ -111,8 +103,9 @@ protected override void ExecuteCmdlet()
                         {
                             throw new TimeoutException("Wait for site creation operation to complete has timed out.");
                         }
-                        Task.Delay(TimeSpan.FromMilliseconds(spoOperation.PollingInterval)).GetAwaiter().GetResult();                        
+                        Task.Delay(TimeSpan.FromMilliseconds(spoOperation.PollingInterval)).GetAwaiter().GetResult();
                         spoOperation.RefreshLoad();
+                        
                         if (((Cmdlet)this).Stopping)
                         {
                             ((Cmdlet)this).WriteWarning("Cmdlet execution interrupted by user, stopping wait for site creation operation to complete.");
@@ -123,21 +116,25 @@ protected override void ExecuteCmdlet()
                     }
                 }
 
-                if (SharingCapability.HasValue)
+                if (Wait && SharingCapability.HasValue)
                 {
-                    var props = Tenant.GetSitePropertiesByUrl(Url, true);
-                    Tenant.Context.Load(props);
-                    Tenant.Context.ExecuteQueryRetry();
-
-                    props.SharingCapability = SharingCapability.Value;
-
-                    var op = props.Update();
-                    AdminContext.Load(op, i => i.IsComplete, i => i.PollingInterval);
-                    AdminContext.ExecuteQueryRetry();
+                    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)