Merge pull request #281 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListDirectoryObjects.ps1

@@ -0,0 +1,44 @@
+function Invoke-ListDirectoryObjects {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        CIPP.Core.Read
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $APIName = $Request.Params.CIPPEndpoint
+    $Headers = $Request.Headers
+    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
+    $TenantFilter = $Request.Body.tenantFilter
+    $AsApp = $Request.Body.asApp
+    $Ids = $Request.Body.ids
+
+    $BaseUri = 'https://graph.microsoft.com/beta/directoryObjects/getByIds'
+    if ($Request.Body.'$select') {
+        $Uri = '{0}?$select={1}' -f $BaseUri, $Request.Body.'$select'
+    } else {
+        $Uri = $BaseUri
+    }
+
+    $Body = @{
+        ids = $Ids
+    } | ConvertTo-Json -Depth 10
+
+    try {
+        $Results = New-GraphPOSTRequest -tenantid $TenantFilter -uri $Uri -body $Body -AsApp $AsApp
+        $StatusCode = [System.Net.HttpStatusCode]::OK
+    } catch {
+        $StatusCode = [System.Net.HttpStatusCode]::BadRequest
+        $Results = $_.Exception.Message
+        Write-Warning "Error retrieving directory objects: $Results"
+        Write-Information $_.InvocationInfo.PositionMessage
+    }
+
+    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            StatusCode = $StatusCode
+            Body       = $Results
+        })
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ListConditionalAccessPolicies.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ListConditionalAccessPolicies {
+function Invoke-ListConditionalAccessPolicies {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -164,6 +164,7 @@ Function Invoke-ListConditionalAccessPolicies {
         $AllRoleDefinitions = ($GraphRequest | Where-Object { $_.id -eq 'roleDefinitions' }).body.value
         $GroupListOutput = ($GraphRequest | Where-Object { $_.id -eq 'groups' }).body.value
         $UserListOutput = ($GraphRequest | Where-Object { $_.id -eq 'users' }).body.value
+        $AllServicePrincipals = ($GraphRequest | Where-Object { $_.id -eq 'servicePrincipals' }).body.value
 
 
         $GraphRequest = foreach ($cap in $ConditionalAccessPolicyOutput) {
@@ -180,8 +181,8 @@ Function Invoke-ListConditionalAccessPolicies {
                 excludePlatforms                            = ($cap.conditions.platforms.excludePlatforms) -join ','
                 includeLocations                            = (Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.includeLocations) -join ','
                 excludeLocations                            = (Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.excludeLocations) -join ','
-                includeApplications                         = ($cap.conditions.applications.includeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -id $_ }) -join ','
-                excludeApplications                         = ($cap.conditions.applications.excludeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -id $_ }) -join ','
+                includeApplications                         = ($cap.conditions.applications.includeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $_ }) -join ','
+                excludeApplications                         = ($cap.conditions.applications.excludeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $_ }) -join ','
                 includeUserActions                          = ($cap.conditions.applications.includeUserActions | Out-String)
                 includeAuthenticationContextClassReferences = ($cap.conditions.applications.includeAuthenticationContextClassReferences | Out-String)
                 includeUsers                                = ($cap.conditions.users.includeUsers | ForEach-Object { Get-UserNameFromId -Users $UserListOutput -id $_ }) | Out-String

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListDomainHealth.ps1

@@ -39,7 +39,7 @@ function Invoke-ListDomainHealth {
 
     Set-DnsResolver -Resolver $Resolver
 
-    $UserRoles = Get-CIPPAccessPermissions -Request $Request
+    $UserRoles = Get-CIPPAccessRole -Request $Request
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers

version_latest.txt

@@ -1 +1 @@
-8.0.0
+8.0.1