Merge pull request KelvinTegelaar#268 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: JohnDuprey

…re/Public/Alerts/Get-CippBreachAlert.ps1 …blic/Alerts/Get-CippAlertBreachAlert.ps1Modules/CIPPCore/Public/Alerts/Get-CippBreachAlert.ps1 renamed to Modules/CIPPCore/Public/Alerts/Get-CippAlertBreachAlert.ps1 Modules/CIPPCore/Public/Alerts/Get-CippBreachAlert.ps1 renamed to Modules/CIPPCore/Public/Alerts/Get-CippAlertBreachAlert.ps1

@@ -1,5 +1,5 @@
 
-function Get-CippBreachAlert {
+function Get-CippAlertBreachAlert {
     <#
     .FUNCTIONALITY
         Entrypoint

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Invoke-ExecQuarantineManagement.ps1

@@ -11,7 +11,7 @@ Function Invoke-ExecQuarantineManagement {
     param($Request, $TriggerMetadata)
 
     $APIName = $TriggerMetadata.FunctionName
-    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+    Write-LogMessage -user $Request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
 
 
     # Write to the Azure Functions log stream.
@@ -20,19 +20,19 @@ Function Invoke-ExecQuarantineManagement {
 
     # Interact with query parameters or the body of the request.
     Try {
-        $tenantfilter = $Request.Query.TenantFilter
+        $TenantFilter = $Request.Body.tenantFilter
         $params = @{
-            Identity     = $request.query.ID
-            AllowSender  = [boolean]$Request.query.AllowSender
-            ReleasetoAll = [boolean]$Request.query.type
-            ActionType   = $Request.query.type
+            Identity     = $Request.Body.Identity
+            AllowSender  = [boolean]$Request.Body.AllowSender
+            ReleaseToAll = [boolean]$Request.Body.Type
+            ActionType   = $Request.Body.Type
         }
-        Write-Host $params
+
         New-ExoRequest -tenantid $TenantFilter -cmdlet 'Release-QuarantineMessage' -cmdParams $Params
-        $Results = [pscustomobject]@{'Results' = "Successfully processed $($request.query.ID)" }
-        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($tenantfilter) -message "$($request.query.id)" -Sev 'Info'
+        $Results = [pscustomobject]@{'Results' = "Successfully processed $($Request.Body.Identity)" }
+        Write-LogMessage -user $Request.headers.'x-ms-client-principal' -API $APINAME -tenant $TenantFilter -message "Successfully processed Quarantine ID $($Request.Body.Identity)" -Sev 'Info'
     } catch {
-        Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -tenant $($tenantfilter) -message "Quarantine Management failed: $($_.Exception.Message)" -Sev 'Error'
+        Write-LogMessage -user $Request.headers.'x-ms-client-principal' -API $APINAME -tenant $TenantFilter -message "Quarantine Management failed: $($_.Exception.Message)" -Sev 'Error' -LogData $_
         $Results = [pscustomobject]@{'Results' = "Failed. $($_.Exception.Message)" }
     }
     # Associate values to output bindings by calling 'Push-OutputBinding'.

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'

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

Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1

@@ -1748,7 +1748,7 @@ function Invoke-NinjaOneTenantSync {
                 },
                 @{
                     Name = 'Compliance Portal'
-                    Link = "https://compliance.microsoft.com/?tid=$($Customer.CustomerId)"
+                    Link = "https://purview.microsoft.com/?tid=$($Customer.CustomerId)"
                     Icon = 'fas fa-user-shield'
                 },
                 @{

version_latest.txt

@@ -1 +1 @@
-7.0.1
+7.0.2