@@ -224,12 +224,15 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
224
224
225
225
var tempResult = AuthorizationManagementClient . RoleAssignments . List (
226
226
new Rest . Azure . OData . ODataQuery < RoleAssignmentFilter > ( f => f . PrincipalId == principalId ) ) ;
227
- if ( ! string . IsNullOrEmpty ( options . Scope ) ) {
227
+ if ( ! string . IsNullOrEmpty ( options . Scope ) )
228
+ {
228
229
result . AddRange ( tempResult . FilterRoleAssignmentsOnRoleId ( AuthorizationHelper . ConstructFullyQualifiedRoleDefinitionIdFromScopeAndIdAsGuid ( currentSubscription , options . RoleDefinitionId ) )
229
- . ToPSRoleAssignments ( this , ActiveDirectoryClient , options . Scope , options . ExcludeAssignmentsForDeletedPrincipals ) ) ;
230
- } else {
230
+ . ToPSRoleAssignments ( this , ActiveDirectoryClient , options . Scope , options . ExcludeAssignmentsForDeletedPrincipals ) ) ;
231
+ }
232
+ else
233
+ {
231
234
result . AddRange ( tempResult . FilterRoleAssignmentsOnRoleId ( AuthorizationHelper . ConstructFullyQualifiedRoleDefinitionIdFromScopeAndIdAsGuid ( currentSubscription , options . RoleDefinitionId ) )
232
- . ToPSRoleAssignments ( this , ActiveDirectoryClient , AuthorizationHelper . GetSubscriptionScope ( currentSubscription ) , options . ExcludeAssignmentsForDeletedPrincipals ) ) ;
235
+ . ToPSRoleAssignments ( this , ActiveDirectoryClient , AuthorizationHelper . GetSubscriptionScope ( currentSubscription ) , options . ExcludeAssignmentsForDeletedPrincipals ) ) ;
233
236
}
234
237
235
238
while ( ! string . IsNullOrWhiteSpace ( tempResult . NextPageLink ) )
@@ -274,9 +277,8 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
274
277
while ( ! string . IsNullOrWhiteSpace ( tempResult . NextPageLink ) )
275
278
{
276
279
tempResult = AuthorizationManagementClient . RoleAssignments . ListNext ( tempResult . NextPageLink ) ;
277
- result . AddRange ( tempResult
278
- . FilterRoleAssignmentsOnRoleId ( AuthorizationHelper . ConstructFullyQualifiedRoleDefinitionIdFromScopeAndIdAsGuid ( currentSubscription , options . RoleDefinitionId ) )
279
- . ToPSRoleAssignments ( this , ActiveDirectoryClient , AuthorizationHelper . GetSubscriptionScope ( currentSubscription ) , options . ExcludeAssignmentsForDeletedPrincipals ) ) ;
280
+ result . AddRange ( tempResult . FilterRoleAssignmentsOnRoleId ( AuthorizationHelper . ConstructFullyQualifiedRoleDefinitionIdFromScopeAndIdAsGuid ( currentSubscription , options . RoleDefinitionId ) )
281
+ . ToPSRoleAssignments ( this , ActiveDirectoryClient , AuthorizationHelper . GetSubscriptionScope ( currentSubscription ) , options . ExcludeAssignmentsForDeletedPrincipals ) ) ;
280
282
}
281
283
}
282
284
0 commit comments