#1621

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [Unreleased]
+### Added
+
+### Changed
+- Fixed Unregister-PnPHubSite where you could not unregister a hub site if the site was deleted before unregistering
+
+### Deprecated
+
+### Contributors
+
 ## [2.27.1806.0]
 ### Added
 - Added Grant-PnPTenantServicePrincipalPermission to explicitely grant a permission on a resource for the tenant.

Commands/Admin/UnregisterHubSite.cs

@@ -1,12 +1,12 @@
 #if !ONPREMISES
+using System;
+using System.Linq;
 using Microsoft.Online.SharePoint.TenantAdministration;
 using Microsoft.SharePoint.Client;
 using SharePointPnP.PowerShell.CmdletHelpAttributes;
 using SharePointPnP.PowerShell.Commands.Base;
 using System.Management.Automation;
-using OfficeDevPnP.Core.Sites;
 using SharePointPnP.PowerShell.Commands.Base.PipeBinds;
-using System;
 
 namespace SharePointPnP.PowerShell.Commands.Admin
 {
@@ -25,7 +25,12 @@ public class UnregisterHubSite : PnPAdminCmdlet
 
         protected override void ExecuteCmdlet()
         {
-            Tenant.UnregisterHubSite(Site.Url);
+            var hubSitesProperties = Tenant.GetHubSitesProperties();
+            ClientContext.Load(hubSitesProperties);
+            ClientContext.ExecuteQueryRetry();
+            var hubSite = hubSitesProperties.Single(h => h.SiteUrl.Equals(Site.Url, StringComparison.OrdinalIgnoreCase));
+
+            Tenant.UnregisterHubSiteById(hubSite.ID);
             ClientContext.ExecuteQueryRetry();
         }
     }