Remove azure ad service principal assigned app role by "BuiltInType" . Closes #3107

documentation/Remove-PnPAzureADServicePrincipalAssignedAppRole.md

@@ -32,7 +32,7 @@ Remove-PnPAzureADServicePrincipalAssignedAppRole -Principal <ServicePrincipalPip
 
 ### By app role name
 ```powershell
-Remove-PnPAzureADServicePrincipalAssignedAppRole -Principal <ServicePrincipalPipeBind> -AppRoleName <String> [-Connection <PnPConnection>]
+Remove-PnPAzureADServicePrincipalAssignedAppRole -Principal <ServicePrincipalPipeBind> -AppRoleName <String> [-BuiltInType <ServicePrincipalBuiltInType>] [-Connection <PnPConnection>]
 ```
 
 ## DESCRIPTION
@@ -76,6 +76,15 @@ Get-PnPAzureADServicePrincipal -AppId fd885e69-86dc-4f3b-851e-ad04920031cf | Rem
 
 Removes all app roles from the application registration with the app Id/Client Id fd885e69-86dc-4f3b-851e-ad04920031cf
 
+### EXAMPLE 6
+
+```powershell
+Remove-PnPAzureADServicePrincipalAssignedAppRole -Principal "My application" -AppRoleName "Sites.FullControl.All" -BuiltInType SharePointOnline
+```
+
+Removes the "Sites.FullControl.All" app role assignment only from the SharePointOnline for the application registration named "My application".
+
+
 ## PARAMETERS
 
 ### -Principal
@@ -120,6 +129,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -BuiltInType
+The built in application type to use for the app role. This can be MicrosoftGraph or SharePointOnline.
+
+```yaml
+Type: ServicePrincipalBuiltInType
+Parameter Sets: By app role name
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+
 ### -Connection
 Optional connection to be used by the cmdlet. Retrieve the value for this parameter by either specifying -ReturnConnection on Connect-PnPOnline or by executing Get-PnPConnection.
 

src/Commands/Apps/RemoveAzureADServicePrincipalAssignedAppRole.cs

@@ -1,6 +1,8 @@
+using Microsoft.SharePoint.Client;
 using PnP.PowerShell.Commands.Attributes;
 using PnP.PowerShell.Commands.Base;
 using PnP.PowerShell.Commands.Base.PipeBinds;
+using PnP.PowerShell.Commands.Enums;
 using PnP.PowerShell.Commands.Model.AzureAD;
 using PnP.PowerShell.Commands.Utilities;
 using System.Collections.Generic;
@@ -27,7 +29,11 @@ public class RemoveAzureADServicePrincipalAssignedAppRole : PnPGraphCmdlet
         public ServicePrincipalAssignedAppRoleBind Identity;
 
         [Parameter(Mandatory = true, ParameterSetName = ParameterSet_BYAPPROLENAME)]
-        public string AppRoleName;
+        [ValidateNotNull]
+        public ServicePrincipalAvailableAppRoleBind AppRoleName;
+
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_BYAPPROLENAME)]
+        public ServicePrincipalBuiltInType BuiltInType;
 
         protected override void ExecuteCmdlet()
         {
@@ -56,7 +62,22 @@ protected override void ExecuteCmdlet()
                 }
                 else
                 {
-                    ServicePrincipalUtility.RemoveServicePrincipalRoleAssignment(GraphRequestHelper, principal, AppRoleName);
+                    if (!ParameterSpecified(nameof(BuiltInType)))
+                    {
+                        ServicePrincipalUtility.RemoveServicePrincipalRoleAssignment(GraphRequestHelper, principal, AppRoleName.ToString());
+                    }
+                    else
+                    {
+                        var resource = ServicePrincipalUtility.GetServicePrincipalByBuiltInType(GraphRequestHelper, BuiltInType);
+                        AzureADServicePrincipalAppRole appRole = AppRoleName.GetAvailableAppRole(Connection, AccessToken, resource);
+
+                        if (appRole == null)
+                        {
+                            throw new PSArgumentException("AppRole not found", nameof(AppRoleName));
+                        }
+                        LogDebug($"Removing app role {appRole.Value}: {appRole.DisplayName}");
+                        ServicePrincipalUtility.RemoveServicePrincipalRoleAssignment(GraphRequestHelper, principal, appRole);
+                    }
                 }
             }
             else