Merge pull request #2959 from KoenZomers/MakeUrlOptionalForManagedIde…

…ntity Making URL optional when using a managed identity
pnp · Mar 31, 2023 · 2c0c5ce · 2c0c5ce
2 parents b0c12d5 + cb96fa5
commit 2c0c5ce
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/documentation/Connect-PnPOnline.md b/documentation/Connect-PnPOnline.md
@@ -76,22 +76,22 @@ Connect-PnPOnline -Url <String> -AccessToken <String> [-AzureEnvironment <AzureE
 
 ### System Assigned Managed Identity
 ```
-Connect-PnPOnline -Url <String> -ManagedIdentity [-ReturnConnection]
+Connect-PnPOnline [-Url <String>] -ManagedIdentity [-ReturnConnection]
 ```
 
 ### User Assigned Managed Identity by Client Id
 ```
-Connect-PnPOnline -Url <String> -ManagedIdentity -UserAssignedManagedIdentityClientId <String> [-ReturnConnection]
+Connect-PnPOnline [-Url <String>] -ManagedIdentity -UserAssignedManagedIdentityClientId <String> [-ReturnConnection]
 ```
 
 ### User Assigned Managed Identity by Principal Id
 ```
-Connect-PnPOnline -Url <String> -ManagedIdentity -UserAssignedManagedIdentityObjectId <String> [-ReturnConnection]
+Connect-PnPOnline [-Url <String>] -ManagedIdentity -UserAssignedManagedIdentityObjectId <String> [-ReturnConnection]
 ```
 
 ### User Assigned Managed Identity by Azure Resource Id
 ```
-Connect-PnPOnline -Url <String> -ManagedIdentity -UserAssignedManagedIdentityAzureResourceId <String> [-ReturnConnection]
+Connect-PnPOnline [-Url <String>] -ManagedIdentity -UserAssignedManagedIdentityAzureResourceId <String> [-ReturnConnection]
 ```
 
 ### Environment Variable
@@ -576,7 +576,7 @@ Type: String
 Parameter Sets: Credentials, SharePoint ACS (Legacy) App Only, App-Only with Azure Active Directory, App-Only with Azure Active Directory using a certificate from the Windows Certificate Management Store by thumbprint, SPO Management Shell Credentials, PnP Management Shell / DeviceLogin, Web Login for Multi Factor Authentication, Interactive for Multi Factor Authentication, Access Token, Environment Variable
 Aliases:
 
-Required: True
+Required: True (Except when using -ManagedIdentity)
 Position: 0
 Default value: None
 Accept pipeline input: True (ByValue)

diff --git a/pages/articles/azureautomationrunbook.md b/pages/articles/azureautomationrunbook.md
@@ -152,9 +152,9 @@ We're now ready to create a Runbook in which your PnP PowerShell script will run
 1. On the Edit PowerShell Runbook page, enter your PnP PowerShell code in the large white area, i.e.:
 
    ```powershell
-   Connect-PnPOnline tenant.sharepoint.com -ManagedIdentity
+   Connect-PnPOnline -ManagedIdentity
 
-   Get-PnPWeb
+   Get-PnPMicrosoft365Group
    ```
 
    Once done, click on **Save** at the top of the screen and then on **Test pane** to test your Runbook.

diff --git a/pages/articles/azurefunctions.md b/pages/articles/azurefunctions.md
@@ -151,7 +151,7 @@ using namespace System.Net
 
 param($Request, $TriggerMetadata)
 
-Connect-PnPOnline tenant.sharepoint.com -ManagedIdentity
+Connect-PnPOnline -ManagedIdentity
 Get-PnPMicrosoft365Group
 
 Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{

diff --git a/src/Commands/Base/ConnectOnline.cs b/src/Commands/Base/ConnectOnline.cs
@@ -78,10 +78,10 @@ public class ConnectOnline : BasePSCmdlet
         [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_DEVICELOGIN, ValueFromPipeline = true)]
         [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_WEBLOGIN, ValueFromPipeline = true)]
         [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_INTERACTIVE, ValueFromPipeline = true)]
-        [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_SYSTEMASSIGNEDMANAGEDIDENTITY, ValueFromPipeline = true)]
-        [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_USERASSIGNEDMANAGEDIDENTITYBYCLIENTID, ValueFromPipeline = true)]
-        [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_USERASSIGNEDMANAGEDIDENTITYBYPRINCIPALID, ValueFromPipeline = true)]
-        [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_USERASSIGNEDMANAGEDIDENTITYBYAZURERESOURCEID, ValueFromPipeline = true)]
+        [Parameter(Mandatory = false, Position = 0, ParameterSetName = ParameterSet_SYSTEMASSIGNEDMANAGEDIDENTITY, ValueFromPipeline = true)]
+        [Parameter(Mandatory = false, Position = 0, ParameterSetName = ParameterSet_USERASSIGNEDMANAGEDIDENTITYBYCLIENTID, ValueFromPipeline = true)]
+        [Parameter(Mandatory = false, Position = 0, ParameterSetName = ParameterSet_USERASSIGNEDMANAGEDIDENTITYBYPRINCIPALID, ValueFromPipeline = true)]
+        [Parameter(Mandatory = false, Position = 0, ParameterSetName = ParameterSet_USERASSIGNEDMANAGEDIDENTITYBYAZURERESOURCEID, ValueFromPipeline = true)]
         [Parameter(Mandatory = true, Position = 0, ParameterSetName = ParameterSet_ENVIRONMENTVARIABLE, ValueFromPipeline = true)]
         public string Url;
 

diff --git a/src/Commands/Base/PnPConnection.cs b/src/Commands/Base/PnPConnection.cs
@@ -371,8 +371,13 @@ internal static PnPConnection CreateWithCert(Uri url, string clientId, string te
         internal static PnPConnection CreateWithManagedIdentity(Cmdlet cmdlet, string url, string tenantAdminUrl, string userAssignedManagedIdentityObjectId = null, string userAssignedManagedIdentityClientId = null, string userAssignedManagedIdentityAzureResourceId = null)
         {
             var httpClient = PnP.Framework.Http.PnPHttpClient.Instance.GetHttpClient();
-            var resourceUri = new Uri(url);
-            var defaultResource = $"{resourceUri.Scheme}://{resourceUri.Authority}";
+            string defaultResource = "https://graph.microsoft.com";
+            if(url != null)
+            {
+                var resourceUri = new Uri(url);
+                defaultResource = $"{resourceUri.Scheme}://{resourceUri.Authority}";
+            }
+
             cmdlet.WriteVerbose("Acquiring token for resource " + defaultResource);
             var accessToken = TokenHandler.GetManagedIdentityTokenAsync(cmdlet, httpClient, defaultResource, userAssignedManagedIdentityObjectId, userAssignedManagedIdentityClientId, userAssignedManagedIdentityAzureResourceId).GetAwaiter().GetResult();