' +
@@ -1311,7 +1311,7 @@ function Invoke-NinjaOneTenantSync {
$UserFields = @{
cippUserLinks = @{'html' = $UserLinksHTML }
cippUserSummary = @{'html' = $UserSummaryHTML }
- cippUserGroups = @{'html' = "$($UserGroups | ConvertTo-HTML -As Table -Fragment)" }
+ cippUserGroups = @{'html' = "$($UserGroups | ConvertTo-Html -As Table -Fragment)" }
cippUserDevices = @{'html' = $UserDeviceDetailHTML }
cippUserID = $User.id
cippUserUPN = $User.userPrincipalName
@@ -1355,8 +1355,8 @@ function Invoke-NinjaOneTenantSync {
try {
# Create New Users
if (($NinjaUserCreation | Measure-Object).count -ge 100) {
- Write-Host "Creating NinjaOne Users"
- [System.Collections.Generic.List[PSCustomObject]]$CreatedUsers = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserCreation.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
+ Write-Host 'Creating NinjaOne Users'
+ [System.Collections.Generic.List[PSCustomObject]]$CreatedUsers = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserCreation.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
Remove-AzDataTableEntity @UsersUpdateTable -Entity $NinjaUserCreation
[System.Collections.Generic.List[PSCustomObject]]$NinjaUserCreation = @()
}
@@ -1367,8 +1367,8 @@ function Invoke-NinjaOneTenantSync {
try {
# Update Users
if (($NinjaUserUpdates | Measure-Object).count -ge 100) {
- Write-Host "Updating NinjaOne Users"
- [System.Collections.Generic.List[PSCustomObject]]$UpdatedUsers = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserUpdates.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
+ Write-Host 'Updating NinjaOne Users'
+ [System.Collections.Generic.List[PSCustomObject]]$UpdatedUsers = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserUpdates.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
Remove-AzDataTableEntity @UsersUpdateTable -Entity $NinjaUserUpdates
[System.Collections.Generic.List[PSCustomObject]]$NinjaUserUpdates = @()
}
@@ -1406,7 +1406,7 @@ function Invoke-NinjaOneTenantSync {
Add-CIPPAzDataTableEntity @UsersMapTable -Entity $MappedUser -Force
}
} else {
- Write-Error "Unmatched Doc: $($UserDoc | convertto-json -depth 100)"
+ Write-Error "Unmatched Doc: $($UserDoc | ConvertTo-Json -Depth 100)"
}
}
@@ -1430,8 +1430,8 @@ function Invoke-NinjaOneTenantSync {
try {
# Create New Users
if (($NinjaUserCreation | Measure-Object).count -ge 1) {
- Write-Host "Creating NinjaOne Users"
- [System.Collections.Generic.List[PSCustomObject]]$CreatedUsers = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserCreation.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
+ Write-Host 'Creating NinjaOne Users'
+ [System.Collections.Generic.List[PSCustomObject]]$CreatedUsers = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserCreation.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
Remove-AzDataTableEntity @UsersUpdateTable -Entity $NinjaUserCreation
}
@@ -1442,8 +1442,8 @@ function Invoke-NinjaOneTenantSync {
try {
# Update Users
if (($NinjaUserUpdates | Measure-Object).count -ge 1) {
- Write-Host "Updating NinjaOne Users"
- [System.Collections.Generic.List[PSCustomObject]]$UpdatedUsers = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserUpdates.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
+ Write-Host 'Updating NinjaOne Users'
+ [System.Collections.Generic.List[PSCustomObject]]$UpdatedUsers = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ("[$($NinjaUserUpdates.body -join ',')]") -EA Stop).content | ConvertFrom-Json -Depth 100
Remove-AzDataTableEntity @UsersUpdateTable -Entity $NinjaUserUpdates
}
} Catch {
@@ -1483,7 +1483,7 @@ function Invoke-NinjaOneTenantSync {
Add-CIPPAzDataTableEntity @UsersMapTable -Entity $MappedUser -Force
}
} else {
- Write-Error "Unmatched Doc: $($UserDoc | convertto-json -depth 100)"
+ Write-Error "Unmatched Doc: $($UserDoc | ConvertTo-Json -Depth 100)"
}
}
@@ -1492,7 +1492,7 @@ function Invoke-NinjaOneTenantSync {
# Relate Users to Devices
Foreach ($LinkDevice in $ParsedDevices | Where-Object { $null -ne $_.NinjaDevice }) {
- $RelatedItems = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/related-items/with-entity/NODE/$($LinkDevice.NinjaDevice.id)" -Method GET -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json').content | ConvertFrom-Json -depth 100
+ $RelatedItems = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/related-items/with-entity/NODE/$($LinkDevice.NinjaDevice.id)" -Method GET -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json').content | ConvertFrom-Json -Depth 100
[System.Collections.Generic.List[PSCustomObject]]$Relations = @()
Foreach ($LinkUser in $LinkDevice.UserIDs) {
$MatchedUser = $UsersMap | Where-Object { $_.M365ID -eq $LinkUser }
@@ -1501,7 +1501,7 @@ function Invoke-NinjaOneTenantSync {
if (!$ExistingRelation) {
$Relations.Add(
[PSCustomObject]@{
- relEntityType = "DOCUMENT"
+ relEntityType = 'DOCUMENT'
relEntityId = $MatchedUser.NinjaOneID
}
)
@@ -1514,9 +1514,9 @@ function Invoke-NinjaOneTenantSync {
try {
# Update Relations
if (($Relations | Measure-Object).count -ge 1) {
- Write-Host "Updating Relations"
- $Null = Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/related-items/entity/NODE/$($LinkDevice.NinjaDevice.id)/relations" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json' -Body ($Relations | ConvertTo-Json -Depth 100 -AsArray) -EA Stop
- Write-Host "Completed Update"
+ Write-Host 'Updating Relations'
+ $Null = Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/related-items/entity/NODE/$($LinkDevice.NinjaDevice.id)/relations" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json' -Body ($Relations | ConvertTo-Json -Depth 100 -AsArray) -EA Stop
+ Write-Host 'Completed Update'
}
} Catch {
Write-Host "Creating Relations Failed: $_"
@@ -1565,7 +1565,7 @@ function Invoke-NinjaOneTenantSync {
'Tenant Total' = $License.prepaidUnits.enabled
'SKU ID' = $License.skuId
}
- $LicenseOverviewCardHTML = Get-NinjaOneInfoCard -Title "License Details" -Data $LicenseSummary -Icon 'fas fa-file-invoice'
+ $LicenseOverviewCardHTML = Get-NinjaOneInfoCard -Title 'License Details' -Data $LicenseSummary -Icon 'fas fa-file-invoice'
$SubscriptionsHTML = $MatchedSubscriptions | Select-Object @{'n' = 'Subscription Licenses'; 'e' = { $_.totalLicenses } },
@{'n' = 'Created'; 'e' = { $_.createdDateTime } },
@@ -1574,7 +1574,7 @@ function Invoke-NinjaOneTenantSync {
@{'n' = 'Status'; 'e' = { $_.Status } } | ConvertTo-Html -As Table -Fragment
$SubscriptionsHTML = ([System.Web.HttpUtility]::HtmlDecode($SubscriptionsHTML) -replace '
', ' | ') -replace ' | ', ' | '
- $SubscriptionCardHTML = Get-NinjaOneCard -Title "Subscriptions" -Body $SubscriptionsHTML -Icon 'fas fa-file-invoice'
+ $SubscriptionCardHTML = Get-NinjaOneCard -Title 'Subscriptions' -Body $SubscriptionsHTML -Icon 'fas fa-file-invoice'
$LicenseItemsTable = $License.servicePlans | Select-Object @{n = 'Plan Name'; e = { convert-skuname -skuname $_.servicePlanName } }, @{n = 'Applies To'; e = { $_.appliesTo } }, @{n = 'Provisioning Status'; e = { $_.provisioningStatus } }
@@ -1626,8 +1626,8 @@ function Invoke-NinjaOneTenantSync {
try {
# Create New Subscriptions
if (($NinjaLicenseCreation | Measure-Object).count -ge 1) {
- Write-Host "Creating NinjaOne Licenses"
- [System.Collections.Generic.List[PSCustomObject]]$CreatedLicenses = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ($NinjaLicenseCreation | ConvertTo-Json -Depth 100 -AsArray) -EA Stop).content | ConvertFrom-Json -Depth 100
+ Write-Host 'Creating NinjaOne Licenses'
+ [System.Collections.Generic.List[PSCustomObject]]$CreatedLicenses = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ($NinjaLicenseCreation | ConvertTo-Json -Depth 100 -AsArray) -EA Stop).content | ConvertFrom-Json -Depth 100
}
} Catch {
Write-Host "Bulk Creation Error, but may have been successful as only 1 record with an issue could have been the cause: $_"
@@ -1636,9 +1636,9 @@ function Invoke-NinjaOneTenantSync {
try {
# Update Subscriptions
if (($NinjaLicenseUpdates | Measure-Object).count -ge 1) {
- Write-Host "Updating NinjaOne Licenses"
- [System.Collections.Generic.List[PSCustomObject]]$UpdatedLicenses = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ($NinjaLicenseUpdates | ConvertTo-Json -Depth 100 -AsArray) -EA Stop).content | ConvertFrom-Json -Depth 100
- Write-Host "Completed Update"
+ Write-Host 'Updating NinjaOne Licenses'
+ [System.Collections.Generic.List[PSCustomObject]]$UpdatedLicenses = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/organization/documents" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ($NinjaLicenseUpdates | ConvertTo-Json -Depth 100 -AsArray) -EA Stop).content | ConvertFrom-Json -Depth 100
+ Write-Host 'Completed Update'
}
} Catch {
Write-Host "Bulk Update Errored, but may have been successful as only 1 record with an issue could have been the cause: $_"
@@ -1652,14 +1652,14 @@ function Invoke-NinjaOneTenantSync {
$MatchedLicDoc = $LicenseDocs | Where-Object { $_.documentName -eq $LinkLic.name }
if (($MatchedLicDoc | Measure-Object).count -eq 1) {
# Remove existing relations
- $RelatedItems = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/related-items/with-entity/DOCUMENT/$($MatchedLicDoc.documentId)" -Method GET -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json').content | ConvertFrom-Json -depth 100
+ $RelatedItems = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/related-items/with-entity/DOCUMENT/$($MatchedLicDoc.documentId)" -Method GET -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json').content | ConvertFrom-Json -Depth 100
[System.Collections.Generic.List[PSCustomObject]]$Relations = @()
Foreach ($LinkUser in $LinkLic.Users) {
$ExistingRelation = $RelatedItems | Where-Object { $_.relEntityType -eq 'DOCUMENT' -and $_.relEntityId -eq $LinkUser }
if (!$ExistingRelation) {
$Relations.Add(
[PSCustomObject]@{
- relEntityType = "DOCUMENT"
+ relEntityType = 'DOCUMENT'
relEntityId = $LinkUser
}
)
@@ -1670,9 +1670,9 @@ function Invoke-NinjaOneTenantSync {
try {
# Update Relations
if (($Relations | Measure-Object).count -ge 1) {
- Write-Host "Updating Relations"
- $Null = Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/related-items/entity/DOCUMENT/$($($MatchedLicDoc.documentId))/relations" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json' -Body ($Relations | ConvertTo-Json -Depth 100 -AsArray) -EA Stop
- Write-Host "Completed Update"
+ Write-Host 'Updating Relations'
+ $Null = Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/related-items/entity/DOCUMENT/$($($MatchedLicDoc.documentId))/relations" -Method POST -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json' -Body ($Relations | ConvertTo-Json -Depth 100 -AsArray) -EA Stop
+ Write-Host 'Completed Update'
}
} Catch {
Write-Host "Creating Relations Failed: $_"
@@ -1681,7 +1681,7 @@ function Invoke-NinjaOneTenantSync {
#Remove relations
foreach ($DelUser in $RelatedItems | Where-Object { $_.relEntityType -eq 'DOCUMENT' -and $_.relEntityId -notin $LinkLic.Users }) {
try {
- $RelatedItems = (Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/related-items/$($DelUser.id)" -Method Delete -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json').content | ConvertFrom-Json -depth 100
+ $RelatedItems = (Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/related-items/$($DelUser.id)" -Method Delete -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json').content | ConvertFrom-Json -Depth 100
} catch {
Write-Host "Failed to remove relation $($DelUser.id) from $($LinkLic.name)"
}
@@ -1698,7 +1698,7 @@ function Invoke-NinjaOneTenantSync {
### M365 Links Section
if ($MappedFields.TenantLinks) {
- Write-Host "Tenant Links"
+ Write-Host 'Tenant Links'
$ManagementLinksData = @(
@{
@@ -1800,12 +1800,12 @@ function Invoke-NinjaOneTenantSync {
if ($MappedFields.TenantSummary) {
- Write-Host "Tenant Summary"
+ Write-Host 'Tenant Summary'
### Tenant Overview Card
$ParsedAdmins = [PSCustomObject]@{}
- $AdminUsers | Select-Object displayname, userPrincipalName -unique | ForEach-Object {
+ $AdminUsers | Select-Object displayname, userPrincipalName -Unique | ForEach-Object {
$ParsedAdmins | Add-Member -NotePropertyName $_.displayname -NotePropertyValue $_.userPrincipalName
}
@@ -1819,15 +1819,15 @@ function Invoke-NinjaOneTenantSync {
}
- $TenantSummaryCard = Get-NinjaOneInfoCard -Title "Tenant Details" -Data $TenantDetailsItems -Icon 'fas fa-building'
+ $TenantSummaryCard = Get-NinjaOneInfoCard -Title 'Tenant Details' -Data $TenantDetailsItems -Icon 'fas fa-building'
### Users details card
- Write-Host "User Details"
- $TotalUsersCount = ($Users | measure-object).count
- $GuestUsersCount = ($Users | where-object { $_.UserType -eq 'Guest' } | measure-object).count
- $LicensedUsersCount = ($licensedUsers | measure-object).count
+ Write-Host 'User Details'
+ $TotalUsersCount = ($Users | Measure-Object).count
+ $GuestUsersCount = ($Users | Where-Object { $_.UserType -eq 'Guest' } | Measure-Object).count
+ $LicensedUsersCount = ($licensedUsers | Measure-Object).count
$UnlicensedUsersCount = $TotalUsersCount - $GuestUsersCount - $LicensedUsersCount
- $UsersEnabledCount = ($Users | where-object { $_.accountEnabled -eq $True } | Measure-Object).count
+ $UsersEnabledCount = ($Users | Where-Object { $_.accountEnabled -eq $True } | Measure-Object).count
# Enabled Users
@@ -1845,7 +1845,7 @@ function Invoke-NinjaOneTenantSync {
)
- $UsersEnabledChartHTML = Get-NinjaInLineBarGraph -Title "User Status" -Data $Data -KeyInLine
+ $UsersEnabledChartHTML = Get-NinjaInLineBarGraph -Title 'User Status' -Data $Data -KeyInLine
# User Types
@@ -1867,7 +1867,7 @@ function Invoke-NinjaOneTenantSync {
}
)
- $UsersTypesChartHTML = Get-NinjaInLineBarGraph -Title "User Types" -Data $Data -KeyInLine
+ $UsersTypesChartHTML = Get-NinjaInLineBarGraph -Title 'User Types' -Data $Data -KeyInLine
# Create the Users Card
@@ -1880,7 +1880,7 @@ function Invoke-NinjaOneTenantSync {
### Device Details Card
- Write-Host "Device Details"
+ Write-Host 'Device Details'
$TotalDeviceswCount = ($Devices | Measure-Object).count
$ComplianceDevicesCount = ($Devices | Where-Object { $_.complianceState -eq 'compliant' } | Measure-Object).count
$WindowsCount = ($Devices | Where-Object { $_.operatingSystem -eq 'Windows' } | Measure-Object).count
@@ -1905,7 +1905,7 @@ function Invoke-NinjaOneTenantSync {
)
- $DeviceComplianceChartHTML = Get-NinjaInLineBarGraph -Title "Device Compliance" -Data $Data -KeyInLine
+ $DeviceComplianceChartHTML = Get-NinjaInLineBarGraph -Title 'Device Compliance' -Data $Data -KeyInLine
# Device OS Types
@@ -1932,7 +1932,7 @@ function Invoke-NinjaOneTenantSync {
}
)
- $DeviceOsChartHTML = Get-NinjaInLineBarGraph -Title "Device Operating Systems" -Data $Data -KeyInLine
+ $DeviceOsChartHTML = Get-NinjaInLineBarGraph -Title 'Device Operating Systems' -Data $Data -KeyInLine
# Last online time
@@ -1949,7 +1949,7 @@ function Invoke-NinjaOneTenantSync {
}
)
- $DeviceOnlineChartHTML = Get-NinjaInLineBarGraph -Title "Devices Online in the last 30 days" -Data $Data -KeyInLine
+ $DeviceOnlineChartHTML = Get-NinjaInLineBarGraph -Title 'Devices Online in the last 30 days' -Data $Data -KeyInLine
# Create the Devices Card
@@ -1960,7 +1960,7 @@ function Invoke-NinjaOneTenantSync {
$DeviceSummaryCardHTML = Get-NinjaOneCard -Title 'Device Details' -Body $DeviceCardBodyHTML -Icon 'fas fa-network-wired' -TitleLink $TitleLink
#### Secure Score Card
- Write-Host "Secure Score Details"
+ Write-Host 'Secure Score Details'
$Top5Actions = ($SecureScoreParsed | Where-Object { $_.scoreInPercentage -ne 100 } | Sort-Object 'Score Impact', adjustedRank -Descending) | Select-Object -First 5
# Score Chart
@@ -1991,7 +1991,7 @@ function Invoke-NinjaOneTenantSync {
### CIPP Applied Standards Cards
- Write-Host "Applied Standards"
+ Write-Host 'Applied Standards'
Set-Location (Get-Item $PSScriptRoot).Parent.Parent.Parent.FullName
$StandardsDefinitions = Get-Content 'config/standards.json' | ConvertFrom-Json -Depth 100
@@ -2005,10 +2005,10 @@ function Invoke-NinjaOneTenantSync {
$ParsedStandards = foreach ($Standard in $AppliedStandards) {
[PSCustomObject]$Standards = $Standard.Standards
- $Standards.PSObject.Properties | foreach-object {
+ $Standards.PSObject.Properties | ForEach-Object {
$CheckValue = $_
if ($CheckValue.value) {
- $MatchedStandard = $StandardsDefinitions | where-object { ($_.name -split 'standards.')[1] -eq $CheckValue.name }
+ $MatchedStandard = $StandardsDefinitions | Where-Object { ($_.name -split 'standards.')[1] -eq $CheckValue.name }
if (($MatchedStandard | Measure-Object).count -eq 1) {
'' + $($MatchedStandard.label) + ' (' + ($($Standard.Tenant)) + ')'
}
@@ -2024,8 +2024,8 @@ function Invoke-NinjaOneTenantSync {
$CIPPStandardsSummaryCardHTML = Get-NinjaOneCard -Title 'CIPP Applied Standards' -Body $CIPPStandardsBodyHTML -Icon 'fas fa-shield-halved' -TitleLink $TitleLink
### License Card
- Write-Host "License Details"
- $LicenseTableHTML = $LicensesParsed | Sort-Object 'License Name' | ConvertTo-HTML -As Table -Fragment
+ Write-Host 'License Details'
+ $LicenseTableHTML = $LicensesParsed | Sort-Object 'License Name' | ConvertTo-Html -As Table -Fragment
$LicenseTableHTML = '' + (([System.Web.HttpUtility]::HtmlDecode($LicenseTableHTML) -replace ' ', ' | ') -replace ' | ', ' | ') + ''
$TitleLink = "https://$CIPPUrl/tenant/administration/list-licenses?customerId=$($Customer.customerId)"
@@ -2033,7 +2033,7 @@ function Invoke-NinjaOneTenantSync {
### Summary Stats
- Write-Host "Widget Details"
+ Write-Host 'Widget Details'
[System.Collections.Generic.List[PSCustomObject]]$WidgetData = @()
@@ -2062,7 +2062,7 @@ function Invoke-NinjaOneTenantSync {
# Unused Licenses
$WidgetData.add([PSCustomObject]@{
Value = $(
- $BPAUnusedLicenses = (($BpaData.Unusedlicenses | ConvertFrom-Json).availableUnits | Measure-Object -sum).sum
+ $BPAUnusedLicenses = (($BpaData.Unusedlicenses | ConvertFrom-Json).availableUnits | Measure-Object -Sum).sum
if ($BPAUnusedLicenses -ne 0) {
$ResultColour = '#D53948'
} else {
@@ -2219,7 +2219,7 @@ function Invoke-NinjaOneTenantSync {
# Create the Tenant Summary Field
- Write-Host "Complete Tenant Summary"
+ Write-Host 'Complete Tenant Summary'
$TenantSummaryHTML = ' ' + $SummaryDetailsCardHTML + ' ' +
'' +
' ' + $TenantSummaryCard +
@@ -2237,9 +2237,9 @@ function Invoke-NinjaOneTenantSync {
}
if ($MappedFields.UsersSummary) {
- Write-Host "User Details Section"
+ Write-Host 'User Details Section'
- $UsersTableFornatted = $ParsedUsers | sort-object name | Select-Object -First 100 Name,
+ $UsersTableFornatted = $ParsedUsers | Sort-Object name | Select-Object -First 100 Name,
@{n = 'User Principal Name'; e = { $_.UPN } },
#Aliases,
Licenses,
@@ -2249,7 +2249,7 @@ function Invoke-NinjaOneTenantSync {
Actions
- $UsersTableHTML = $UsersTableFornatted | ConvertTo-HTML -As Table -Fragment
+ $UsersTableHTML = $UsersTableFornatted | ConvertTo-Html -As Table -Fragment
$UsersTableHTML = ([System.Web.HttpUtility]::HtmlDecode($UsersTableHTML) -replace ' ', ' | ') -replace ' | ', ' | '
@@ -2275,20 +2275,20 @@ function Invoke-NinjaOneTenantSync {
- Write-Host "Posting Details"
+ Write-Host 'Posting Details'
$Token = Get-NinjaOneToken -configuration $Configuration
Write-Host "Ninja Body: $($NinjaOrgUpdate | ConvertTo-Json -Depth 100)"
- $Result = Invoke-WebRequest -uri "https://$($Configuration.Instance)/api/v2/organization/$($MappedTenant.NinjaOne)/custom-fields" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ($NinjaOrgUpdate | ConvertTo-Json -Depth 100)
+ $Result = Invoke-WebRequest -Uri "https://$($Configuration.Instance)/api/v2/organization/$($MappedTenant.NinjaOne)/custom-fields" -Method PATCH -Headers @{Authorization = "Bearer $($token.access_token)" } -ContentType 'application/json; charset=utf-8' -Body ($NinjaOrgUpdate | ConvertTo-Json -Depth 100)
- Write-Host "Cleaning Users Cache"
+ Write-Host 'Cleaning Users Cache'
if (($ParsedUsers | Measure-Object).count -gt 0) {
Remove-AzDataTableEntity @UsersTable -Entity ($ParsedUsers | Select-Object PartitionKey, RowKey)
}
- Write-Host "Cleaning Device Cache"
+ Write-Host 'Cleaning Device Cache'
if (($ParsedDevices | Measure-Object).count -gt 0) {
Remove-AzDataTableEntity @DeviceTable -Entity ($ParsedDevices | Select-Object PartitionKey, RowKey)
}
@@ -2297,16 +2297,20 @@ function Invoke-NinjaOneTenantSync {
Write-Host "Completed Total Time: $((New-TimeSpan -Start $StartTime -End (Get-Date)).TotalSeconds)"
# Set Last End Time
- $CurrentItem | Add-Member -NotePropertyName lastEndTime -NotePropertyValue ([string]$((Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"))) -Force
+ $CurrentItem | Add-Member -NotePropertyName lastEndTime -NotePropertyValue ([string]$((Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss.fffZ'))) -Force
$CurrentItem | Add-Member -NotePropertyName lastStatus -NotePropertyValue 'Completed' -Force
Add-CIPPAzDataTableEntity @MappingTable -Entity $CurrentItem -Force
Write-LogMessage -API 'NinjaOneSync' -user 'NinjaOneSync' -message "Completed NinjaOne Sync for $($Customer.displayName). Queued for $((New-TimeSpan -Start $StartQueueTime -End $StartTime).TotalSeconds) seconds. Data fetched in $((New-TimeSpan -Start $StartTime -End $FetchEnd).TotalSeconds) seconds. Total processing time $((New-TimeSpan -Start $StartTime -End (Get-Date)).TotalSeconds) seconds" -Sev 'info'
} catch {
- Write-Error "Failed NinjaOne Processing for $($Customer.displayName) Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $($_.Exception.message)"
- Write-LogMessage -API 'NinjaOneSync' -user 'NinjaOneSync' -message "Failed NinjaOne Processing for $($Customer.displayName) Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $($_.Exception.message)" -Sev 'Error'
- $CurrentItem | Add-Member -NotePropertyName lastEndTime -NotePropertyValue ([string]$((Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"))) -Force
+ $Message = if ($_.ErrorDetails.Message) {
+ Get-NormalizedError -Message $_.ErrorDetails.Message
+ } else {
+ $_.Exception.message
+ } Write-Error "Failed NinjaOne Processing for $($Customer.displayName) Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $Message"
+ Write-LogMessage -API 'NinjaOneSync' -user 'NinjaOneSync' -message "Failed NinjaOne Processing for $($Customer.displayName) Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $Message" -Sev 'Error'
+ $CurrentItem | Add-Member -NotePropertyName lastEndTime -NotePropertyValue ([string]$((Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss.fffZ'))) -Force
$CurrentItem | Add-Member -NotePropertyName lastStatus -NotePropertyValue 'Failed' -Force
Add-CIPPAzDataTableEntity @MappingTable -Entity $CurrentItem -Force
}
diff --git a/Modules/CippExtensions/Private/Get-HaloMapping.ps1 b/Modules/CippExtensions/Private/Get-HaloMapping.ps1
index adfdd8e72102..ad4fc1e88111 100644
--- a/Modules/CippExtensions/Private/Get-HaloMapping.ps1
+++ b/Modules/CippExtensions/Private/Get-HaloMapping.ps1
@@ -25,8 +25,14 @@ function Get-HaloMapping {
$pagecount = [Math]::Ceiling($Result.record_count / 999)
} while ($i -le $pagecount)
} catch {
- Write-LogMessage -Message "Could not get HaloPSA Clients, error: $($_.Exception.Message)" -Level Error -tenant 'CIPP' -API 'HaloMapping'
- $RawHaloClients = @(@{name = "Could not get HaloPSA Clients, error: $($_.Exception.Message)" })
+ $Message = if ($_.ErrorDetails.Message) {
+ Get-NormalizedError -Message $_.ErrorDetails.Message
+ } else {
+ $_.Exception.message
+ }
+
+ Write-LogMessage -Message "Could not get HaloPSA Clients, error: $Message " -Level Error -tenant 'CIPP' -API 'HaloMapping'
+ $RawHaloClients = @(@{name = "Could not get HaloPSA Clients, error: $Message" })
}
$HaloClients = $RawHaloClients | ForEach-Object {
[PSCustomObject]@{
diff --git a/Modules/CippExtensions/Private/New-HaloPSATicket.ps1 b/Modules/CippExtensions/Private/New-HaloPSATicket.ps1
index 3dd96ee6eb28..5e14f3e1e80d 100644
--- a/Modules/CippExtensions/Private/New-HaloPSATicket.ps1
+++ b/Modules/CippExtensions/Private/New-HaloPSATicket.ps1
@@ -17,7 +17,7 @@ function New-HaloPSATicket {
id = -1
lookupdisplay = 'Enter Details Manually'
}
- client_id = $client
+ client_id = ($client | Select-Object -Last 1)
site_id = $null
user_name = $null
reportedby = $null
@@ -39,8 +39,13 @@ function New-HaloPSATicket {
try {
$Ticket = Invoke-RestMethod -Uri "$($Configuration.ResourceURL)/Tickets" -ContentType 'application/json; charset=utf-8' -Method Post -Body $body -Headers @{Authorization = "Bearer $($token.access_token)" }
} catch {
- Write-LogMessage -message "Failed to send ticket to HaloPSA: $($_.Exception.Message)" -API 'HaloPSATicket' -sev Error
- Write-Host "Failed to send ticket to HaloPSA: $($_.Exception.Message)"
+ $Message = if ($_.ErrorDetails.Message) {
+ Get-NormalizedError -Message $_.ErrorDetails.Message
+ } else {
+ $_.Exception.message
+ }
+ Write-LogMessage -message "Failed to send ticket to HaloPSA: $Message" -API 'HaloPSATicket' -sev Error
+ Write-Host "Failed to send ticket to HaloPSA: $Message"
}
}
\ No newline at end of file
diff --git a/PublicWebhooks/run.ps1 b/PublicWebhooks/run.ps1
index 2a44861c59c9..fc7ca248ea4c 100644
--- a/PublicWebhooks/run.ps1
+++ b/PublicWebhooks/run.ps1
@@ -10,8 +10,13 @@ Write-Host 'Received request'
Write-Host "CIPPID: $($request.Query.CIPPID)"
$url = ($request.headers.'x-ms-original-url').split('/API') | Select-Object -First 1
Write-Host $url
-if ($Request.Query.CIPPID -in $Webhooks.RowKey -and $Webhooks.Resource -ne 'M365AuditLogs') {
+if ($Request.Query.CIPPID -in $Webhooks.RowKey) {
Write-Host 'Found matching CIPPID'
+ if ($Webhooks.Resource -eq 'M365AuditLogs') {
+ Write-Host "Found M365AuditLogs - This is an old entry, we'll deny so Microsoft stops sending it."
+ $body = 'This webhook is not authorized.'
+ $StatusCode = [HttpStatusCode]::Forbidden
+ }
if ($Request.query.ValidationToken -or $Request.body.validationCode) {
Write-Host 'Validation token received'
$body = $request.query.ValidationToken
diff --git a/Scheduler_CIPPNotifications/run.ps1 b/Scheduler_CIPPNotifications/run.ps1
index f6069d9ac67c..512f015f0fc9 100644
--- a/Scheduler_CIPPNotifications/run.ps1
+++ b/Scheduler_CIPPNotifications/run.ps1
@@ -24,14 +24,14 @@ Write-Host ($Currentlog).count
try {
if ($config.onePerTenant) {
if ($Config.email -like '*@*' -and $null -ne $CurrentLog) {
- $JSONRecipients = $Config.email.split(",").trim() | ForEach-Object { if ($_ -like '*@*') { '{ "EmailAddress": { "Address": "' + $_ + '" } }, ' } }
+ $JSONRecipients = $Config.email.split(',').trim() | ForEach-Object { if ($_ -like '*@*') { '{ "EmailAddress": { "Address": "' + $_ + '" } }, ' } }
$JSONRecipients = ([string]$JSONRecipients).Substring(0, ([string]$JSONRecipients).Length - 1)
foreach ($tenant in ($CurrentLog.Tenant | Sort-Object -Unique)) {
$HTMLLog = ($CurrentLog | Select-Object Message, API, Tenant, Username, Severity | Where-Object -Property tenant -EQ $tenant | ConvertTo-Html -frag) -replace '', '' | Out-String
$JSONBody = @"
{
"message": {
- "subject": "CIPP Alert: Alerts found starting at $((Get-Date).AddMinutes(-15))",
+ "subject": "$($Tenant): CIPP Alert: Alerts found starting at $((Get-Date).AddMinutes(-15))",
"body": {
"contentType": "HTML",
"content": "You've setup your alert policies to be alerted whenever specific events happen. We've found some of these events in the log:
@@ -52,10 +52,9 @@ try {
Write-LogMessage -API 'Alerts' -message "Sent alerts to: $($JSONRecipients)" -tenant $Tenant -sev Debug
}
}
- }
- else {
+ } else {
if ($Config.email -like '*@*' -and $null -ne $CurrentLog) {
- $JSONRecipients = $Config.email.split(",").trim() | ForEach-Object { if ($_ -like '*@*') { '{ "EmailAddress": { "Address": "' + $_ + '" } }, ' } }
+ $JSONRecipients = $Config.email.split(',').trim() | ForEach-Object { if ($_ -like '*@*') { '{ "EmailAddress": { "Address": "' + $_ + '" } }, ' } }
$JSONRecipients = ([string]$JSONRecipients).Substring(0, ([string]$JSONRecipients).Length - 1)
$HTMLLog = ($CurrentLog | Select-Object Message, API, Tenant, Username, Severity | ConvertTo-Html -frag) -replace '', '' | Out-String
$JSONBody = @"
@@ -79,13 +78,12 @@ try {
}
"@
New-GraphPostRequest -uri 'https://graph.microsoft.com/v1.0/me/sendMail' -tenantid $env:TenantID -type POST -body ($JSONBody)
- Write-LogMessage -API 'Alerts' -message "Sent alerts to: $($Config.email)" -tenant $Tenant -sev Debug
+ Write-LogMessage -API 'Alerts' -message "Sent alerts to: $($Config.email)" -tenant 'All Tenants' -sev Debug
}
}
-}
-catch {
+} catch {
Write-Host "Could not send alerts to email: $($_.Exception.message)"
- Write-LogMessage -API 'Alerts' -message "Could not send alerts to: $($_.Exception.message)" -tenant $Tenant -sev error
+ Write-LogMessage -API 'Alerts' -message "Could not send alerts to: $($_.Exception.message)" -tenant 'All Tenants' -sev error
}
@@ -131,8 +129,7 @@ try {
if ($UpdateLogs) {
Add-CIPPAzDataTableEntity @Table -Entity $UpdateLogs -Force
}
-}
-catch {
+} catch {
Write-Host "Could not send alerts to webhook: $($_.Exception.message)"
Write-LogMessage -API 'Alerts' -message "Could not send alerts to : $($_.Exception.message)" -tenant $Tenant -sev error
}
@@ -144,7 +141,7 @@ if ($config.sendtoIntegration) {
$Alert = @{
TenantId = $Tenant
AlertText = " $($htmllog)"
- AlertTitle = "CIPP Alert: Alerts found starting at $((Get-Date).AddMinutes(-15))"
+ AlertTitle = "$tenant CIPP Alert: Alerts found starting at $((Get-Date).AddMinutes(-15))"
}
New-CippExtAlert -Alert $Alert
$UpdateLogs = $CurrentLog | ForEach-Object {
@@ -155,8 +152,7 @@ if ($config.sendtoIntegration) {
Add-CIPPAzDataTableEntity @Table -Entity $UpdateLogs -Force
}
}
- }
- catch {
+ } catch {
Write-Host "Could not send alerts to ticketing system: $($_.Exception.message)"
Write-LogMessage -API 'Alerts' -tenant $Tenant -message "Could not send alerts to ticketing system: $($_.Exception.message)" -sev Error
}
diff --git a/version_latest.txt b/version_latest.txt
index ec4595317e77..25b08bbc78f0 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-4.9.8
\ No newline at end of file
+5.0.5
\ No newline at end of file
| | |