Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1

@@ -116,7 +116,7 @@ function Push-CIPPDBCacheData {
         if ($ConditionalAccessCapable) {
             $ConditionalAccessCacheFunctions = @(
                 'ConditionalAccessPolicies'
-                'AuthenticationFlowsPolicy'
+                #'AuthenticationFlowsPolicy'
                 'CredentialUserRegistrationDetails'
                 'UserRegistrationDetails'
             )

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

@@ -27,6 +27,7 @@ function New-GraphPOSTRequest {
             $Headers = $Headers
         } else {
             $Headers = Get-GraphToken -tenantid $tenantid -scope $scope -AsApp $asapp -SkipCache $skipTokenCache
+            $body = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $body -EscapeForJson
         }
         if ($AddedHeaders) {
             foreach ($header in $AddedHeaders.GetEnumerator()) {
@@ -41,8 +42,6 @@ function New-GraphPOSTRequest {
         if (!$contentType) {
             $contentType = 'application/json; charset=utf-8'
         }
-        #Only do text replacement if no headers are set.
-        if (!$headers) { $body = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $body -EscapeForJson }
 
         $RetryCount = 0
         $RequestSuccessful = $false