Merge branch 'KelvinTegelaar:master' into master

.github/workflows/dev_cipppwrro.yml

@@ -26,4 +26,4 @@ jobs:
           app-name: 'cipppwrro'
           slot-name: 'Production'
           package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_7CFCA05390754624B5492AF7ECD3D826 }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_9E109464904540339CA94F283ACE1312 }}

.github/workflows/ninjaone_cipp426ns.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 - cipp426ns
+
+on:
+  push:
+    branches:
+      - NinjaOne
+  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: 'cipp426ns'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_198DAF92160A4302B5AA0C145DE72796 }}

.gitignore

@@ -7,5 +7,4 @@ chocoapps.cache
 Cache_*
 Logs
 ExcludedTenants
-Config
 SendNotifications/config.json

Activity_AddOrUpdateTableRows/run.ps1

@@ -5,7 +5,7 @@ $Table = Get-CippTable -tablename $TableName
 foreach ($param in $TableParams.Entity) {
   try {
     #Sending each item indivually, if it fails, log an error.
-    Add-AzDataTableEntity @Table -Entity $param -Force
+    Add-CIPPAzDataTableEntity @Table -Entity $param -Force
   }
   catch {
     Write-LogMessage -API 'Activity_AddOrUpdateTableRows' -message "Unable to write to '$($TableParams.TableName)' Using RowKey $($param.RowKey) table: $($_.Exception.Message)" -sev error

Activity_GetAllTableRows/run.ps1

@@ -1,6 +1,6 @@
 param($name)
 
 $Table = Get-CippTable -tablename $name
-$Rows = Get-AzDataTableEntity @Table
+$Rows = Get-CIPPAzDataTableEntity @Table
 
 Write-Output $Rows

AddAlertSubscription_Queue/function.json

@@ -0,0 +1,12 @@
+{
+  "scriptFile": "../Modules/CippEntryPoints/CippEntryPoints.psm1",
+  "entryPoint": "Receive-CippQueueTrigger",
+  "bindings": [
+    {
+      "name": "QueueItem",
+      "type": "queueTrigger",
+      "direction": "in",
+      "queueName": "AlertSubscriptions"
+    }
+  ]
+}