Merge pull request #63 from KelvinTegelaar/master

pull[bot] · web-flow · commit 54b9fcd8a2e2 · 2025-01-13T10:16:07.000Z
[pull] master from KelvinTegelaar:master
diff --git a/.github/workflows/dev_cipppwrro.yml b/.github/workflows/dev_cipppwrro.yml
@@ -0,0 +1,30 @@
+# 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:
+  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: 'cipppwrro'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D5D7DFF930C04B519206F25DDCD88324 }}
diff --git a/Modules/CIPPCore/Public/Alerts/Get-CippAlertBreachAlert.ps1 b/Modules/CIPPCore/Public/Alerts/Get-CippAlertBreachAlert.ps1
@@ -1,5 +1,5 @@
 
-function Get-CippBreachAlert {
+function Get-CippAlertBreachAlert {
     <#
     .FUNCTIONALITY
         Entrypoint
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCippFunction.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecCippFunction.ps1
@@ -28,6 +28,9 @@ function Invoke-ExecCippFunction {
     if (Get-Command -Module CIPPCore -Name $Function -and $BlockList -notcontains $Function) {
         try {
             $Results = & $Function @Params
+            if (!$Results) {
+                $Results = "Function $Function executed successfully"
+            }
             $StatusCode = [HttpStatusCode]::OK
         } catch {
             $Results = $_.Exception.Message
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecPartnerMode.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecPartnerMode.ps1
@@ -35,6 +35,17 @@ Function Invoke-ExecPartnerMode {
                     } catch {
                     }
                 }
+            } elseif ($Request.Body.TenantMode -eq 'PartnerTenantAvailable') {
+                $InputObject = [PSCustomObject]@{
+                    Batch            = @(
+                        @{
+                            FunctionName = 'UpdateTenants'
+                        }
+                    )
+                    OrchestratorName = 'UpdateTenants'
+                    SkipLog          = $true
+                }
+                Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Compress -Depth 5)
             }
 
             Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-AddIntuneTemplate.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-AddIntuneTemplate.ps1
@@ -38,9 +38,9 @@ Function Invoke-AddIntuneTemplate {
 
             $body = [pscustomobject]@{'Results' = 'Successfully added template' }
         } else {
-            $TenantFilter = $Request.Query.tenantFilter
-            $URLName = $Request.Query.URLName
-            $ID = $Request.Query.id
+            $TenantFilter = $Request.Body.tenantFilter ?? $Request.Query.tenantFilter
+            $URLName = $Request.Body.URLName ?? $Request.Query.URLName
+            $ID = $Request.Body.ID ?? $Request.Query.ID
             $Template = New-CIPPIntuneTemplate -TenantFilter $TenantFilter -URLName $URLName -ID $ID
             Write-Host "Template: $Template"
             $object = [PSCustomObject]@{
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-AddGuest.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-AddGuest.ps1
@@ -34,7 +34,7 @@ Function Invoke-AddGuest {
             }
         }
         $bodyToShip = ConvertTo-Json -Depth 10 -InputObject $BodyToship -Compress
-        $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/invitations' -tenantFilter $Userobj.tenantFilter -type POST -body $BodyToship -verbose
+        $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/invitations' -tenantid $Userobj.tenantFilter -type POST -body $BodyToship -verbose
         if ($Userobj.sendInvite -eq 'true') {
             $results.add('Invited Guest. Invite Email sent')
             Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($userobj.tenantFilter) -message "Invited Guest $($userobj.displayname) with Email Invite " -Sev 'Info'
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecStandardConvert.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecStandardConvert.ps1
@@ -162,7 +162,7 @@ function Invoke-ExecStandardConvert {
 
         if ($Tenant -eq 'AllTenants' -and $Excluded) {
             $ExcludedArr = $Excluded | ForEach-Object { $_ }
-            $NewTemplate | Add-Member -NotePropertyName 'excludedTenants' -NotePropertyValue $ExcludedArr -Force
+            $NewTemplate | Add-Member -NotePropertyName 'excludedTenants' -NotePropertyValue @($ExcludedArr) -Force
         }
 
         return $NewTemplate
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListIntuneTemplates.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListIntuneTemplates.ps1
@@ -41,7 +41,7 @@ Function Invoke-ListIntuneTemplates {
             $data | Add-Member -NotePropertyName 'displayName' -NotePropertyValue $_.Displayname -Force
             $data | Add-Member -NotePropertyName 'description' -NotePropertyValue $_.Description -Force
             $data | Add-Member -NotePropertyName 'Type' -NotePropertyValue $_.Type -Force
-            $data | Add-Member -NotePropertyName 'GUID' -NotePropertyValue $_.GUID -Force
+            $data | Add-Member -NotePropertyName 'GUID' -NotePropertyValue $_.RowKey -Force
             $data
         } | Sort-Object -Property displayName
     }
diff --git a/Modules/CIPPCore/Public/Get-CIPPTimerFunctions.ps1 b/Modules/CIPPCore/Public/Get-CIPPTimerFunctions.ps1
@@ -133,12 +133,13 @@ function Get-CIPPTimerFunctions {
                     Parameters         = $Orchestrator.Parameters ?? @{}
                     Cron               = $CronString
                     NextOccurrence     = $NextOccurrence.ToUniversalTime()
-                    LastOccurrence     = $Status.LastOccurrence.DateTime
+                    LastOccurrence     = $Status.LastOccurrence
                     Status             = $Status.Status
                     OrchestratorId     = $Status.OrchestratorId
                     RunOnProcessor     = $Orchestrator.RunOnProcessor
                     IsSystem           = $Orchestrator.IsSystem ?? $false
                     PreferredProcessor = $Orchestrator.PreferredProcessor ?? ''
+                    ErrorMsg           = $Status.ErrorMsg ?? ''
                 }
             }
         } else {
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-AuthorisedRequest.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-AuthorisedRequest.ps1
@@ -12,13 +12,13 @@ function Get-AuthorisedRequest {
     if (!$TenantID) {
         $TenantID = $env:TenantID
     }
+
     if ($Uri -like 'https://graph.microsoft.com/beta/contracts*' -or $Uri -like '*/customers/*' -or $Uri -eq 'https://graph.microsoft.com/v1.0/me/sendMail' -or $Uri -like '*/tenantRelationships/*' -or $Uri -like '*/security/partner/*') {
         return $true
     }
-    $Tenants = Get-Tenants -IncludeErrors
-    $SkipList = Get-Tenants -SkipList
+    $Tenant = Get-Tenants -TenantFilter $TenantID | Where-Object { $_.Excluded -eq $false }
 
-    if (($SkipList.customerId -notcontains $TenantID -and $SkipList.defaultDomainName -notcontains $TenantID) -or (($Tenants.customerId -contains $TenantID -or $Tenants.defaultDomainName -contains $TenantID) -and $TenantID -ne $env:TenantID)) {
+    if ($Tenant) {
         return $true
     } else {
         return $false
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1
@@ -50,7 +50,7 @@ function Get-Tenants {
 
     $IncludedTenantsCache = Get-CIPPAzDataTableEntity @TenantsTable -Filter $Filter
 
-    if (($IncludedTenantsCache | Measure-Object).Count -eq 0) {
+    if (($IncludedTenantsCache | Measure-Object).Count -eq 0 -and $TenantFilter -ne $env:TenantID) {
         $BuildRequired = $true
     }
 
diff --git a/Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1 b/Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1
@@ -3,21 +3,23 @@ function New-GraphGetRequest {
     .FUNCTIONALITY
     Internal
     #>
+    [CmdletBinding()]
     Param(
-        $uri,
-        $tenantid,
-        $scope,
-        $AsApp,
-        $noPagination,
-        $NoAuthCheck,
-        $skipTokenCache,
+        [string]$uri,
+        [string]$tenantid,
+        [string]$scope,
+        [bool]$AsApp,
+        [bool]$noPagination,
+        [bool]$NoAuthCheck,
+        [bool]$skipTokenCache,
         $Caller,
         [switch]$ComplexFilter,
         [switch]$CountOnly,
         [switch]$IncludeResponseHeaders
     )
+    $IsAuthorised = Get-AuthorisedRequest -Uri $uri -TenantID $tenantid
 
-    if ($NoAuthCheck -or (Get-AuthorisedRequest -Uri $uri -TenantID $tenantid)) {
+    if ($NoAuthCheck -eq $true -or $IsAuthorised) {
         if ($scope -eq 'ExchangeOnline') {
             $AccessToken = Get-ClassicAPIToken -resource 'https://outlook.office365.com' -Tenantid $tenantid
             $headers = @{ Authorization = "Bearer $($AccessToken.access_token)" }
diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-7.0.1
+7.0.2

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,17 @@ Function Invoke-ExecPartnerMode {`
`35`	`35`	`} catch {`
`36`	`36`	`}`
`37`	`37`	`}`
	`38`	`+ } elseif ($Request.Body.TenantMode -eq 'PartnerTenantAvailable') {`
	`39`	`+ $InputObject = [PSCustomObject]@{`
	`40`	`+ Batch = @(`
	`41`	`+ @{`
	`42`	`+ FunctionName = 'UpdateTenants'`
	`43`	`+ }`
	`44`	`+ )`
	`45`	`+ OrchestratorName = 'UpdateTenants'`
	`46`	`+ SkipLog = $true`
	`47`	`+ }`
	`48`	`+ Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject \| ConvertTo-Json -Compress -Depth 5)`
`38`	`49`	`}`
`39`	`50`
`40`	`51`	`Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ Function Invoke-AddGuest {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`$bodyToShip = ConvertTo-Json -Depth 10 -InputObject $BodyToship -Compress`
`37`		`- $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/invitations' -tenantFilter $Userobj.tenantFilter -type POST -body $BodyToship -verbose`
	`37`	`+ $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/invitations' -tenantid $Userobj.tenantFilter -type POST -body $BodyToship -verbose`
`38`	`38`	`if ($Userobj.sendInvite -eq 'true') {`
`39`	`39`	`$results.add('Invited Guest. Invite Email sent')`
`40`	`40`	`Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($userobj.tenantFilter) -message "Invited Guest $($userobj.displayname) with Email Invite " -Sev 'Info'`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ function Invoke-ExecStandardConvert {`
`162`	`162`
`163`	`163`	`if ($Tenant -eq 'AllTenants' -and $Excluded) {`
`164`	`164`	`$ExcludedArr = $Excluded \| ForEach-Object { $_ }`
`165`		`- $NewTemplate \| Add-Member -NotePropertyName 'excludedTenants' -NotePropertyValue $ExcludedArr -Force`
	`165`	`+ $NewTemplate \| Add-Member -NotePropertyName 'excludedTenants' -NotePropertyValue @($ExcludedArr) -Force`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`return $NewTemplate`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ Function Invoke-ListIntuneTemplates {`
`41`	`41`	`$data \| Add-Member -NotePropertyName 'displayName' -NotePropertyValue $_.Displayname -Force`
`42`	`42`	`$data \| Add-Member -NotePropertyName 'description' -NotePropertyValue $_.Description -Force`
`43`	`43`	`$data \| Add-Member -NotePropertyName 'Type' -NotePropertyValue $_.Type -Force`
`44`		`- $data \| Add-Member -NotePropertyName 'GUID' -NotePropertyValue $_.GUID -Force`
	`44`	`+ $data \| Add-Member -NotePropertyName 'GUID' -NotePropertyValue $_.RowKey -Force`
`45`	`45`	`$data`
`46`	`46`	`} \| Sort-Object -Property displayName`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ function Get-Tenants {`
`50`	`50`
`51`	`51`	`$IncludedTenantsCache = Get-CIPPAzDataTableEntity @TenantsTable -Filter $Filter`
`52`	`52`
`53`		`- if (($IncludedTenantsCache \| Measure-Object).Count -eq 0) {`
	`53`	`+ if (($IncludedTenantsCache \| Measure-Object).Count -eq 0 -and $TenantFilter -ne $env:TenantID) {`
`54`	`54`	`$BuildRequired = $true`
`55`	`55`	`}`
`56`	`56`