Skip to content

Commit 96ffe06

Browse files
update null saftey so it does not generate error when loading data
1 parent 99c2ff4 commit 96ffe06

4 files changed

Lines changed: 5 additions & 2 deletions

File tree

Modules/CIPPCore/Public/Set-CIPPDBCacheApps.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ function Set-CIPPDBCacheApps {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching applications' -sev Debug
1717

1818
$Apps = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/applications?$top=999&expand=owners' -tenantid $TenantFilter
19+
if (!$Apps) { $Apps = @() }
1920
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Apps' -Data $Apps
2021
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Apps' -Data $Apps -Count
2122
$Apps = $null

Modules/CIPPCore/Public/Set-CIPPDBCacheDevices.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ function Set-CIPPDBCacheDevices {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching Azure AD devices' -sev Debug
1717

1818
$Devices = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/devices?$top=999&$select=id,displayName,operatingSystem,operatingSystemVersion,trustType,accountEnabled,approximateLastSignInDateTime' -tenantid $TenantFilter
19+
if (!$Devices) { $Devices = @() }
1920
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Devices' -Data $Devices
2021
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Devices' -Data $Devices -Count
2122
$Devices = $null

Modules/CIPPCore/Public/Set-CIPPDBCacheGuests.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ function Set-CIPPDBCacheGuests {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching guest users' -sev Debug
1717

1818
$Guests = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$filter=userType eq 'Guest'&`$expand=sponsors&`$top=999" -tenantid $TenantFilter
19+
if (!$Guests) { $Guests = @() }
1920
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Guests' -Data $Guests
2021
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Guests' -Data $Guests -Count
2122
$Guests = $null

Modules/CIPPCore/Public/Set-CIPPDBCacheSettings.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ function Set-CIPPDBCacheSettings {
1616
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching directory settings' -sev Debug
1717

1818
$Settings = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/settings?$top=999' -tenantid $TenantFilter
19+
if(!$Settings){ $Settings = @()}
1920
Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Settings' -Data $Settings
2021
$Settings = $null
2122
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached directory settings successfully' -sev Debug
2223

2324
} catch {
24-
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter `
25-
-message "Failed to cache directory settings: $($_.Exception.Message)" -sev Error
25+
Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Failed to cache directory settings: $($_.Exception.Message)" -sev Error
2626
}
2727
}

0 commit comments

Comments
 (0)