AADRoleEligibilityScheduleRequest - Fix Custom Role assignment at app…

… scope.
microsoft · Nov 13, 2024 · 102604e · 102604e
1 parent a6530b9
commit 102604e
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...ources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1 b/...ources/MSFT_AADRoleEligibilityScheduleRequest/MSFT_AADRoleEligibilityScheduleRequest.psm1
@@ -240,7 +240,20 @@
                 return $nullResult
             }
             $RoleDefinitionId = (Get-MgBetaRoleManagementDirectoryRoleDefinition -Filter "DisplayName eq '$RoleDefinition'").Id
-            $schedule = Get-MgBetaRoleManagementDirectoryRoleEligibilitySchedule -Filter "PrincipalId eq '$($request.PrincipalId)' and RoleDefinitionId eq '$RoleDefinitionId'"
+            $schedules = Get-MgBetaRoleManagementDirectoryRoleEligibilitySchedule -Filter "PrincipalId eq '$($request.PrincipalId)'"
+            $schedule = $schedules | Where-Object -FilterScript {$_.RoleDefinitionId -eq $RoleDefinitionId}
+            if ($null -eq $schedule)
+            {
+                foreach ($instance in $schedules)
+                {
+                    $roleDefinitionInfo = Get-MgBetaRoleManagementDirectoryRoleDefinition -UnifiedRoleDefinitionId $instance.RoleDefinitionId
+                    if ($null -ne $roleDefinitionInfo -and $RoleDefinitionInfo.DisplayName -eq $RoleDefinition)
+                    {
+                        $schedule = $instance
+                        break
+                    }
+                }
+            }
         }
         if ($null -eq $schedule -or $null -eq $request)
         {