Merge pull request #407 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-AddPolicy.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-AddPolicy {
+function Invoke-AddPolicy {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -14,8 +14,8 @@ Function Invoke-AddPolicy {
     $Headers = $Request.Headers
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
-    $Tenants = ($Request.Body.tenantFilter.value)
-    if ('AllTenants' -in $Tenants) { $Tenants = (Get-Tenants).defaultDomainName }
+    $Tenants = $Request.Body.tenantFilter.value ? $Request.Body.tenantFilter.value : $Request.Body.tenantFilter
+    if ('AllTenants' -in $Tenants) { $Tetnants = (Get-Tenants).defaultDomainName }
     $displayname = $Request.Body.displayName
     $description = $Request.Body.Description
     $AssignTo = if ($Request.Body.AssignTo -ne 'on') { $Request.Body.AssignTo }
@@ -25,7 +25,7 @@ Function Invoke-AddPolicy {
 
     $results = foreach ($Tenant in $tenants) {
         if ($Request.Body.replacemap.$tenant) {
-        ([pscustomobject]$Request.Body.replacemap.$tenant).psobject.properties | ForEach-Object { $RawJson = $RawJson -replace $_.name, $_.value }
+            ([pscustomobject]$Request.Body.replacemap.$tenant).psobject.properties | ForEach-Object { $RawJson = $RawJson -replace $_.name, $_.value }
         }
         try {
             Write-Host 'Calling Adding policy'

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tools/GitHub/Invoke-ExecGitHubAction.ps1

@@ -23,7 +23,7 @@ function Invoke-ExecGitHubAction {
     $SplatParams = $Parameters | Select-Object -ExcludeProperty Action, TenantFilter | ConvertTo-Json | ConvertFrom-Json -AsHashtable
 
     $Table = Get-CIPPTable -TableName Extensionsconfig
-    $Configuration = ((Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json).GitHub
+    $Configuration = ((Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json -ErrorAction SilentlyContinue).GitHub
 
     if (!$Configuration.Enabled) {
         $Response = Invoke-RestMethod -Uri 'https://cippy.azurewebsites.net/api/ExecGitHubAction' -Method POST -Body ($Parameters | ConvertTo-Json -Depth 10) -ContentType 'application/json'