Implemented check for tenant admin connection type

pnp · Nov 30, 2019 · 35ac0aa · 35ac0aa
1 parent ec514a5
commit 35ac0aa
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Commands/Site/SetSite.cs b/Commands/Site/SetSite.cs
@@ -202,13 +202,16 @@ protected override void ExecuteCmdlet()
             if (IsTenantProperty())
             {
 #if ONPREMISES
-                //Assume that the current connection is to the tenant administration site
-                var tenantAdminUrl = ClientContext.Url;
+                string tenantAdminUrl;
                 if (!string.IsNullOrEmpty(SPOnlineConnection.CurrentConnection.TenantAdminUrl))
                 {
                     tenantAdminUrl = SPOnlineConnection.CurrentConnection.TenantAdminUrl;
                 }
-                else if (string.IsNullOrEmpty(Identity))
+                else if (SPOnlineConnection.CurrentConnection.ConnectionType == Enums.ConnectionType.TenantAdmin)
+                {
+                    tenantAdminUrl = ClientContext.Url;
+                }
+                else
                 {
                     throw new InvalidOperationException(Properties.Resources.NoTenantAdminUrlSpecified);
                 }