Skip to content

Commit 547599b

Browse files
committed
Use raw SkuPartNumber for license names
Stop using Convert-SKUname/convert-skuname and culture-based formatting for license display names. Use the raw SkuPartNumber value (with a fallback of 'Unknown License' when missing) and simplify list output. Also add informational logging of license objects. Changes touch Invoke-HuduExtensionSync.ps1 and Invoke-NinjaOneTenantSync.ps1 to avoid conversion errors and reduce formatting complexity.
1 parent edb3535 commit 547599b

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

Modules/CippExtensions/Public/Hudu/Invoke-HuduExtensionSync.ps1

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ function Invoke-HuduExtensionSync {
246246

247247
$post = '</div>'
248248

249-
$licenseOut = $Licenses | Where-Object { $_.PrepaidUnits.Enabled -gt 0 } | Select-Object @{N = 'License Name'; E = { Convert-SKUname -skuName $_.SkuPartNumber -ConvertTable $LicTable } }, @{N = 'Active'; E = { $_.PrepaidUnits.Enabled } }, @{N = 'Consumed'; E = { $_.ConsumedUnits } }, @{N = 'Unused'; E = { $_.PrepaidUnits.Enabled - $_.ConsumedUnits } }
249+
$licenseOut = $Licenses | Where-Object { $_.PrepaidUnits.Enabled -gt 0 } | Select-Object @{N = 'License Name'; E = { $_.SkuPartNumber } }, @{N = 'Active'; E = { $_.PrepaidUnits.Enabled } }, @{N = 'Consumed'; E = { $_.ConsumedUnits } }, @{N = 'Unused'; E = { $_.PrepaidUnits.Enabled - $_.ConsumedUnits } }
250250
$licenseHTML = $licenseOut | ConvertTo-Html -PreContent $pre -PostContent $post -Fragment | Out-String
251251
}
252252

@@ -519,11 +519,10 @@ function Invoke-HuduExtensionSync {
519519
$userLicenses = ($user.AssignedLicenses.SkuID | ForEach-Object {
520520
$UserLic = $_
521521
$SkuPartNumber = ($Licenses | Where-Object { $_.SkuId -eq $UserLic }).SkuPartNumber
522-
$DisplayName = Convert-SKUname -skuName $SkuPartNumber -ConvertTable $LicTable
523-
if (!$DisplayName) {
524-
$DisplayName = $SkuPartNumber
522+
if (!$SkuPartNumber) {
523+
$SkuPartNumber = 'Unknown License'
525524
}
526-
$DisplayName
525+
$SkuPartNumber
527526
}) -join ', '
528527

529528
$UserOneDriveDetails = $OneDriveDetails | Where-Object { $_.ownerPrincipalName -eq $user.userPrincipalName }

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ function Invoke-NinjaOneTenantSync {
358358

359359
# Get the license overview for the tenant
360360
if ($Licenses) {
361-
$LicensesParsed = $Licenses | Where-Object { $_.PrepaidUnits.Enabled -gt 0 } | Select-Object @{N = 'License Name'; E = { (Get-Culture).TextInfo.ToTitleCase((convert-skuname -skuname $_.SkuPartNumber).Tolower()) } }, @{N = 'Active'; E = { $_.PrepaidUnits.Enabled } }, @{N = 'Consumed'; E = { $_.ConsumedUnits } }, @{N = 'Unused'; E = { $_.PrepaidUnits.Enabled - $_.ConsumedUnits } }
361+
$LicensesParsed = $Licenses | Where-Object { $_.PrepaidUnits.Enabled -gt 0 } | Select-Object @{N = 'License Name'; E = { $_.skuPartNumber } }, @{N = 'Active'; E = { $_.PrepaidUnits.Enabled } }, @{N = 'Consumed'; E = { $_.ConsumedUnits } }, @{N = 'Unused'; E = { $_.PrepaidUnits.Enabled - $_.ConsumedUnits } }
362362
}
363363

364364
Write-Verbose "$(Get-Date) - Parsing Device Compliance Policies"
@@ -891,7 +891,7 @@ function Invoke-NinjaOneTenantSync {
891891
$UserLic = $_
892892
try {
893893
$SkuPartNumber = ($Licenses | Where-Object { $_.SkuId -eq $UserLic }).SkuPartNumber
894-
'<li>' + "$((Get-Culture).TextInfo.ToTitleCase((convert-skuname -skuname $SkuPartNumber).Tolower()))</li>"
894+
'<li>' + "$($SkuPartNumber)</li>"
895895
} catch {}
896896
}) -join ''
897897

@@ -1385,13 +1385,8 @@ function Invoke-NinjaOneTenantSync {
13851385

13861386
$LicenseDetails = foreach ($License in $Licenses) {
13871387
$MatchedSubscriptions = $Subscriptions | Where-Object -Property skuid -EQ $License.skuId
1388-
1389-
try {
1390-
$FriendlyLicenseName = $((Get-Culture).TextInfo.ToTitleCase((convert-skuname -skuname $License.SkuPartNumber).Tolower()))
1391-
} catch {
1392-
$FriendlyLicenseName = $License.SkuPartNumber
1393-
}
1394-
1388+
Write-Information "License info: $($License | ConvertTo-Json -Depth 100)"
1389+
$FriendlyLicenseName = $License.skuPartNumber
13951390

13961391
$LicenseUsers = foreach ($SubUser in $Users) {
13971392
$MatchedLicense = $SubUser.assignedLicenses | Where-Object { $License.skuId -in $_.skuId }

0 commit comments

Comments
 (0)