Merge pull request #3 from KelvinTegelaar/master

[pull] master from KelvinTegelaar:master

.github/workflows/dev_cipppwrro.yml

@@ -0,0 +1,29 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cipppwrro
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  build-and-deploy:
+    runs-on: windows-latest
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v2
+
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cipppwrro'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_9E109464904540339CA94F283ACE1312 }}

ExecCPVPermissions/run.ps1

@@ -9,7 +9,8 @@ Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME  -
 
 # Write to the Azure Functions log stream.
 Write-Host "PowerShell HTTP trigger function processed a request."
-$TenantFilter = (get-tenants | Where-Object -Property customerId -EQ $Request.query.Tenantfilter).defaultDomainName
+$TenantFilter = (get-tenants -IncludeAll -IncludeErrors | Where-Object -Property customerId -EQ $Request.query.Tenantfilter).defaultDomainName
+Write-Host "Our Tenantfilter is $TenantFilter"
 $GraphRequest = try {
     Set-CIPPCPVConsent -Tenantfilter $TenantFilter
     Add-CIPPApplicationPermission -RequiredResourceAccess "CippDefaults" -ApplicationId $ENV:ApplicationID -tenantfilter $TenantFilter

Modules/CIPPCore/Public/Set-CIPPCPVConsent.ps1

@@ -6,7 +6,7 @@ function Set-CIPPCPVConsent {
         $ExecutingUser
     )
     $Results = [System.Collections.ArrayList]@()
-    $Tenant = Get-Tenants | Where-Object -Property defaultDomainName -EQ $Tenantfilter
+    $Tenant = Get-Tenants -IncludeAll -IncludeErrors | Where-Object -Property defaultDomainName -EQ $Tenantfilter
     $TenantName = $Tenant.defaultDomainName
     $TenantFilter = $Tenant.customerId
 

Modules/CippExtensions/Private/Get-HaloToken.ps1

@@ -11,10 +11,11 @@ function Get-HaloToken {
             client_secret = (Get-AzKeyVaultSecret -VaultName $ENV:WEBSITE_DEPLOYMENT_ID -Name 'HaloPSA' -AsPlainText)
             scope         = 'all'
         }
-        if ($Configuration.tenant) { $Tenant = "?tenant=$($Configuration.tenant)"}
+        if (!([string]::IsNullOrEmpty($Configuration.Tenant))) { $Tenant = "?tenant=$($Configuration.tenant)" }
         $token = Invoke-RestMethod -Uri "$($Configuration.AuthURL)/token$Tenant" -Method Post -Body $body -ContentType 'application/x-www-form-urlencoded'
         return $token
-    } else {
+    }
+    else {
         throw 'No Halo configuration'
     }
 }

Scheduler_CIPPNotifications/run.ps1

@@ -49,6 +49,7 @@ try {
                       }
 "@
         New-GraphPostRequest -uri 'https://graph.microsoft.com/v1.0/me/sendMail' -tenantid $env:TenantID -type POST -body ($JSONBody)
+        Write-LogMessage -API 'Alerts' -message "Sent alerts to: $($Config.email)" -tenant $Tenant -sev info
       }
     }
   }
@@ -78,12 +79,13 @@ try {
                       }
 "@
       New-GraphPostRequest -uri 'https://graph.microsoft.com/v1.0/me/sendMail' -tenantid $env:TenantID -type POST -body ($JSONBody)
+      Write-LogMessage -API 'Alerts' -message "Sent alerts to: $($Config.email)" -tenant $Tenant -sev info
     }
   }
 }
 catch {
   Write-Host "Could not send alerts to email: $($_.Exception.message)"
-  Write-LogMessage -API 'Alerts' -message "Could not send alerts to : $($_.Exception.message)" -sev info
+  Write-LogMessage -API 'Alerts' -message "Could not send alerts to: $($_.Exception.message)" -tenant $Tenant -sev error
 }
 
 
@@ -119,7 +121,7 @@ try {
         Invoke-RestMethod -Uri $config.webhook -Method POST -ContentType 'Application/json' -Body $JSONBody
       }
     }
-
+    Write-LogMessage -API 'Alerts' -tenant $Tenant -message "Sent Webhook to $($config.webhook) " -tenant $Tenant -sev info
   }
 
   $UpdateLogs = $CurrentLog | ForEach-Object { 
@@ -132,7 +134,7 @@ try {
 }
 catch {
   Write-Host "Could not send alerts to webhook: $($_.Exception.message)"
-  Write-LogMessage -API 'Alerts' -message "Could not send alerts to : $($_.Exception.message)" -sev info
+  Write-LogMessage -API 'Alerts' -message "Could not send alerts to : $($_.Exception.message)" -tenant $Tenant -sev error
 }
 
 if ($config.sendtoIntegration) {
@@ -153,10 +155,11 @@ if ($config.sendtoIntegration) {
         Add-AzDataTableEntity @Table -Entity $UpdateLogs -Force
       }
     }
+    Write-LogMessage -API 'Alerts' -tenant $Tenant -message "alerts to PSA" -sev info
   }
   catch {
     Write-Host "Could not send alerts to ticketing system: $($_.Exception.message)"
-    Write-LogMessage -API 'Alerts' -tenant $Tenant -message "Could not send alerts to : $($_.Exception.message)" -sev info
+    Write-LogMessage -API 'Alerts' -tenant $Tenant -message "Could not send alerts to ticketing system: $($_.Exception.message)" -sev Error
   }
 }
 

UpdatePermissions/run.ps1

@@ -1,7 +1,7 @@
 # Input bindings are passed in via param block.
 param($Timer)
 
-$Tenants = get-tenants
+$Tenants = get-tenants -IncludeAll
 foreach ($Row in $Tenants) {
     Push-OutputBinding -Name Msg -Value $row
 }

version_latest.txt

@@ -1 +1 @@
-4.4.0
+4.4.2