Merge pull request #5403 from NikCharlebois/Fixes-for-Schedule

AADRoleEligibilitySchedule
microsoft · Nov 14, 2024 · 9f31506 · 9f31506
2 parents a6530b9 + 16e2fce
commit 9f31506
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 # UNRELEASED
 
+* AADRoleEligibilityScheduleRequest
+  * Adds support for custom role assignments at app scope.
+
+# 1.24.1113.1
+
 * AADConditionalAccessPolicy
   * Fixed bug where an empty value was passed in the request for the
     insiderRiskLevels parameter, which throws an error.

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)
         {