Skip to content

Commit 5d4febc

Browse files
authored
Merge pull request #562 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents b86f10f + 7264fdc commit 5d4febc

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

Modules/CIPPCore/Public/Authentication/Test-CIPPAccessUserRole.ps1

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ function Test-CIPPAccessUserRole {
2020
$User
2121
)
2222
$Roles = @()
23-
$Table = Get-CippTable -TableName cacheAccessUserRoles
24-
$Filter = "PartitionKey eq 'AccessUser' and RowKey eq '$($User.userDetails)' and Timestamp ge datetime'$((Get-Date).AddMinutes(-15).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss.fffZ'))'"
25-
$UserRole = Get-CIPPAzDataTableEntity @Table -Filter $Filter
23+
24+
try {
25+
$Table = Get-CippTable -TableName cacheAccessUserRoles
26+
$Filter = "PartitionKey eq 'AccessUser' and RowKey eq '$($User.userDetails)' and Timestamp ge datetime'$((Get-Date).AddMinutes(-15).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss.fffZ'))'"
27+
$UserRole = Get-CIPPAzDataTableEntity @Table -Filter $Filter
28+
} catch {
29+
Write-Information "Could not access cached user roles table. $($_.Exception.Message)"
30+
$UserRole = $null
31+
}
2632
if ($UserRole) {
2733
Write-Information "Found cached user role for $($User.userDetails)"
2834
$Roles = $UserRole.Role | ConvertFrom-Json
@@ -59,12 +65,16 @@ function Test-CIPPAccessUserRole {
5965
}
6066

6167
if (($Roles | Measure-Object).Count -gt 2) {
62-
$UserRole = [PSCustomObject]@{
63-
PartitionKey = 'AccessUser'
64-
RowKey = [string]$User.userDetails
65-
Role = [string](ConvertTo-Json -Compress -InputObject $Roles)
68+
try {
69+
$UserRole = [PSCustomObject]@{
70+
PartitionKey = 'AccessUser'
71+
RowKey = [string]$User.userDetails
72+
Role = [string](ConvertTo-Json -Compress -InputObject $Roles)
73+
}
74+
Add-CIPPAzDataTableEntity @Table -Entity $UserRole -Force
75+
} catch {
76+
Write-Information "Could not cache user roles for $($User.userDetails). $($_.Exception.Message)"
6677
}
67-
Add-CIPPAzDataTableEntity @Table -Entity $UserRole -Force
6878
}
6979
}
7080
$User.userRoles = $Roles

profile.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ if (!$LastStartup -or $CurrentVersion -ne $LastStartup.Version) {
5858
} catch {
5959
Write-LogMessage -message 'Failed to clear durables after update' -LogData (Get-CippException -Exception $_) -Sev 'Error'
6060
}
61+
62+
$ReleaseTable = Get-CippTable -tablename 'cacheGitHubReleaseNotes'
63+
Remove-AzDataTableEntity @ReleaseTable -Entity @{ PartitionKey = 'GitHubReleaseNotes'; RowKey = 'GitHubReleaseNotes' } -ErrorAction SilentlyContinue
64+
Write-Host 'Cleared GitHub release notes cache to force refresh on version update.'
6165
}
6266
# Uncomment the next line to enable legacy AzureRm alias in Azure PowerShell.
6367
# Enable-AzureRmAlias

0 commit comments

Comments
 (0)