Merge pull request #197 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Authentication/Test-CIPPAccess.ps1

@@ -144,6 +144,7 @@ function Test-CIPPAccess {
                 throw "Access to this CIPP API endpoint is not allowed, you do not have the required permission: $APIRole"
             }
             if (!$TenantAllowed -and $Help.Functionality -notmatch 'AnyTenant') {
+                Write-Information "Tenant not allowed: $TenantFilter"
                 throw 'Access to this tenant is not allowed'
             } else {
                 return $true

Modules/CIPPCore/Public/Entrypoints/Invoke-ListExtensionsConfig.ps1

@@ -3,7 +3,7 @@ using namespace System.Net
 Function Invoke-ListExtensionsConfig {
     <#
     .FUNCTIONALITY
-        Entrypoint
+        Entrypoint,AnyTenant
     .ROLE
         CIPP.Extension.Read
     #>

Modules/CIPPCore/Public/Entrypoints/Invoke-ListGraphExplorerPresets.ps1

@@ -3,7 +3,7 @@ using namespace System.Net
 Function Invoke-ListGraphExplorerPresets {
     <#
     .FUNCTIONALITY
-        Entrypoint
+        Entrypoint,AnyTenant
     .ROLE
         CIPP.Core.Read
     #>

Modules/CIPPCore/Public/GraphHelper/New-ExoBulkRequest.ps1

@@ -84,6 +84,7 @@ function New-ExoBulkRequest {
                     $IdToCmdletName[$RequestId] = $cmd.CmdletInput.CmdletName
                 }
                 $BatchBodyJson = ConvertTo-Json -InputObject $BatchBodyObj -Depth 10
+                $BatchBodyJson = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $BatchBodyJson
                 $Results = Invoke-RestMethod $BatchURL -ResponseHeadersVariable responseHeaders -Method POST -Body $BatchBodyJson -Headers $Headers -ContentType 'application/json; charset=utf-8'
                 foreach ($Response in $Results.responses) {
                     $ReturnedData.Add($Response)

Modules/CIPPCore/Public/GraphHelper/New-ExoRequest.ps1

@@ -54,6 +54,7 @@ function New-ExoRequest {
                 Parameters = $Params
             }
         }
+        $ExoBody = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $ExoBody
 
         $Tenant = Get-Tenants -IncludeErrors | Where-Object { $_.defaultDomainName -eq $tenantid -or $_.customerId -eq $tenantid }
         if (-not $Tenant -and $NoAuthCheck -eq $true) {

Modules/CIPPCore/Public/GraphHelper/New-GraphPOSTRequest.ps1

@@ -20,6 +20,7 @@ function New-GraphPOSTRequest ($uri, $tenantid, $body, $type, $scope, $AsApp, $N
             $contentType = 'application/json; charset=utf-8'
         }
         try {
+            $body = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $body
             $ReturnedData = (Invoke-RestMethod -Uri $($uri) -Method $TYPE -Body $body -Headers $headers -ContentType $contentType -SkipHttpErrorCheck:$IgnoreErrors -ResponseHeadersVariable responseHeaders)
         } catch {
             $Message = if ($_.ErrorDetails.Message) {
@@ -37,4 +38,4 @@ function New-GraphPOSTRequest ($uri, $tenantid, $body, $type, $scope, $AsApp, $N
     } else {
         Write-Error 'Not allowed. You cannot manage your own tenant or tenants not under your scope'
     }
-}
+}