Address review feedback for authorization commands

Author: namratab

src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs

@@ -130,28 +130,26 @@ public PSRoleAssignment CreateRoleAssignment(FilterRoleAssignmentsOptions parame
         /// </summary>
         /// <param name="options">The filtering options</param>
         /// <param name="currentSubscription">The current subscription</param>
-        /// <param name="expandPrincipalGroups">If true, assignments to the specified (user) principal's groups are also returned, in addition to direct assignments to the user</param>
-        /// <param name="includeClassicAdmins">If true, the subscription classic administrators are also returned as assignments</param>
         /// <returns>The filtered role assignments</returns>
-        public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions options, string currentSubscription, bool expandPrincipalGroups = false, bool includeClassicAdmins = false)
+        public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions options, string currentSubscription)
         {
             List<PSRoleAssignment> result = new List<PSRoleAssignment>();
             ListAssignmentsFilterParameters parameters = new ListAssignmentsFilterParameters();
 
             if (options.ADObjectFilter.HasFilter)
             {
                 // Filter first by principal
-                if (expandPrincipalGroups)
+                if (options.ExpandPrincipalGroups)
                 {
                     PSADObject adObject = ActiveDirectoryClient.GetADObject(options.ADObjectFilter);
                     if (adObject == null)
                     {
-                        throw new KeyNotFoundException("The provided information does not map to an AD object.");
+                        throw new KeyNotFoundException(ProjectResources.PrincipalNotFound);
                     }
 
                     if (!(adObject is PSADUser))
                     {
-                        throw new InvalidOperationException("ExpandPrincipalGroups is only supported for a User principal");
+                        throw new InvalidOperationException(ProjectResources.ExpandGroupsNotSupported);
                     }
 
                     parameters.AssignedToPrincipalId = adObject.Id;
@@ -188,7 +186,7 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
                 result = result.Where(r => r.RoleDefinitionName.Equals(options.RoleDefinition, StringComparison.OrdinalIgnoreCase)).ToList();
             }
 
-            if (includeClassicAdmins)
+            if (options.IncludeClassicAdministrators)
             {
                 // Get classic administrator access assignments 
                 List<ClassicAdministrator> classicAdministrators = AuthorizationManagementClient.ClassicAdministrators.List().ClassicAdministrators.ToList(); 

src/ResourceManager/Resources/Commands.Resources/Models.Authorization/FilterRoleAssignmentsOptions.cs

@@ -53,5 +53,9 @@ public string Scope
         public ResourceIdentifier ResourceIdentifier { get; set; }
 
         public ADObjectFilterOptions ADObjectFilter { get; set; }
+
+        public bool ExpandPrincipalGroups { get; set; }
+
+        public bool IncludeClassicAdministrators { get; set; }
     }
 }

src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs

@@ -306,4 +306,10 @@
   <data name="DeploymentDoesntExist" xml:space="preserve">
     <value>Deployment '{0}' doesn't exist under resource group '{1}'</value>
   </data>
+  <data name="ExpandGroupsNotSupported" xml:space="preserve">
+    <value>ExpandPrincipalGroups is only supported for a User principal</value>
+  </data>
+  <data name="PrincipalNotFound" xml:space="preserve">
+    <value>Cannot find principal using the specified options</value>
+  </data>
 </root>

src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx

@@ -262,10 +262,12 @@ protected override void ProcessRecord()
                     ResourceName = ResourceName,
                     ResourceType = ResourceType,
                     Subscription = string.IsNullOrEmpty(ResourceGroupName) ? null : DefaultProfile.DefaultContext.Subscription.Id.ToString()
-                }
+                },
+                ExpandPrincipalGroups = ExpandPrincipalGroups.IsPresent,
+                IncludeClassicAdministrators = IncludeClassicAdministrators.IsPresent
             };
 
-            WriteObject(PoliciesClient.FilterRoleAssignments(options, DefaultProfile.DefaultContext.Subscription.Id.ToString(), ExpandPrincipalGroups.IsPresent, IncludeClassicAdministrators.IsPresent), true);
+            WriteObject(PoliciesClient.FilterRoleAssignments(options, DefaultProfile.DefaultContext.Subscription.Id.ToString()), true);
         }
     }
 }