Skip to content

Commit

Permalink
Merge pull request #268 from KelvinTegelaar/dev
Browse files Browse the repository at this point in the history
[pull] dev from KelvinTegelaar:dev
  • Loading branch information
JohnDuprey authored Jan 14, 2025
2 parents 8c50115 + 695a0d8 commit ff0fe24
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

function Get-CippBreachAlert {
function Get-CippAlertBreachAlert {
<#
.FUNCTIONALITY
Entrypoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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'.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
},
@{
Expand Down
2 changes: 1 addition & 1 deletion version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.1
7.0.2

0 comments on commit ff0fe24

Please sign in to comment.