fixes an issue with table shrinks and state

Author: KelvinTegelaar

Modules/CIPPCore/Public/Add-CIPPAzDataTableEntity.ps1

@@ -23,31 +23,32 @@ function Add-CIPPAzDataTableEntity {
         $Parameters.OperationType = $OperationType
     }
 
-    $MaxRowSize = 500000 - 100 # Maximum size of an entity
-    $MaxSize = 30kb # Maximum size of a property value
+    $MaxRowSize = 500000 - 100
+    $MaxSize = 30kb
 
     foreach ($SingleEnt in @($Entity)) {
         try {
             if ($null -eq $SingleEnt.PartitionKey -or $null -eq $SingleEnt.RowKey) {
                 throw 'PartitionKey or RowKey is null'
             }
+
             Add-AzDataTableEntity @Parameters -Entity $SingleEnt -ErrorAction Stop
+
         } catch [System.Exception] {
-            if ($_.Exception.ErrorCode -eq 'PropertyValueTooLarge' -or $_.Exception.ErrorCode -eq 'EntityTooLarge' -or $_.Exception.ErrorCode -eq 'RequestBodyTooLarge') {
+            if ($_.Exception.ErrorCode -in @('PropertyValueTooLarge', 'EntityTooLarge', 'RequestBodyTooLarge')) {
                 try {
                     Write-Host 'Entity is too large. Splitting entity into multiple parts.'
-                    #Write-Information ($SingleEnt | ConvertTo-Json)
+
                     $largePropertyNames = [System.Collections.Generic.List[string]]::new()
                     $entitySize = 0
 
-                    # Convert $SingleEnt to hashtable if it is a PSObject
                     if ($SingleEnt -is [System.Management.Automation.PSCustomObject]) {
                         $SingleEnt = $SingleEnt | ConvertTo-Json -Depth 100 -Compress | ConvertFrom-Json -AsHashtable
                     }
 
                     foreach ($key in $SingleEnt.Keys) {
                         $propertySize = [System.Text.Encoding]::UTF8.GetByteCount($SingleEnt[$key].ToString())
-                        $entitySize = $entitySize + $propertySize
+                        $entitySize += $propertySize
                         if ($propertySize -gt $MaxSize) {
                             $largePropertyNames.Add($key)
                         }
@@ -63,7 +64,7 @@ function Add-CIPPAzDataTableEntity {
                                 $start = $i * $MaxSize
                                 $splitData.Add($dataString.Substring($start, [Math]::Min($MaxSize, $dataString.Length - $start))) > $null
                             }
-                            $splitDataCount = ($splitData | Measure-Object).Count
+                            $splitDataCount = $splitData.Count
                             $splitPropertyNames = [System.Collections.Generic.List[object]]::new()
                             for ($i = 0; $i -lt $splitDataCount; $i++) {
                                 $splitPropertyNames.Add("${largePropertyName}_Part$i")
@@ -80,11 +81,9 @@ function Add-CIPPAzDataTableEntity {
                                 $SingleEnt[$splitPropertyNames[$i]] = $splitData[$i]
                             }
                         }
-
                         $SingleEnt['SplitOverProps'] = ($splitInfoList | ConvertTo-Json -Compress).ToString()
                     }
 
-                    # Check if the entity is still too large
                     $entitySize = [System.Text.Encoding]::UTF8.GetByteCount($($SingleEnt | ConvertTo-Json -Compress))
                     if ($entitySize -gt $MaxRowSize) {
                         $rows = [System.Collections.Generic.List[object]]::new()
@@ -96,11 +95,7 @@ function Add-CIPPAzDataTableEntity {
                             Write-Information "Entity size is $entitySize. Splitting entity into multiple parts."
                             $newEntity = @{}
                             $newEntity['PartitionKey'] = $originalPartitionKey
-                            if ($entityIndex -eq 0) {
-                                $newEntity['RowKey'] = $originalRowKey
-                            } else {
-                                $newEntity['RowKey'] = "$($originalRowKey)-part$entityIndex"
-                            }
+                            $newEntity['RowKey'] = if ($entityIndex -eq 0) { $originalRowKey } else { "$($originalRowKey)-part$entityIndex" }
                             $newEntity['OriginalEntityId'] = $originalRowKey
                             $newEntity['PartIndex'] = $entityIndex
                             $entityIndex++
@@ -142,12 +137,11 @@ function Add-CIPPAzDataTableEntity {
                             $entitySize = [System.Text.Encoding]::UTF8.GetByteCount($($SingleEnt | ConvertTo-Json -Compress))
                         }
 
-                        if (($SingleEnt | Measure-Object).Count -gt 0) {
+                        if ($SingleEnt.Count -gt 0) {
                             $SingleEnt['RowKey'] = "$($originalRowKey)-part$entityIndex"
                             $SingleEnt['OriginalEntityId'] = $originalRowKey
                             $SingleEnt['PartIndex'] = $entityIndex
                             $SingleEnt['PartitionKey'] = $originalPartitionKey
-
                             $rows.Add($SingleEnt)
                         }
 
@@ -156,14 +150,28 @@ function Add-CIPPAzDataTableEntity {
                             $NewRow = ([PSCustomObject]$row) | Select-Object * -ExcludeProperty Timestamp
                             Add-AzDataTableEntity @Parameters -Entity $NewRow
                         }
+
                     } else {
                         $NewEnt = ([PSCustomObject]$SingleEnt) | Select-Object * -ExcludeProperty Timestamp
                         Add-AzDataTableEntity @Parameters -Entity $NewEnt
+                        if ($NewEnt.PSObject.Properties['OriginalEntityId'] -eq $null -and $NewEnt.PSObject.Properties['PartIndex'] -eq $null) {
+                            $partIndex = 1
+                            while ($true) {
+                                $partRowKey = "$($NewEnt.RowKey)-part$partIndex"
+                                try {
+                                    Remove-AzDataTableEntity -Context $Context -PartitionKey $NewEnt.PartitionKey -RowKey $partRowKey -ErrorAction Stop
+                                    Write-Information "Deleted obsolete part: $partRowKey"
+                                    $partIndex++
+                                } catch {
+                                    break
+                                }
+                            }
+                        }
                     }
 
                 } catch {
                     $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-                    Write-Warning ('AzBobbyTables Error')
+                    Write-Warning 'AzBobbyTables Error'
                     Write-Information ($SingleEnt | ConvertTo-Json)
                     throw "Error processing entity: $ErrorMessage Linenumber: $($_.InvocationInfo.ScriptLineNumber)"
                 }

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWcompanionAppAllowedState.ps1

@@ -36,7 +36,8 @@ function Invoke-CIPPStandardPWcompanionAppAllowedState {
 
 
     # Get state value using null-coalescing operator
-    $state = $Settings.state.value ?? $Settings.state
+    $state = $Settings.state.value ? $Settings.state.value : $settings.state
+    $authState = if ($authenticatorFeaturesState.featureSettings.companionAppAllowedState.state -eq $state) { $true } else { $false }
 
     # Input validation
     if (([string]::IsNullOrWhiteSpace($state) -or $state -eq 'Select a value') -and ($Settings.remediate -eq $true -or $Settings.alert -eq $true)) {