Merge pull request #8 from lwhitelock/dev

Dev
AntoJUICT · Nov 2, 2023 · b4d67a9 · b4d67a9
2 parents bb9844d + 294710f
commit b4d67a9
Show file tree

Hide file tree

Showing 328 changed files with 112,722 additions and 1,235 deletions.
diff --git a/.github/workflows/dev_cippb2p4g.yml b/.github/workflows/dev_cippb2p4g.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 - cippb2p4g
+
+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@v4
+
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippb2p4g'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_C106B398356B4EFCB81F779ED5806A0D }}
diff --git a/.github/workflows/dev_cipppwrro.yml b/.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 }}
diff --git a/Activity_AddOrUpdateTableRows/run.ps1 b/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

diff --git a/Activity_GetAllTableRows/run.ps1 b/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
diff --git a/AddAPDevice/run.ps1 b/AddAPDevice/run.ps1
@@ -19,8 +19,10 @@ $Result = try {
     if ($groupname -in $CurrentStatus.items.id) { throw "This device batch name already exists. Please try with another name." }
     $body = '{"batchId":"' + $($GroupName) + '","devices":' + $Devices + '}'
     $GraphRequest = (New-GraphPostRequest -uri "https://api.partnercenter.microsoft.com/v1/customers/$TenantFilter/DeviceBatches" -body $body -scope 'https://api.partnercenter.microsoft.com/user_impersonation')
+    Write-Host ($GraphRequest | ConvertTo-Json)
     Start-Sleep 5
     $NewStatus = New-GraphgetRequest -uri "https://api.partnercenter.microsoft.com/v1/customers/$tenantfilter/DeviceBatches" -scope 'https://api.partnercenter.microsoft.com/user_impersonation'
+    Write-Host $($Newstatus | ConvertTo-Json)
     if ($Newstatus.totalcount -eq $CurrentStatus.totalcount) { throw "We could not find the new autopilot device. Please check if your input is correct." }
     Write-Host $CurrentStatus.Items
     Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName -tenant $($Request.body.TenantFilter) -message "Created Autopilot devices group. Group ID is $GroupName" -Sev "Info"

diff --git a/AddAlert/function.json b/AddAlert/function.json
@@ -5,20 +5,18 @@
       "type": "httpTrigger",
       "direction": "in",
       "name": "Request",
-      "methods": [
-        "get",
-        "post"
-      ]
+      "methods": ["get", "post"]
     },
     {
       "type": "http",
       "direction": "out",
       "name": "Response"
     },
     {
-      "name": "starter",
-      "direction": "in",
-      "type": "durableClient"
+      "type": "queue",
+      "direction": "out",
+      "name": "Subscription",
+      "queueName": "AlertSubscriptions"
     }
   ]
-}
+}
diff --git a/AddAlert/run.ps1 b/AddAlert/run.ps1
@@ -43,7 +43,7 @@ $Results = foreach ($Tenant in $tenants) {
             }
 
             $Table = get-cipptable -TableName 'SchedulerConfig'
-            Add-AzDataTableEntity @Table -Entity $CompleteObject -Force
+            Add-CIPPAzDataTableEntity @Table -Entity $CompleteObject -Force
         }
         $URL = ($request.headers.'x-ms-original-url').split('/api') | Select-Object -First 1
         if ($Tenant -eq 'AllTenants') {
@@ -58,7 +58,7 @@ $Results = foreach ($Tenant in $tenants) {
                         EventType        = $eventType
                         ExecutingUser    = $Request.headers.'x-ms-client-principal'
                     }
-                    New-CIPPGraphSubscription @params
+                    Push-OutputBinding -Name Subscription -Value $Params
                 }
             }
         }

diff --git a/AddAlertSubscription_Queue/function.json b/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"
+    }
+  ]
+}
diff --git a/AddCATemplate/run.ps1 b/AddCATemplate/run.ps1
@@ -42,7 +42,7 @@ try {
     $JSON = ($JSON | ConvertTo-Json -Depth 100)
     $Table = Get-CippTable -tablename 'templates'
     $Table.Force = $true
-    Add-AzDataTableEntity @Table -Entity @{
+    Add-CIPPAzDataTableEntity @Table -Entity @{
         JSON         = "$JSON"
         RowKey       = "$GUID"
         PartitionKey = "CATemplate"

diff --git a/AddChocoApp/Choco.app.json b/AddChocoApp/Choco.app.json
@@ -1,5 +1,4 @@
 {
-
   "displayName": "",
   "installCommandLine": "",
   "uninstallCommandLine": "",
@@ -11,47 +10,48 @@
   "fileName": "IntunePackage.intunewin",
   "@odata.type": "#microsoft.graph.win32LobApp",
   "applicableArchitectures": "x86, x64",
- 
+
   "installExperience": {
     "runAsAccount": "user",
     "deviceRestartBehavior": "allow",
     "@odata.type": "microsoft.graph.win32LobAppInstallExperience"
   },
   "detectionRules": [
     {
-  "@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
-  "path": "%programfiles%\\7-zip",
-  "fileOrFolderName": "7z.exe",
-  "check32BitOn64System": false,
-  "detectionType": "exists" }
+      "@odata.type": "#microsoft.graph.win32LobAppFileSystemDetection",
+      "path": "%programfiles%\\7-zip",
+      "fileOrFolderName": "7z.exe",
+      "check32BitOn64System": false,
+      "detectionType": "exists"
+    }
+  ],
+  "returncode": [
+    {
+      "returnCode": 0,
+      "type": "success",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 1707,
+      "type": "Success",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 1641,
+      "type": "hardReboot",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 1618,
+      "type": "retry",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    },
+    {
+      "returnCode": 3010,
+      "type": "softReboot",
+      "@odata.type": "#microsoft.graph.win32LobAppReturnCode"
+    }
   ],
-      "returncode":  [
-                       {
-                           "returnCode":  0,
-                           "type":  "success",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  1707,
-                           "type":  "Success",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  1641,
-                           "type":  "hardReboot",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  1618,
-                           "type":  "retry",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       },
-                       {
-                           "returnCode":  3010,
-                           "type":  "softReboot",
-                           "@odata.type":  "#microsoft.graph.win32LobAppReturnCode"
-                       }
-                       ],
   "minimumNumberOfProcessors": "1",
   "minimumFreeDiskSpaceInMB": "8",
   "minimumCpuSpeedInMHz": "4",
@@ -60,7 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
-
-
-}
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
+}
diff --git a/AddChocoApp/run.ps1 b/AddChocoApp/run.ps1
@@ -35,7 +35,7 @@ $Results = foreach ($Tenant in $tenants) {
         } | ConvertTo-Json -Depth 15
         $Table = Get-CippTable -tablename 'apps'
         $Table.Force = $true
-        Add-AzDataTableEntity @Table -Entity @{
+        Add-CIPPAzDataTableEntity @Table -Entity @{
             JSON         = "$CompleteObject"
             RowKey       = "$((New-Guid).GUID)"
             PartitionKey = "apps"

diff --git a/AddExConnectorTemplate/run.ps1 b/AddExConnectorTemplate/run.ps1
@@ -27,7 +27,7 @@ try {
     $JSON = ($JSON | Select-Object @{n = 'name'; e = { $_.name } }, * | ConvertTo-Json -Depth 10)
     $Table = Get-CippTable -tablename 'templates'
     $Table.Force = $true
-    Add-AzDataTableEntity @Table -Entity @{
+    Add-CIPPAzDataTableEntity @Table -Entity @{
         JSON         = "$json"
         RowKey       = "$GUID"
         direction    = $request.body.cippconnectortype

diff --git a/AddGroupTemplate/run.ps1 b/AddGroupTemplate/run.ps1
@@ -21,7 +21,7 @@ try {
     } | ConvertTo-Json
     $Table = Get-CippTable -tablename 'templates'
     $Table.Force = $true
-    Add-AzDataTableEntity @Table -Entity @{
+    Add-CIPPAzDataTableEntity @Table -Entity @{
         JSON         = "$object"
         RowKey       = "$GUID"
         PartitionKey = "GroupTemplate"

diff --git a/AddIntuneTemplate/run.ps1 b/AddIntuneTemplate/run.ps1
@@ -22,7 +22,7 @@ try {
         } | ConvertTo-Json
         $Table = Get-CippTable -tablename 'templates'
         $Table.Force = $true
-        Add-AzDataTableEntity @Table -Entity @{
+        Add-CIPPAzDataTableEntity @Table -Entity @{
             JSON         = "$object"
             RowKey       = "$GUID"
             PartitionKey = "IntuneTemplate"
@@ -99,7 +99,7 @@ try {
         } | ConvertTo-Json
         $Table = Get-CippTable -tablename 'templates'
         $Table.Force = $true
-        Add-AzDataTableEntity @Table -Entity @{
+        Add-CIPPAzDataTableEntity @Table -Entity @{
             JSON         = "$object"
             RowKey       = "$GUID"
             PartitionKey = "IntuneTemplate"

diff --git a/AddMSPApp/Immybot.app.json b/AddMSPApp/Immybot.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/automate.app.json b/AddMSPApp/automate.app.json
@@ -59,5 +59,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/cwcommand.app.json b/AddMSPApp/cwcommand.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/datto.app.json b/AddMSPApp/datto.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/huntress.app.json b/AddMSPApp/huntress.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddMSPApp/run.ps1 b/AddMSPApp/run.ps1
@@ -67,7 +67,7 @@ $Results = foreach ($Tenant in $tenants) {
         } | ConvertTo-Json -Depth 15
         $Table = Get-CippTable -tablename 'apps'
         $Table.Force = $true
-        Add-AzDataTableEntity @Table -Entity @{
+        Add-CIPPAzDataTableEntity @Table -Entity @{
             JSON         = "$CompleteObject"
             RowKey       = "$((New-Guid).GUID)"
             PartitionKey = "apps"

diff --git a/AddMSPApp/syncro.app.json b/AddMSPApp/syncro.app.json
@@ -60,5 +60,6 @@
     "v10_1607": true
   },
   "notes": "CIPP Uploaded application",
-  "minimumMemoryInMB": "1"
+  "minimumMemoryInMB": "1",
+  "setupFilePath": "install.ps1"
 }
diff --git a/AddPolicy/run.ps1 b/AddPolicy/run.ps1
@@ -54,9 +54,7 @@ $results = foreach ($Tenant in $tenants) {
         }
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Added policy $($Displayname)" -Sev "Error"
         if ($AssignTo) {
-            $AssignBody = if ($AssignTo -ne "AllDevicesAndUsers") { '{"assignments":[{"id":"","target":{"@odata.type":"#microsoft.graph.' + $($AssignTo) + 'AssignmentTarget"}}]}' } else { '{"assignments":[{"id":"","target":{"@odata.type":"#microsoft.graph.allDevicesAssignmentTarget"}},{"id":"","target":{"@odata.type":"#microsoft.graph.allLicensedUsersAssignmentTarget"}}]}' }
-            $assign = New-GraphPOSTRequest -uri  "https://graph.microsoft.com/beta/deviceManagement/$TemplateTypeURL('$($CreateRequest.id)')/assign" -tenantid $tenant -type POST -body $AssignBody
-            Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($Tenant) -message "Assigned policy $($Displayname) to $AssignTo" -Sev "Info"
+            Set-CIPPAssignedPolicy -GroupName $AssignTo -PolicyId $CreateRequest.id -Type $TemplateTypeURL -TenantFilter $tenant 
         }
         "Successfully added policy for $($Tenant)"
     }

diff --git a/AddScheduledItems/function.json → AddScheduledItem/function.json b/AddScheduledItems/function.json → AddScheduledItem/function.json
@@ -1,19 +1,19 @@
-{
-    "bindings": [
-      {
-        "authLevel": "anonymous",
-        "type": "httpTrigger",
-        "direction": "in",
-        "name": "Request",
-        "methods": [
-          "get",
-          "post"
-        ]
-      },
-      {
-        "type": "http",
-        "direction": "out",
-        "name": "Response"
-      }
-    ]
+{
+    "bindings": [
+      {
+        "authLevel": "anonymous",
+        "type": "httpTrigger",
+        "direction": "in",
+        "name": "Request",
+        "methods": [
+          "get",
+          "post"
+        ]
+      },
+      {
+        "type": "http",
+        "direction": "out",
+        "name": "Response"
+      }
+    ]
   }