Fix #1911: Add-PnPHubSiteAssociation cmdlet to support (#3568)

* Fix #1911: Add-PnPHubSiteAssociation cmdlet to support
multi-geo scenario

* Update CHANGELOG.md

---------

Co-authored-by: Gautam Sheth <gautam.sheth@staffbase.com>
Co-authored-by: Koen Zomers <koen@zomers.eu>

Author: 3 people

CHANGELOG.md

@@ -111,6 +111,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fixed an issue when trying to download a file using `Get-PnPFile` from a location that's deeply nested into folders and/or has a really long filename [PnP Core #1290](https://github.com/pnp/pnpcore/pull/1290)
 - Fixed retrieving error detail in `Get-UPABulkImportStatus` cmdlet. [#3494](https://github.com/pnp/powershell/pull/3494)
 - Fixed `Rename-PnPTenantSite` cmdlet to allow support for vanity tenant URLs. [#3533](https://github.com/pnp/powershell/pull/3533)
+- Fixed `Add-PnPHubSiteAssociation` cmdlet to allow support for multi-geo scenario. [#3568](https://github.com/pnp/powershell/pull/3568)
 - Fixed `Get-PnPAzureADUser`, `Get-PnPEntraIDUser`, `Add-PnPFlowOwner` and `Remove-PnPFlowOwner` not working when an UPN containing an apostrophe was passed in [#3570](https://github.com/pnp/powershell/pull/3570)
 
 ### Changed

src/Commands/Admin/AddHubSiteAssociation.cs

@@ -3,6 +3,8 @@
 using PnP.PowerShell.Commands.Base;
 using System.Management.Automation;
 using PnP.PowerShell.Commands.Base.PipeBinds;
+using PnP.Core.Model;
+using System;
 
 namespace PnP.PowerShell.Commands.Admin
 {
@@ -17,8 +19,34 @@ public class AddHubSiteAssociation : PnPAdminCmdlet
 
         protected override void ExecuteCmdlet()
         {
-            Tenant.ConnectSiteToHubSite(Site.Url, HubSite.Url);
-            AdminContext.ExecuteQueryRetry();
+            try
+            {
+                Tenant.ConnectSiteToHubSite(Site.Url, HubSite.Url);
+                AdminContext.ExecuteQueryRetry();
+            }
+            catch
+            {
+                try
+                {
+                    using (var primaryHub = PnPContext.Clone(HubSite.Url))
+                    {
+                        var primaryHubSite = primaryHub.Site.Get(p => p.HubSiteId, p => p.IsHubSite);
+
+                        using (var associateHubSite = PnPContext.Clone(Site.Url))
+                        {
+                            var associateSite = associateHubSite.Site.Get(p => p.HubSiteId, p => p.IsHubSite);
+                            if (associateSite.HubSiteId == Guid.Empty)
+                            {
+                                var resultJoin = associateSite.JoinHubSite(primaryHubSite.HubSiteId);
+                            }
+                        }
+                    }
+                }
+                catch
+                {
+                    throw;
+                }
+            }
         }
     }
 }